[gnumeric] Arrays: more array access cleanup.

[Morten Welinder <mortenw src gnome org>]

commit 79da2df413d98525b1d06fa55d695c3ef511f3f5
Author: Morten Welinder <terra gnome org>
Date:   Sat Dec 30 18:20:21 2017 -0500

    Arrays: more array access cleanup.

 src/xml-sax-write.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index 0a92ff1..9786b3b 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -39,7 +39,6 @@
 #include <style-color.h>
 #include <style-conditions.h>
 #include <expr.h>
-#include <expr-impl.h>
 #include <expr-name.h>
 #include <value.h>
 #include <ranges.h>
@@ -864,8 +863,10 @@ xml_write_cell_and_position (GnmOutputXML *state,
        /* As of version 0.53 we save the size of the array as attributes */
        /* As of version 0.57 the attributes are in the Cell not the Content */
        if (texpr && gnm_expr_top_is_array_corner (texpr)) {
-               gsf_xml_out_add_int (state->output, "Rows", texpr->expr->array_corner.rows);
-               gsf_xml_out_add_int (state->output, "Cols", texpr->expr->array_corner.cols);
+               int cols, rows;
+               gnm_expr_top_get_array_size (texpr, &cols, &rows);
+               gsf_xml_out_add_int (state->output, "Rows", rows);
+               gsf_xml_out_add_int (state->output, "Cols", cols);
        }
 
        if (write_contents) {