[gnumeric] SheetObjectGraph: use GNM_XML_2ND here too.

[Morten Welinder <mortenw src gnome org>]

commit 8037d82550d05ed31166c886d802db8aa47ef1c3
Author: Morten Welinder <terra gnome org>
Date:   Wed Apr 1 07:32:06 2015 -0400

    SheetObjectGraph: use GNM_XML_2ND here too.
    
    Although the concept of reading Guppi graphs is ridiculous at this
    point.

 ChangeLog                |    5 ++++
 src/sheet-object-graph.c |   54 +++++++++++++++++++++++-----------------------
 2 files changed, 32 insertions(+), 27 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ea91780..c5c92d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01  Morten Welinder  <terra gnome org>
+
+       * src/sheet-object-graph.c (gnm_sogg_prep_sax_parser): Use
+       GNM_XML_2ND here too.
+
 2015-03-30  Morten Welinder  <terra gnome org>
 
        * src/sheet-object.c (gnm_sheet_object_anchor_mode_get_type): New
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index bd37883..6d40c8c 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -1071,34 +1071,34 @@ gnm_sogg_prep_sax_parser (SheetObject *so, GsfXMLIn *xin, xmlChar const **attrs,
              GSF_XML_IN_NODE (GUPPI_VECTORS, GUPPI_VECTOR, -1, "gmr:Vector", GSF_XML_CONTENT, vector_start, 
vector_end),
            GSF_XML_IN_NODE (GRAPH, GUPPI_GRAPH, -1, "graph:Graph", GSF_XML_NO_CONTENT, NULL, NULL),
              GSF_XML_IN_NODE (GUPPI_GRAPH, GUPPI_LEGEND, -1, "graph:Legend", GSF_XML_NO_CONTENT, 
legend_start, NULL),
-               GSF_XML_IN_NODE (GUPPI_LEGEND, GUPPI_LEGEND_POS, -1, "graph:Position", GSF_XML_CONTENT, NULL, 
position_end),
+               GSF_XML_IN_NODE (GUPPI_LEGEND, GUPPI_LEGEND_POS, -1, "graph:Position", GSF_XML_CONTENT, NULL, 
position_end),
              GSF_XML_IN_NODE (GUPPI_GRAPH, GUPPI_PLOTS, -1, "graph:Plots", GSF_XML_NO_CONTENT, NULL, NULL),
-               GSF_XML_IN_NODE (GUPPI_PLOTS, GUPPI_PLOT, -1, "graph:Plot", GSF_XML_NO_CONTENT, NULL, NULL),
-                 GSF_XML_IN_NODE (GUPPI_PLOT, GUPPI_PLOT_TYPE, -1, "Type", GSF_XML_NO_CONTENT, 
plot_type_start, NULL),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_MARKER, -1, "with_marker", GSF_XML_CONTENT, NULL, 
marker_end),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_MARKERS, -1, "with_markers", GSF_XML_CONTENT, 
NULL, marker_end),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_LINES, -1, "with_line", GSF_XML_NO_CONTENT, NULL, 
NULL),
-                     GSF_XML_IN_NODE (GUPPI_LINES, GUPPI_PLOT_LINEAR, -1, "Linear", GSF_XML_NO_CONTENT, 
linear_start, NULL),
-                     GSF_XML_IN_NODE (GUPPI_LINES, GUPPI_PLOT_CUBIC, -1, "Cubic", GSF_XML_NO_CONTENT, 
cubic_start, NULL),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_HORIZONTAL, -1, "horizontal", GSF_XML_CONTENT, 
NULL, horiz_end),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_STACKED, -1, "stacked", GSF_XML_CONTENT, NULL, 
stacked_end),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_AS_PERCENT, -1, "as_percentage", GSF_XML_CONTENT, 
NULL, percent_end),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_SEPARATION, -1, "separation_percent_of_radius", 
GSF_XML_CONTENT, NULL, separation_end),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_BUBBLE, -1, "auto_allocate_bubble_size", 
GSF_XML_CONTENT, NULL, bubble_end),
-                 GSF_XML_IN_NODE (GUPPI_PLOT, GUPPI_PLOT_GRAPH_TYPE, -1, "graph:Type", GSF_XML_NO_CONTENT, 
plot_type_start, NULL),
-                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_MARKER, -1, "with_marker", 
GSF_XML_NO_CONTENT, NULL, NULL), /*2nd definition */
-                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_MARKERS, -1, "with_markers", 
GSF_XML_NO_CONTENT, NULL, NULL), /*2nd definition */
-                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_LINES, -1, "with_line", GSF_XML_NO_CONTENT, 
NULL, NULL), /*2nd definition */
-                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_HORIZONTAL, -1, "horizontal", 
GSF_XML_NO_CONTENT, NULL, NULL), /*2nd definition */
-                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_STACKED, -1, "stacked", GSF_XML_NO_CONTENT, 
NULL, NULL), /*2nd definition */
-                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_AS_PERCENT, -1, "as_percentage", 
GSF_XML_NO_CONTENT, NULL, NULL), /*2nd definition */
-                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_SEPARATION, -1, 
"separation_percent_of_radius", GSF_XML_NO_CONTENT, NULL, NULL), /*2nd definition */
-                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_BUBBLE, -1, "auto_allocate_bubble_size", 
GSF_XML_NO_CONTENT, NULL, NULL), /*2nd definition */
-                 GSF_XML_IN_NODE (GUPPI_PLOT, GUPPI_DATA, -1, "graph:Data", GSF_XML_NO_CONTENT, NULL, NULL),
-                   GSF_XML_IN_NODE (GUPPI_DATA, GUPPI_SERIES, -1, "graph:Series", GSF_XML_NO_CONTENT, 
series_start, NULL),
-                   GSF_XML_IN_NODE (GUPPI_SERIES, GUPPI_SERIES_DIM, -1, "graph:Dimension", 
GSF_XML_NO_CONTENT, dim_start, NULL),
-                 GSF_XML_IN_NODE (GUPPI_PLOT, GUPPI_DATA_LAYOUT, -1, "graph:DataLayout", GSF_XML_NO_CONTENT, 
NULL, NULL),
-                   GSF_XML_IN_NODE (GUPPI_DATA_LAYOUT, GUPPI_DIMENSION, -1, "graph:Dimension", 
GSF_XML_NO_CONTENT, NULL, NULL),
+               GSF_XML_IN_NODE (GUPPI_PLOTS, GUPPI_PLOT, -1, "graph:Plot", GSF_XML_NO_CONTENT, NULL, NULL),
+                 GSF_XML_IN_NODE (GUPPI_PLOT, GUPPI_PLOT_TYPE, -1, "Type", GSF_XML_NO_CONTENT, 
plot_type_start, NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_MARKER, -1, "with_marker", GSF_XML_CONTENT, NULL, 
marker_end),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_MARKERS, -1, "with_markers", GSF_XML_CONTENT, 
NULL, marker_end),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_LINES, -1, "with_line", GSF_XML_NO_CONTENT, NULL, 
NULL),
+                     GSF_XML_IN_NODE (GUPPI_LINES, GUPPI_PLOT_LINEAR, -1, "Linear", GSF_XML_NO_CONTENT, 
linear_start, NULL),
+                     GSF_XML_IN_NODE (GUPPI_LINES, GUPPI_PLOT_CUBIC, -1, "Cubic", GSF_XML_NO_CONTENT, 
cubic_start, NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_HORIZONTAL, -1, "horizontal", GSF_XML_CONTENT, 
NULL, horiz_end),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_STACKED, -1, "stacked", GSF_XML_CONTENT, NULL, 
stacked_end),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_AS_PERCENT, -1, "as_percentage", GSF_XML_CONTENT, 
NULL, percent_end),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_SEPARATION, -1, "separation_percent_of_radius", 
GSF_XML_CONTENT, NULL, separation_end),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_TYPE, GUPPI_BUBBLE, -1, "auto_allocate_bubble_size", 
GSF_XML_CONTENT, NULL, bubble_end),
+                 GSF_XML_IN_NODE (GUPPI_PLOT, GUPPI_PLOT_GRAPH_TYPE, -1, "graph:Type", GSF_XML_NO_CONTENT, 
plot_type_start, NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_MARKER, -1, "with_marker", GSF_XML_2ND, 
NULL, NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_MARKERS, -1, "with_markers", GSF_XML_2ND, 
NULL, NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_LINES, -1, "with_line", GSF_XML_2ND, NULL, 
NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_HORIZONTAL, -1, "horizontal", GSF_XML_2ND, 
NULL, NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_STACKED, -1, "stacked", GSF_XML_2ND, NULL, 
NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_AS_PERCENT, -1, "as_percentage", 
GSF_XML_2ND, NULL, NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_SEPARATION, -1, 
"separation_percent_of_radius", GSF_XML_2ND, NULL, NULL),
+                   GSF_XML_IN_NODE (GUPPI_PLOT_GRAPH_TYPE, GUPPI_BUBBLE, -1, "auto_allocate_bubble_size", 
GSF_XML_2ND, NULL, NULL),
+                 GSF_XML_IN_NODE (GUPPI_PLOT, GUPPI_DATA, -1, "graph:Data", GSF_XML_NO_CONTENT, NULL, NULL),
+                   GSF_XML_IN_NODE (GUPPI_DATA, GUPPI_SERIES, -1, "graph:Series", GSF_XML_NO_CONTENT, 
series_start, NULL),
+                   GSF_XML_IN_NODE (GUPPI_SERIES, GUPPI_SERIES_DIM, -1, "graph:Dimension", 
GSF_XML_NO_CONTENT, dim_start, NULL),
+                 GSF_XML_IN_NODE (GUPPI_PLOT, GUPPI_DATA_LAYOUT, -1, "graph:DataLayout", GSF_XML_NO_CONTENT, 
NULL, NULL),
+                   GSF_XML_IN_NODE (GUPPI_DATA_LAYOUT, GUPPI_DIMENSION, -1, "graph:Dimension", 
GSF_XML_NO_CONTENT, NULL, NULL),
          GSF_XML_IN_NODE_END
        };
        static GsfXMLInDoc *doc = NULL;