GNOME.org
 

[gnumeric] xlsx: remove duplicate xml nodes.

commit a3e4ec200a9ef5b3a13445afd81b9a3f1204980e
Author: Morten Welinder <terra gnome org>
Date:   Tue Mar 31 19:40:17 2015 -0400

    xlsx: remove duplicate xml nodes.

 plugins/excel/xlsx-read-drawing.c |  126 +++++++++++++++----------------------
 1 files changed, 50 insertions(+), 76 deletions(-)
---
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 07fa52a..a031de6 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -728,6 +728,8 @@ GSF_XML_IN_NODE_FULL (START, USER_SHAPES, XL_NS_CHART, "userShapes", GSF_XML_NO_
       GSF_XML_IN_NODE (SHAPE, NV_SP_PR, XL_NS_CHART_DRAW, "nvSpPr", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (NV_SP_PR, C_NV_PR, XL_NS_CHART_DRAW, "cNvPr", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (NV_SP_PR, C_NV_SP_PR, XL_NS_CHART_DRAW, "cNvSpPr", GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (C_NV_SP_PR, SP_LOCKS, XL_NS_DRAW, "spLocks", GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (C_NV_SP_PR, HLINK_CLICK, XL_NS_DRAW, "hlinkClick", GSF_XML_NO_CONTENT, NULL, 
NULL),
       GSF_XML_IN_NODE_FULL (SHAPE, SHAPE_PR, XL_NS_CHART_DRAW, "spPr", GSF_XML_NO_CONTENT, FALSE, TRUE, 
NULL, NULL, 0),
         GSF_XML_IN_NODE (SHAPE_PR, SP_PR_PRST_GEOM, XL_NS_DRAW, "prstGeom", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (SP_PR_PRST_GEOM, AV_LST, XL_NS_DRAW, "avLst", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -830,7 +832,7 @@ xlsx_chart_add_plot (GsfXMLIn *xin, char const *type)
 
 /* shared with pie of pie, and bar of pie */
 static void
-xlsx_vary_colors (GsfXMLIn *xin, xmlChar const **attrs)
+xlsx_chart_vary_colors (GsfXMLIn *xin, xmlChar const **attrs)
 {
        XLSXReadState *state = (XLSXReadState *)xin->user_state;
        int vary = TRUE;  /* A somewhat crazy default */
@@ -2532,7 +2534,7 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
   GSF_XML_IN_NODE (CHART_SPACE, CHART, XL_NS_CHART, "chart", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (CHART, SHOW_DBLS_OVER_MAX, XL_NS_CHART, "showDLblsOverMax", GSF_XML_NO_CONTENT, NULL, 
NULL),
     GSF_XML_IN_NODE (CHART, PLOTAREA, XL_NS_CHART, "plotArea", GSF_XML_NO_CONTENT, &xlsx_plot_area, 
&xlsx_chart_pop),
-      GSF_XML_IN_NODE (PLOTAREA, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),       /* 
2nd Def */
+      GSF_XML_IN_NODE (PLOTAREA, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
       GSF_XML_IN_NODE_FULL (PLOTAREA, CAT_AXIS, XL_NS_CHART, "catAx", GSF_XML_NO_CONTENT, FALSE, TRUE,
                            &xlsx_axis_start, &xlsx_axis_end, XLSX_AXIS_CAT),
         GSF_XML_IN_NODE (CAT_AXIS, AXIS_AXID, XL_NS_CHART, "axId", GSF_XML_NO_CONTENT, &xlsx_axis_id, NULL),
@@ -2547,10 +2549,10 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE (CAT_AXIS, AXIS_POS, XL_NS_CHART, "axPos", GSF_XML_NO_CONTENT, &xlsx_axis_pos, NULL),
         GSF_XML_IN_NODE_FULL (CAT_AXIS, AXIS_MAJORGRID, XL_NS_CHART, "majorGridlines", GSF_XML_NO_CONTENT,
                              FALSE, FALSE, &xlsx_chart_gridlines, &xlsx_chart_pop, 1),
-          GSF_XML_IN_NODE (AXIS_MAJORGRID, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),   
          /* 2nd Def */
+          GSF_XML_IN_NODE (AXIS_MAJORGRID, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE_FULL (CAT_AXIS, AXIS_MINORGRID, XL_NS_CHART, "minorGridlines", GSF_XML_NO_CONTENT,
                              FALSE, FALSE, &xlsx_chart_gridlines, &xlsx_chart_pop, 0),
-          GSF_XML_IN_NODE (AXIS_MINORGRID, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),   
          /* 2nd Def */
+          GSF_XML_IN_NODE (AXIS_MINORGRID, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (CAT_AXIS, TITLE, XL_NS_CHART, "title", GSF_XML_NO_CONTENT, &xlsx_chart_title_start, 
xlsx_chart_title_end),            /* ID is used */
          GSF_XML_IN_NODE (TITLE, OVERLAY, XL_NS_CHART, "overlay", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (TITLE, LAYOUT, XL_NS_CHART, "layout", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -2574,7 +2576,7 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
               GSF_XML_IN_NODE_FULL (MAN_LAYOUT, MAN_LAYOUT_XMODE, XL_NS_CHART, "xMode", GSF_XML_NO_CONTENT, 
FALSE, TRUE, &xlsx_chart_layout_mode, NULL, 0),
               GSF_XML_IN_NODE_FULL (MAN_LAYOUT, MAN_LAYOUT_Y, XL_NS_CHART, "y", GSF_XML_NO_CONTENT, FALSE, 
TRUE, &xlsx_chart_layout_dim, NULL, 2),
               GSF_XML_IN_NODE_FULL (MAN_LAYOUT, MAN_LAYOUT_YMODE, XL_NS_CHART, "yMode", GSF_XML_NO_CONTENT, 
FALSE, TRUE,  &xlsx_chart_layout_mode, NULL, 2),
-              GSF_XML_IN_NODE (TITLE, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),        
  /* 2nd Def */
+              GSF_XML_IN_NODE (TITLE, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
               GSF_XML_IN_NODE (TITLE, TEXT, XL_NS_CHART, "tx", GSF_XML_NO_CONTENT, &xlsx_chart_text_start, 
&xlsx_chart_text),
             GSF_XML_IN_NODE (TEXT, TX_RICH, XL_NS_CHART, "rich", GSF_XML_NO_CONTENT, NULL, NULL),
               GSF_XML_IN_NODE (TX_RICH, TX_RICH_BODY, XL_NS_CHART, "bodyP", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -2602,7 +2604,7 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE_FULL (CAT_AXIS, AXIS_MAJORTICKMARK, XL_NS_CHART, "majorTickMark", 
GSF_XML_NO_CONTENT, FALSE, TRUE, &xlsx_axis_mark, NULL, 1),
         GSF_XML_IN_NODE_FULL (CAT_AXIS, AXIS_MINORTICKMARK, XL_NS_CHART, "minorTickMark", 
GSF_XML_NO_CONTENT, FALSE, TRUE, &xlsx_axis_mark, NULL, 0),
         GSF_XML_IN_NODE (CAT_AXIS, AXIS_TICKLBLPOS, XL_NS_CHART, "tickLblPos", GSF_XML_NO_CONTENT, 
&xslx_chart_tick_label_pos, NULL),
-        GSF_XML_IN_NODE (CAT_AXIS, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),           
          /* 2nd Def */
+        GSF_XML_IN_NODE (CAT_AXIS, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (CAT_AXIS, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_NO_CONTENT, NULL, NULL),            
  /* 2nd Def */
         GSF_XML_IN_NODE (CAT_AXIS, AXIS_CROSSAX, XL_NS_CHART, "crossAx", GSF_XML_NO_CONTENT, 
&xlsx_axis_crossax, NULL),
         GSF_XML_IN_NODE (CAT_AXIS, AXIS_CROSSES, XL_NS_CHART, "crosses", GSF_XML_NO_CONTENT, 
&xlsx_axis_crosses, NULL),
@@ -2686,20 +2688,9 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
         GSF_XML_IN_NODE (SER_AXIS, AXIS_TICK_MARK_SKIP, XL_NS_CHART, "tickMarkSkip", GSF_XML_2ND, NULL, 
NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, LAYOUT, XL_NS_CHART, "layout", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (LAYOUT, LAST_LAYOUT,      XL_NS_CHART, "lastLayout", GSF_XML_NO_CONTENT, NULL, 
NULL),
-          GSF_XML_IN_NODE (LAST_LAYOUT, LAYOUT_X, XL_NS_CHART, "x", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (LAST_LAYOUT, LAYOUT_Y, XL_NS_CHART, "y", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (LAST_LAYOUT, LAYOUT_W, XL_NS_CHART, "w", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (LAST_LAYOUT, LAYOUT_H, XL_NS_CHART, "h", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (LAYOUT, LAST_LAYOUT_OUTER, XL_NS_CHART, "lastLayoutOuter", GSF_XML_NO_CONTENT, 
NULL, NULL),
-          GSF_XML_IN_NODE (LAST_LAYOUT_OUTER, LAYOUT_X, XL_NS_CHART, "x", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (LAST_LAYOUT_OUTER, LAYOUT_Y, XL_NS_CHART, "y", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (LAST_LAYOUT_OUTER, LAYOUT_W, XL_NS_CHART, "w", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (LAST_LAYOUT_OUTER, LAYOUT_H, XL_NS_CHART, "h", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (LAYOUT, MAN_LAYOUT, XL_NS_CHART, "manualLayout", GSF_XML_NO_CONTENT, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, SCATTER, XL_NS_CHART, "scatterChart", GSF_XML_NO_CONTENT, xlsx_chart_xy, 
&xlsx_plot_end),
-        GSF_XML_IN_NODE (SCATTER, VARYCOLORS, XL_NS_CHART,     "varyColors", GSF_XML_NO_CONTENT, NULL, NULL),
+        GSF_XML_IN_NODE (SCATTER, VARY_COLORS, XL_NS_CHART,    "varyColors", GSF_XML_NO_CONTENT, 
&xlsx_chart_vary_colors, NULL),
         GSF_XML_IN_NODE (SCATTER, SCATTER_DLBLS, XL_NS_CHART,  "dLbls", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (SCATTER_DLBLS, SCATTER_DLBLS_LEGEND, XL_NS_CHART,   "showLegendKey", 
GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (SCATTER_DLBLS, SCATTER_DLBLS_VAL, XL_NS_CHART,      "showVal", 
GSF_XML_NO_CONTENT, NULL, NULL),
@@ -2714,7 +2705,7 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
          GSF_XML_IN_NODE (SERIES, SERIES_INVERTIFNEG, XL_NS_CHART,     "invertIfNegative", 
GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (SERIES, SERIES_TRENDLINE, XL_NS_CHART,      "trendline", GSF_XML_NO_CONTENT, 
&xlsx_ser_trendline_start, &xlsx_ser_trendline_end),
             GSF_XML_IN_NODE (SERIES_TRENDLINE, SERIES_TRENDLINE_NAME, XL_NS_CHART, "name", GSF_XML_CONTENT, 
NULL, &xlsx_ser_trendline_name),
-            GSF_XML_IN_NODE (SERIES_TRENDLINE, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, 
NULL), /* 2nd Def */
+            GSF_XML_IN_NODE (SERIES_TRENDLINE, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
             GSF_XML_IN_NODE (SERIES_TRENDLINE, SERIES_TRENDLINE_TYPE, XL_NS_CHART,     "trendlineType", 
GSF_XML_NO_CONTENT, &xlsx_ser_trendline_type, NULL),
             GSF_XML_IN_NODE (SERIES_TRENDLINE, SERIES_TRENDLINE_RSQR, XL_NS_CHART,     "dispRSqr", 
GSF_XML_NO_CONTENT, &xlsx_ser_trendline_disprsqr, NULL),
             GSF_XML_IN_NODE (SERIES_TRENDLINE, SERIES_TRENDLINE_EQ, XL_NS_CHART,       "dispEq", 
GSF_XML_NO_CONTENT, &xlsx_ser_trendline_dispeq, NULL),
@@ -2767,9 +2758,8 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
           GSF_XML_IN_NODE (SERIES, TEXT, XL_NS_CHART,  "tx", GSF_XML_NO_CONTENT, NULL, NULL),                
          /* 2nd Def */
 
           GSF_XML_IN_NODE (SERIES, SERIES_BUBBLES_3D, XL_NS_CHART,     "bubble3D", GSF_XML_NO_CONTENT, NULL, 
NULL),
-          GSF_XML_IN_NODE (SERIES, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),           
          /* 2nd Def */
-       GSF_XML_IN_NODE (SERIES, SERIES_SMOOTH, XL_NS_CHART, "smooth", GSF_XML_NO_CONTENT, xlsx_ser_smooth, 
NULL),
-          GSF_XML_IN_NODE (SERIES, SERIES_IDX, XL_NS_CHART,    "idx", GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (SERIES, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
+         GSF_XML_IN_NODE (SERIES, SERIES_SMOOTH, XL_NS_CHART, "smooth", GSF_XML_NO_CONTENT, xlsx_ser_smooth, 
NULL),
           GSF_XML_IN_NODE (SERIES, SERIES_D_LBLS, XL_NS_CHART, "dLbls", GSF_XML_NO_CONTENT, 
&xlsx_ser_labels_start, &xlsx_ser_labels_end),
             GSF_XML_IN_NODE (SERIES_D_LBLS, SERIES_D_LBLS_POS, XL_NS_CHART,    "dLblPos", 
GSF_XML_NO_CONTENT, &xlsx_ser_labels_pos, NULL),
             GSF_XML_IN_NODE (SERIES_D_LBLS, SERIES_D_LBL, XL_NS_CHART, "dLbl", GSF_XML_NO_CONTENT, 
&xlsx_data_label_start, &xlsx_chart_pop),
@@ -2778,10 +2768,10 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
               GSF_XML_IN_NODE (SERIES_D_LBL, SERIES_D_LBL_LAYOUT, XL_NS_CHART, "layout", GSF_XML_NO_CONTENT, 
NULL, NULL),
               GSF_XML_IN_NODE (SERIES_D_LBL, SERIES_D_LBL_SHOW_VAL, XL_NS_CHART,       "showVal", 
GSF_XML_NO_CONTENT, &xlsx_data_label_show_val, NULL),
               GSF_XML_IN_NODE (SERIES_D_LBL, SERIES_D_LBL_SHOW_CAT, XL_NS_CHART,       "showCatName", 
GSF_XML_NO_CONTENT, &xlsx_data_label_show_cat, NULL),
-              GSF_XML_IN_NODE (SERIES_D_LBL, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL), 
                  /* 2nd Def */
+              GSF_XML_IN_NODE (SERIES_D_LBL, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
               GSF_XML_IN_NODE (SERIES_D_LBL, TEXT, XL_NS_CHART,        "tx", GSF_XML_NO_CONTENT, NULL, NULL),
               GSF_XML_IN_NODE (SERIES_D_LBL, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_NO_CONTENT, NULL, NULL),  
          /* 2nd Def */
-         GSF_XML_IN_NODE (SERIES_D_LBLS, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),     
          /* 2nd Def */
+         GSF_XML_IN_NODE (SERIES_D_LBLS, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
            GSF_XML_IN_NODE (SERIES_D_LBLS, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_NO_CONTENT, NULL, NULL),    
          /* 2nd Def */
            GSF_XML_IN_NODE (SERIES_D_LBLS, SHOW_VAL, XL_NS_CHART, "showVal", GSF_XML_NO_CONTENT, 
&xlsx_ser_labels_show_val, NULL),
            GSF_XML_IN_NODE (SERIES_D_LBLS, NUM_FMT, XL_NS_CHART, "numFmt", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -2793,10 +2783,10 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
           GSF_XML_IN_NODE (SERIES, SERIES_PT, XL_NS_CHART,     "dPt", GSF_XML_NO_CONTENT, 
&xlsx_chart_pt_start, &xlsx_chart_pt_end),
             GSF_XML_IN_NODE (SERIES_PT, BUBBLE3D, XL_NS_CHART, "bubble3D", GSF_XML_NO_CONTENT, NULL, NULL),
             GSF_XML_IN_NODE (SERIES_PT, PT_IDX, XL_NS_CHART,   "idx", GSF_XML_NO_CONTENT, 
&xlsx_chart_pt_index, NULL),
-            GSF_XML_IN_NODE (SERIES_PT, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),
+            GSF_XML_IN_NODE (SERIES_PT, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
             GSF_XML_IN_NODE (SERIES_PT, PT_SEP, XL_NS_CHART,   "explosion", GSF_XML_NO_CONTENT, 
&xlsx_chart_pt_sep, NULL),
             GSF_XML_IN_NODE (SERIES_PT, MARKER, XL_NS_CHART,   "marker", GSF_XML_NO_CONTENT, 
&xlsx_chart_marker_start, &xlsx_chart_marker_end),
-              GSF_XML_IN_NODE (MARKER, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),       
          /* 2nd Def */
+              GSF_XML_IN_NODE (MARKER, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
               GSF_XML_IN_NODE (MARKER, MARKER_SYMBOL, XL_NS_CHART, "symbol", GSF_XML_NO_CONTENT, 
&xlsx_chart_marker_symbol, NULL),
               GSF_XML_IN_NODE (MARKER, MARKER_SIZE, XL_NS_CHART, "size", GSF_XML_NO_CONTENT, 
&xlsx_chart_marker_size, NULL),
               GSF_XML_IN_NODE (MARKER, EXTLST_C, XL_NS_CHART, "extLst", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -2813,82 +2803,85 @@ GSF_XML_IN_NODE_FULL (START, CHART_SPACE, XL_NS_CHART, "chartSpace", GSF_XML_NO_
            GSF_XML_IN_NODE (SERIES_ERR_BARS, SERIES_ERR_BARS_PLUS, XL_NS_CHART, "plus", GSF_XML_NO_CONTENT, 
NULL, NULL),
              GSF_XML_IN_NODE (SERIES_ERR_BARS_PLUS, NUM_REF, XL_NS_CHART, "numRef", GSF_XML_NO_CONTENT, 
NULL, NULL),   /* 2nd Def */
               GSF_XML_IN_NODE (SERIES_ERR_BARS_PLUS, NUM_LIT, XL_NS_CHART, "numLit", GSF_XML_NO_CONTENT, 
NULL, NULL),  /* 2nd Def */
-           GSF_XML_IN_NODE (SERIES_ERR_BARS, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL), 
          /* 2nd Def */
+           GSF_XML_IN_NODE (SERIES_ERR_BARS, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, BUBBLE, XL_NS_CHART,  "bubbleChart", GSF_XML_NO_CONTENT, 
&xlsx_chart_bubble, &xlsx_plot_end),
-        GSF_XML_IN_NODE (BUBBLE, PLOT_AXIS_ID, XL_NS_CHART,    "axId", GSF_XML_NO_CONTENT, NULL, NULL),      
          /* 2nd Def */
-        GSF_XML_IN_NODE (BUBBLE, SERIES, XL_NS_CHART,          "ser", GSF_XML_NO_CONTENT, NULL, NULL),
+        GSF_XML_IN_NODE (BUBBLE, PLOT_AXIS_ID, XL_NS_CHART,    "axId", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (BUBBLE, SERIES, XL_NS_CHART,          "ser", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (BUBBLE, BUBBLE_SCALE, XL_NS_CHART,    "bubbleScale", GSF_XML_NO_CONTENT, NULL, 
NULL),
         GSF_XML_IN_NODE (BUBBLE, BUBBLE_NEGATIVES, XL_NS_CHART,        "showNegBubbles", GSF_XML_NO_CONTENT, 
NULL, NULL),
         GSF_XML_IN_NODE (BUBBLE, BUBBLE_SIZE_REP, XL_NS_CHART, "sizeRepresents", GSF_XML_NO_CONTENT, NULL, 
NULL),
-        GSF_XML_IN_NODE (BUBBLE, VARY_COLORS, XL_NS_CHART,     "varyColors", GSF_XML_NO_CONTENT, 
&xlsx_vary_colors, NULL),
+        GSF_XML_IN_NODE (BUBBLE, VARY_COLORS, XL_NS_CHART,     "varyColors", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, BARCOL, XL_NS_CHART,  "barChart", GSF_XML_NO_CONTENT, &xlsx_chart_bar, 
&xlsx_plot_end),
-        GSF_XML_IN_NODE (BARCOL, VARYCOLORS, XL_NS_CHART, "varyColors", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (BARCOL, PLOT_AXIS_ID, XL_NS_CHART, "axId", GSF_XML_NO_CONTENT, NULL, NULL),         
          /* 2nd Def */
-        GSF_XML_IN_NODE (BARCOL, SERIES,       XL_NS_CHART, "ser", GSF_XML_NO_CONTENT, NULL, NULL),          
          /* 2nd Def */
+        GSF_XML_IN_NODE (BARCOL, VARY_COLORS, XL_NS_CHART, "varyColors", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (BARCOL, PLOT_AXIS_ID, XL_NS_CHART, "axId", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (BARCOL, SERIES,       XL_NS_CHART, "ser", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (BARCOL, BARCOL_DIR,   XL_NS_CHART, "barDir", GSF_XML_NO_CONTENT, 
&xlsx_chart_bar_dir, NULL),
         GSF_XML_IN_NODE (BARCOL, BARCOL_OVERLAP, XL_NS_CHART,"overlap", GSF_XML_NO_CONTENT, 
&xlsx_chart_bar_overlap, NULL),
         GSF_XML_IN_NODE (BARCOL, GROUPING,     XL_NS_CHART, "grouping", GSF_XML_NO_CONTENT, 
&xlsx_chart_bar_group, NULL),
         GSF_XML_IN_NODE (BARCOL, GAP_WIDTH,    XL_NS_CHART, "gapWidth", GSF_XML_NO_CONTENT, 
&xlsx_chart_bar_gap, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, LINE, XL_NS_CHART,    "lineChart", GSF_XML_NO_CONTENT, &xlsx_chart_line, 
&xlsx_plot_end),
-        GSF_XML_IN_NODE (LINE, VARYCOLORS, XL_NS_CHART, "varyColors", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (LINE, PLOT_AXIS_ID, XL_NS_CHART,"axId", GSF_XML_NO_CONTENT, NULL, NULL),            
                  /* 2nd Def */
-        GSF_XML_IN_NODE (LINE, SERIES, XL_NS_CHART,    "ser", GSF_XML_NO_CONTENT, NULL, NULL),               
                  /* 2nd Def */
+        GSF_XML_IN_NODE (LINE, VARY_COLORS, XL_NS_CHART, "varyColors", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (LINE, PLOT_AXIS_ID, XL_NS_CHART,"axId", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (LINE, SERIES, XL_NS_CHART,    "ser", GSF_XML_2ND, NULL, NULL),
           GSF_XML_IN_NODE (SERIES, MARKER, XL_NS_CHART,        "marker", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (LINE, PLOT_AXIS_ID, XL_NS_CHART,"axId", GSF_XML_NO_CONTENT, NULL, NULL),            
                  /* 2nd Def */
         GSF_XML_IN_NODE (LINE, GROUPING, XL_NS_CHART,  "grouping", GSF_XML_NO_CONTENT, NULL, NULL),          
                  /* 2nd Def */
         GSF_XML_IN_NODE (LINE, LINE_MARKER, XL_NS_CHART, "marker", GSF_XML_NO_CONTENT, 
&xlsx_chart_line_marker, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, AREA, XL_NS_CHART,    "areaChart", GSF_XML_NO_CONTENT, &xlsx_chart_area, 
&xlsx_plot_end),
-        GSF_XML_IN_NODE (AREA, PLOT_AXIS_ID, XL_NS_CHART,"axId", GSF_XML_NO_CONTENT, NULL, NULL),            
                  /* 2nd Def */
-        GSF_XML_IN_NODE (AREA, SERIES, XL_NS_CHART,    "ser", GSF_XML_NO_CONTENT, NULL, NULL),               
                  /* 2nd Def */
+        GSF_XML_IN_NODE (AREA, PLOT_AXIS_ID, XL_NS_CHART,"axId", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (AREA, SERIES, XL_NS_CHART,    "ser", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (AREA, GROUPING, XL_NS_CHART,  "grouping", GSF_XML_NO_CONTENT, NULL, NULL),          
                  /* 2nd Def */
 
       GSF_XML_IN_NODE (PLOTAREA, RADAR, XL_NS_CHART,   "radarChart", GSF_XML_NO_CONTENT, &xlsx_chart_radar, 
&xlsx_plot_end),
-        GSF_XML_IN_NODE (RADAR, PLOT_AXIS_ID, XL_NS_CHART,  "axId", GSF_XML_NO_CONTENT, NULL, NULL),         
                  /* 2nd Def */
-        GSF_XML_IN_NODE (RADAR, SERIES, XL_NS_CHART,     "ser", GSF_XML_NO_CONTENT, NULL, NULL),             
                  /* 2nd Def */
+        GSF_XML_IN_NODE (RADAR, PLOT_AXIS_ID, XL_NS_CHART,  "axId", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (RADAR, SERIES, XL_NS_CHART,     "ser", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (RADAR, RADAR_STYLE, XL_NS_CHART, "radarStyle", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (RADAR, VARY_COLORS, XL_NS_CHART, "varyColors", GSF_XML_NO_CONTENT, NULL, NULL),     
                  /* 2nd Def */
+        GSF_XML_IN_NODE (RADAR, VARY_COLORS, XL_NS_CHART, "varyColors", GSF_XML_2ND, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, PIE, XL_NS_CHART,     "pieChart", GSF_XML_NO_CONTENT, &xlsx_chart_pie, 
&xlsx_plot_end),
-        GSF_XML_IN_NODE (PIE, SERIES, XL_NS_CHART,     "ser", GSF_XML_NO_CONTENT, NULL, NULL),               
                  /* 2nd Def */
+        GSF_XML_IN_NODE (PIE, SERIES, XL_NS_CHART,     "ser", GSF_XML_2ND, NULL, NULL),
           GSF_XML_IN_NODE (SERIES, PIE_SER_SEP, XL_NS_CHART,   "explosion", GSF_XML_NO_CONTENT, 
&xlsx_chart_pie_sep, NULL),
-        GSF_XML_IN_NODE (PIE, VARY_COLORS, XL_NS_CHART,        "varyColors", GSF_XML_NO_CONTENT, NULL, 
NULL),                          /* 2nd Def */
+        GSF_XML_IN_NODE (PIE, VARY_COLORS, XL_NS_CHART,        "varyColors", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (PIE, PIE_FIRST_SLICE, XL_NS_CHART,    "firstSliceAng", GSF_XML_NO_CONTENT, NULL, 
NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, OF_PIE, XL_NS_CHART,  "ofPieChart", GSF_XML_NO_CONTENT, &xlsx_chart_pie, 
&xlsx_plot_end),
         GSF_XML_IN_NODE (OF_PIE, OF_PIE_TYPE,  XL_NS_CHART, "ofPieType", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (OF_PIE, SERIES,       XL_NS_CHART, "ser", GSF_XML_NO_CONTENT, NULL, NULL),          
                  /* 2nd Def */
+        GSF_XML_IN_NODE (OF_PIE, SERIES,       XL_NS_CHART, "ser", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (OF_PIE, SERIES_LINES, XL_NS_CHART, "serLines", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (SERIES_LINES, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),     
                  /* 2nd Def */
+          GSF_XML_IN_NODE (SERIES_LINES, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (OF_PIE, PIE_GAP_WIDTH,        XL_NS_CHART, "gapWidth", GSF_XML_NO_CONTENT, NULL, 
NULL),
-        GSF_XML_IN_NODE (OF_PIE, VARY_COLORS,  XL_NS_CHART, "varyColors", GSF_XML_NO_CONTENT, NULL, NULL),   
                  /* 2nd Def */
+        GSF_XML_IN_NODE (OF_PIE, VARY_COLORS,  XL_NS_CHART, "varyColors", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (OF_PIE, OF_2ND_PIE,   XL_NS_CHART, "secondPieSize", GSF_XML_NO_CONTENT, NULL, NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, DOUGHNUT, XL_NS_CHART,        "doughnutChart", GSF_XML_NO_CONTENT, 
&xlsx_chart_ring, &xlsx_plot_end),
-        GSF_XML_IN_NODE (DOUGHNUT, SERIES, XL_NS_CHART,        "ser", GSF_XML_NO_CONTENT, NULL, NULL),       
                          /* 2nd Def */
-        GSF_XML_IN_NODE (DOUGHNUT, VARY_COLORS, XL_NS_CHART,   "varyColors", GSF_XML_NO_CONTENT, NULL, 
NULL),                  /* 2nd Def */
+        GSF_XML_IN_NODE (DOUGHNUT, SERIES, XL_NS_CHART,        "ser", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (DOUGHNUT, VARY_COLORS, XL_NS_CHART,   "varyColors", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (DOUGHNUT, PIE_FIRST_SLICE, XL_NS_CHART,       "firstSliceAng", GSF_XML_NO_CONTENT, 
NULL, NULL),       /* 2nd Def */
         GSF_XML_IN_NODE (DOUGHNUT, HOLE_SIZE, XL_NS_CHART,             "holeSize", GSF_XML_NO_CONTENT, NULL, 
NULL),
 
       GSF_XML_IN_NODE (PLOTAREA, DATA_TABLE, XL_NS_CHART, "dTable", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (DATA_TABLE, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),         
  /* 2nd Def */
-        GSF_XML_IN_NODE (DATA_TABLE, TEXT_PR, XL_NS_CHART,  "txPr", GSF_XML_NO_CONTENT, NULL, NULL),         
  /* 2nd Def */
+        GSF_XML_IN_NODE (DATA_TABLE, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
+        GSF_XML_IN_NODE (DATA_TABLE, TEXT_PR, XL_NS_CHART,  "txPr", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (DATA_TABLE, DT_SHOW_H_BORDER, XL_NS_CHART, "showHorzBorder", GSF_XML_NO_CONTENT, 
NULL, NULL),
         GSF_XML_IN_NODE (DATA_TABLE, DT_SHOW_V_BORDER, XL_NS_CHART, "showVertBorder", GSF_XML_NO_CONTENT, 
NULL, NULL),
         GSF_XML_IN_NODE (DATA_TABLE, DT_SHOW_KEYS, XL_NS_CHART, "showKeys", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (DATA_TABLE, DT_SHOW_OUTLINE, XL_NS_CHART, "showOutline", GSF_XML_NO_CONTENT, NULL, 
NULL),
 
-    GSF_XML_IN_NODE (CHART, TITLE, XL_NS_CHART, "title", GSF_XML_NO_CONTENT, NULL, NULL),                    
  /* 2nd Def */
+    GSF_XML_IN_NODE (CHART, TITLE, XL_NS_CHART, "title", GSF_XML_2ND, NULL, NULL),
 
     GSF_XML_IN_NODE (CHART, LEGEND, XL_NS_CHART, "legend", GSF_XML_NO_CONTENT, &xlsx_chart_legend, 
&xlsx_chart_pop),
-      GSF_XML_IN_NODE (LEGEND, OVERLAY, XL_NS_CHART, "overlay", GSF_XML_NO_CONTENT, NULL, NULL), /* 2nd Def 
*/
-      GSF_XML_IN_NODE (LEGEND, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),         /* 
2nd Def */
-      GSF_XML_IN_NODE (LEGEND, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_NO_CONTENT, NULL, NULL),          /* 
2nd Def */
-      GSF_XML_IN_NODE (LEGEND, LAYOUT, XL_NS_CHART, "layout", GSF_XML_NO_CONTENT, NULL, NULL),         /* 
2nd Def */
       GSF_XML_IN_NODE (LEGEND, LEGEND_POS, XL_NS_CHART, "legendPos", GSF_XML_NO_CONTENT, 
&xlsx_chart_legend_pos, NULL),
+      GSF_XML_IN_NODE (LEGEND, LEGEND_ENTRY, XL_NS_CHART, "legendEntry", GSF_XML_NO_CONTENT, NULL, NULL),
+        GSF_XML_IN_NODE (LEGEND_ENTRY, LEGEND_ENTRYIDX, XL_NS_CHART, "idx", GSF_XML_NO_CONTENT, NULL, NULL),
+        GSF_XML_IN_NODE (LEGEND_ENTRY, LEGEND_ENTRYDELETE, XL_NS_CHART, "delete", GSF_XML_NO_CONTENT, NULL, 
NULL),
+        GSF_XML_IN_NODE (LEGEND_ENTRY, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_2ND, NULL, NULL),
+      GSF_XML_IN_NODE (LEGEND, LAYOUT, XL_NS_CHART, "layout", GSF_XML_2ND, NULL, NULL),
+      GSF_XML_IN_NODE (LEGEND, OVERLAY, XL_NS_CHART, "overlay", GSF_XML_2ND, NULL, NULL),
+      GSF_XML_IN_NODE (LEGEND, SHAPE_PR, XL_NS_CHART, "spPr", GSF_XML_2ND, NULL, NULL),
+      GSF_XML_IN_NODE (LEGEND, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_2ND, NULL, NULL),
     GSF_XML_IN_NODE (CHART, CHART_HIDDEN, XL_NS_CHART, "plotVisOnly", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (CHART, CHART_BLANKS, XL_NS_CHART, "dispBlanksAs", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (CHART, AUTO_TITLE_DEL, XL_NS_CHART, "autoTitleDeleted", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -3503,11 +3496,6 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
          GSF_XML_IN_NODE (FILL_SOLID, COLOR_RGB,        XL_NS_DRAW, "srgbClr", GSF_XML_NO_CONTENT, 
&xlsx_draw_color_rgb, NULL),
             COLOR_MODIFIER_NODES(COLOR_THEMED,0),
 
-       GSF_XML_IN_NODE (SHAPE_PR, FILL_BLIP,   XL_NS_DRAW, "blipFill", GSF_XML_NO_CONTENT, NULL, NULL),
-         GSF_XML_IN_NODE (FILL_BLIP, FILL_BLIP_BLIP,   XL_NS_DRAW, "blip", GSF_XML_NO_CONTENT, NULL, NULL),
-         GSF_XML_IN_NODE (FILL_BLIP, FILL_BLIP_SRC,    XL_NS_DRAW, "srcRect", GSF_XML_NO_CONTENT, NULL, 
NULL),
-         GSF_XML_IN_NODE (FILL_BLIP, FILL_BLIP_TILE,   XL_NS_DRAW, "tile", GSF_XML_NO_CONTENT, NULL, NULL),
-
        GSF_XML_IN_NODE (SHAPE_PR, FILL_GRAD,   XL_NS_DRAW, "gradFill", GSF_XML_NO_CONTENT, 
xlsx_draw_grad_fill, NULL),
          GSF_XML_IN_NODE (FILL_GRAD, GRAD_LIST,        XL_NS_DRAW, "gsLst", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (GRAD_LIST, GRAD_LIST_ITEM, XL_NS_DRAW, "gs", GSF_XML_NO_CONTENT, 
xlsx_draw_grad_stop, xlsx_draw_grad_stop_end),
@@ -3555,7 +3543,6 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
               GSF_XML_IN_NODE (C_NV_PR, HLINK_CLICK, XL_NS_DRAW, "hlinkClick", GSF_XML_NO_CONTENT, NULL, 
NULL),
           GSF_XML_IN_NODE (CXN_SP, SHAPE_PR, XL_NS_SS_DRAW, "spPr", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (CXN_SP, SP_XFRM_STYLE, XL_NS_SS_DRAW, "style", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (SHAPE_PR, SP_PR_PRST_GEOM, XL_NS_DRAW, "prstGeom", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (SHAPE_PR, EXTLST, XL_NS_DRAW, "extLst", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (EXTLST, EXTITEM, XL_NS_DRAW, "ext", GSF_XML_NO_CONTENT, &xlsx_ext_begin, 
&xlsx_ext_end),
             GSF_XML_IN_NODE (EXTITEM, EXT_GOSTYLE, XL_NS_GNM_EXT, "gostyle", GSF_XML_NO_CONTENT, 
&xlsx_ext_gostyle, NULL),
@@ -3566,9 +3553,8 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
        GSF_XML_IN_NODE (TX_BODY, TEXT_PR_P,    XL_NS_DRAW, "p", GSF_XML_NO_CONTENT, NULL, NULL),             
          /* 2nd Def */
 
       GSF_XML_IN_NODE (SHAPE, NV_SP_PR, XL_NS_SS_DRAW, "nvSpPr", GSF_XML_NO_CONTENT, NULL, NULL),
+        GSF_XML_IN_NODE (NV_SP_PR, C_NV_PR, XL_NS_SS_DRAW, "cNvPr", GSF_XML_2ND, NULL, NULL),
         GSF_XML_IN_NODE (NV_SP_PR, C_NV_SP_PR, XL_NS_SS_DRAW, "cNvSpPr", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (C_NV_SP_PR, SP_LOCKS, XL_NS_DRAW, "spLocks", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (NV_SP_PR, C_NV_PR, XL_NS_SS_DRAW, "cNvPr", GSF_XML_NO_CONTENT, NULL, NULL),
 
        GSF_XML_IN_NODE (SP_PR_XFRM, SP_XFRM_EXT, XL_NS_DRAW, "ext", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (SP_XFRM_EXT, SP_PR_PRST_GEOM, XL_NS_DRAW, "prstGeom", GSF_XML_NO_CONTENT, NULL, 
NULL),
@@ -3576,20 +3562,8 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
        GSF_XML_IN_NODE (SHAPE_PR, FILL_NONE,   XL_NS_DRAW, "noFill", GSF_XML_NO_CONTENT, NULL, NULL),
        GSF_XML_IN_NODE (SHAPE_PR, FILL_SOLID,  XL_NS_DRAW, "solidFill", GSF_XML_NO_CONTENT, NULL, NULL),
        GSF_XML_IN_NODE (SHAPE_PR, FILL_BLIP,   XL_NS_DRAW, "blipFill", GSF_XML_NO_CONTENT, NULL, NULL),
-       GSF_XML_IN_NODE (SHAPE_PR, FILL_GRAD,   XL_NS_DRAW, "gradFill", GSF_XML_NO_CONTENT, NULL, NULL),
-       GSF_XML_IN_NODE (SHAPE_PR, FILL_PATT,   XL_NS_DRAW, "pattFill", GSF_XML_NO_CONTENT, NULL, NULL),
        GSF_XML_IN_NODE (SHAPE_PR, SHAPE_PR_LN, XL_NS_DRAW, "ln", GSF_XML_NO_CONTENT, NULL, NULL),
-       GSF_XML_IN_NODE (SHAPE_PR, TEXT_PR, XL_NS_CHART, "txPr", GSF_XML_NO_CONTENT, NULL, NULL),
-      GSF_XML_IN_NODE (SHAPE, TX_BODY, XL_NS_SS_DRAW, "txBody", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (TX_BODY, LST_STYLE, XL_NS_DRAW, "lstStyle", GSF_XML_NO_CONTENT, NULL, NULL),        
          /* 2nd Def */
-        GSF_XML_IN_NODE (TX_BODY, TX_BODY_PR, XL_NS_DRAW, "bodyPr", GSF_XML_NO_CONTENT, NULL, NULL),
-       GSF_XML_IN_NODE (TX_BODY, TEXT_PR_P,    XL_NS_DRAW, "p", GSF_XML_NO_CONTENT, NULL, NULL),             
          /* 2nd Def */
 
-      GSF_XML_IN_NODE (SHAPE, NV_SP_PR, XL_NS_SS_DRAW, "nvSpPr", GSF_XML_NO_CONTENT, NULL, NULL),
-        GSF_XML_IN_NODE (NV_SP_PR, C_NV_SP_PR, XL_NS_SS_DRAW, "cNvSpPr", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (C_NV_SP_PR, SP_LOCKS, XL_NS_DRAW, "spLocks", GSF_XML_NO_CONTENT, NULL, NULL),
-          GSF_XML_IN_NODE (C_NV_SP_PR, HLINK_CLICK, XL_NS_DRAW, "hlinkClick", GSF_XML_NO_CONTENT, NULL, 
NULL),
-        GSF_XML_IN_NODE (NV_SP_PR, C_NV_PR, XL_NS_SS_DRAW, "cNvPr", GSF_XML_NO_CONTENT, NULL, NULL),
 
     GSF_XML_IN_NODE (TWO_CELL, GRAPHIC_FRAME, XL_NS_SS_DRAW, "graphicFrame", GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (GRAPHIC_FRAME, GRAPHIC_PR, XL_NS_SS_DRAW, "nvGraphicFramePr", GSF_XML_NO_CONTENT, 
NULL, NULL),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]