GNOME.org
 

[gnumeric] expect number:fill-character in ODF import

commit 6f54be62a522123024a6b00f31e411e0cd6b4231
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sun Mar 30 20:38:03 2014 -0600

    expect number:fill-character in ODF import
    
    2014-03-30  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c: expect number:fill-character

 plugins/openoffice/ChangeLog         |    4 ++++
 plugins/openoffice/openoffice-read.c |   17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index fdd901e..9b4b65b 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,9 @@
 2014-03-30  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+       * openoffice-read.c: expect number:fill-character
+
+2014-03-30  Andreas J. Guelzow <aguelzow pyrshep ca>
+
        * openoffice-read.c (odf_header_footer_left): only warn if the
        provided left header/footer style is intended to be displayed
 
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 9a53a04..46d6f50 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -10821,7 +10821,8 @@ GSF_XML_IN_NODE (OFFICE_DOC_STYLES, OFFICE_STYLES, OO_NS_OFFICE, "styles", GSF_X
     GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_MAP, OO_NS_STYLE,            "map", GSF_XML_NO_CONTENT, &odf_map, 
NULL),
     GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_TEXT_PROP, OO_NS_STYLE,      "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
     GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_TEXT_INVISBLE, OO_GNUM_NS_EXT, "invisible", GSF_XML_NO_CONTENT, 
NULL, NULL), /* 2nd */
-
+    GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_FILL_CHARACTER, OO_NS_NUMBER,        "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
+ 
   GSF_XML_IN_NODE (OFFICE_STYLES, DATE_STYLE, OO_NS_NUMBER, "date-style", GSF_XML_NO_CONTENT, 
&oo_date_style, &oo_date_style_end),
     GSF_XML_IN_NODE (DATE_STYLE, DATE_DAY, OO_NS_NUMBER,               "day", GSF_XML_NO_CONTENT,      
&oo_date_day, NULL),
     GSF_XML_IN_NODE (DATE_STYLE, DATE_MONTH, OO_NS_NUMBER,             "month", GSF_XML_NO_CONTENT,    
&oo_date_month, NULL),
@@ -10837,6 +10838,7 @@ GSF_XML_IN_NODE (OFFICE_DOC_STYLES, OFFICE_STYLES, OO_NS_OFFICE, "styles", GSF_X
     GSF_XML_IN_NODE (DATE_STYLE, DATE_TEXT, OO_NS_NUMBER,              "text", GSF_XML_CONTENT, 
&odf_date_text_start, &oo_date_text_end),
     GSF_XML_IN_NODE (DATE_STYLE, DATE_TEXT_PROP, OO_NS_STYLE,          "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
     GSF_XML_IN_NODE (DATE_STYLE, DATE_MAP, OO_NS_STYLE,                        "map", GSF_XML_NO_CONTENT, 
NULL, NULL),
+    GSF_XML_IN_NODE (DATE_STYLE, DATE_FILL_CHARACTER, OO_NS_NUMBER,    "fill-character", GSF_XML_NO_CONTENT, 
NULL, NULL),
 
   GSF_XML_IN_NODE (OFFICE_STYLES, TIME_STYLE, OO_NS_NUMBER, "time-style", GSF_XML_NO_CONTENT, 
&oo_date_style, &oo_date_style_end),
     GSF_XML_IN_NODE (TIME_STYLE, TIME_HOURS, OO_NS_NUMBER,             "hours", GSF_XML_NO_CONTENT,    
&oo_date_hours, NULL),
@@ -10846,6 +10848,7 @@ GSF_XML_IN_NODE (OFFICE_DOC_STYLES, OFFICE_STYLES, OO_NS_OFFICE, "styles", GSF_X
     GSF_XML_IN_NODE (TIME_STYLE, TIME_TEXT, OO_NS_NUMBER,              "text", GSF_XML_CONTENT,  
&odf_date_text_start, &oo_date_text_end),
     GSF_XML_IN_NODE (TIME_STYLE, TIME_TEXT_PROP, OO_NS_STYLE,          "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
     GSF_XML_IN_NODE (TIME_STYLE, TIME_MAP, OO_NS_STYLE,                        "map", GSF_XML_NO_CONTENT, 
NULL, NULL),
+    GSF_XML_IN_NODE (TIME_STYLE, TIME_FILL_CHARACTER, OO_NS_NUMBER,    "fill-character", GSF_XML_NO_CONTENT, 
NULL, NULL),
 
   GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_BOOL, OO_NS_NUMBER, "boolean-style", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (STYLE_BOOL, BOOL_PROP, OO_NS_NUMBER, "boolean", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -10858,12 +10861,14 @@ GSF_XML_IN_NODE (OFFICE_DOC_STYLES, OFFICE_STYLES, OO_NS_OFFICE, "styles", GSF_X
     GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_TEXT, OO_NS_NUMBER,      "text", GSF_XML_CONTENT, 
&odf_date_text_start, &oo_date_text_end),
       GSF_XML_IN_NODE (CURRENCY_TEXT, CURRENCY_TEXT_INVISBLE, OO_GNUM_NS_EXT, "invisible", 
GSF_XML_NO_CONTENT, &odf_number_invisible_text, NULL),
     GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_TEXT_PROP, OO_NS_STYLE,  "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
+    GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_FILL_CHARACTER, OO_NS_NUMBER,    "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
 
   GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_PERCENTAGE, OO_NS_NUMBER, "percentage-style", GSF_XML_NO_CONTENT, 
&odf_number_percentage_style, &odf_number_style_end),
     GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_STYLE_PROP, OO_NS_NUMBER,    "number", GSF_XML_NO_CONTENT, 
&odf_number, NULL),
     GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_TEXT, OO_NS_NUMBER,          "text", GSF_XML_CONTENT, 
&odf_date_text_start, &oo_date_text_end),
     GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_MAP, OO_NS_STYLE,            "map", GSF_XML_NO_CONTENT, 
&odf_map, NULL),
     GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_TEXT_PROP, OO_NS_STYLE,      "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
+    GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_FILL_CHARACTER, OO_NS_NUMBER,        "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
 
   GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_TEXT, OO_NS_NUMBER, "text-style", GSF_XML_NO_CONTENT, 
&odf_number_style, &odf_number_style_end),
     GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_CONTENT, OO_NS_NUMBER,     "text-content", GSF_XML_NO_CONTENT,  
&odf_text_content, NULL),
@@ -10964,6 +10969,7 @@ GSF_XML_IN_NODE (OFFICE_STYLES, PAGE_MASTER, OO_NS_STYLE, "page-master", GSF_XML
       GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_SCI_STYLE_PROP, OO_NS_NUMBER, "scientific-number", 
GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_STYLE_PROP, OO_NS_STYLE,     "properties", GSF_XML_NO_CONTENT, 
NULL, NULL),
       GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_MAP, OO_NS_STYLE,            "map", GSF_XML_NO_CONTENT, NULL, 
NULL),
+      GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_FILL_CHARACTER, OO_NS_NUMBER, "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
 
     GSF_XML_IN_NODE (OFFICE_STYLES, DATE_STYLE, OO_NS_NUMBER, "date-style", GSF_XML_NO_CONTENT, 
&oo_date_style, &oo_date_style_end),
       GSF_XML_IN_NODE (DATE_STYLE, DATE_DAY, OO_NS_NUMBER,             "day", GSF_XML_NO_CONTENT,      
&oo_date_day, NULL),
@@ -10980,6 +10986,7 @@ GSF_XML_IN_NODE (OFFICE_STYLES, PAGE_MASTER, OO_NS_STYLE, "page-master", GSF_XML
       GSF_XML_IN_NODE (DATE_STYLE, DATE_TEXT, OO_NS_NUMBER,            "text", GSF_XML_CONTENT, 
&odf_date_text_start, &oo_date_text_end),
       GSF_XML_IN_NODE (DATE_STYLE, DATE_TEXT_PROP, OO_NS_STYLE,                "text-properties", 
GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (DATE_STYLE, DATE_MAP, OO_NS_STYLE,              "map", GSF_XML_NO_CONTENT, NULL, 
NULL),
+      GSF_XML_IN_NODE (DATE_STYLE, DATE_FILL_CHARACTER, OO_NS_NUMBER, "fill-character", GSF_XML_NO_CONTENT, 
NULL, NULL),
 
     GSF_XML_IN_NODE (OFFICE_STYLES, TIME_STYLE, OO_NS_NUMBER, "time-style", GSF_XML_NO_CONTENT, 
&oo_date_style, &oo_date_style_end),
       GSF_XML_IN_NODE (TIME_STYLE, TIME_HOURS, OO_NS_NUMBER,           "hours", GSF_XML_NO_CONTENT,    
&oo_date_hours, NULL),
@@ -10989,6 +10996,7 @@ GSF_XML_IN_NODE (OFFICE_STYLES, PAGE_MASTER, OO_NS_STYLE, "page-master", GSF_XML
       GSF_XML_IN_NODE (TIME_STYLE, TIME_TEXT, OO_NS_NUMBER,            "text", GSF_XML_CONTENT, 
&odf_date_text_start, &oo_date_text_end),
       GSF_XML_IN_NODE (TIME_STYLE, TIME_TEXT_PROP, OO_NS_STYLE,                "text-properties", 
GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (TIME_STYLE, TIME_MAP, OO_NS_STYLE,              "map", GSF_XML_NO_CONTENT, NULL, 
NULL),
+      GSF_XML_IN_NODE (TIME_STYLE, TIME_FILL_CHARACTER, OO_NS_NUMBER, "fill-character", GSF_XML_NO_CONTENT, 
NULL, NULL),
 
     GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_BOOL, OO_NS_NUMBER, "boolean-style", GSF_XML_NO_CONTENT, NULL, 
NULL),
       GSF_XML_IN_NODE (STYLE_BOOL, BOOL_PROP, OO_NS_NUMBER, "boolean", GSF_XML_NO_CONTENT, NULL, NULL),
@@ -10998,9 +11006,11 @@ GSF_XML_IN_NODE (OFFICE_STYLES, PAGE_MASTER, OO_NS_STYLE, "page-master", GSF_XML
       GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_MAP, OO_NS_STYLE, "map", GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_SYMBOL, OO_NS_NUMBER, "currency-symbol", GSF_XML_NO_CONTENT, 
NULL, NULL),
       GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_TEXT, OO_NS_NUMBER, "text", GSF_XML_NO_CONTENT, NULL, NULL),
+      GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_FILL_CHARACTER, OO_NS_NUMBER,  "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_PERCENTAGE, OO_NS_NUMBER, "percentage-style", GSF_XML_NO_CONTENT, 
NULL, NULL),
       GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_STYLE_PROP, OO_NS_NUMBER, "number", GSF_XML_NO_CONTENT, 
NULL, NULL),
       GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_TEXT, OO_NS_NUMBER, "text", GSF_XML_NO_CONTENT, NULL, 
NULL),
+      GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_FILL_CHARACTER, OO_NS_NUMBER,      "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_TEXT, OO_NS_NUMBER, "text-style", GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_CONTENT, OO_NS_NUMBER,   "text-content", GSF_XML_NO_CONTENT, 
NULL, NULL),
       GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_PROP, OO_NS_NUMBER,              "text", GSF_XML_NO_CONTENT, 
NULL, NULL),
@@ -11099,6 +11109,7 @@ static GsfXMLInNode const opendoc_content_dtd [] =
              GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_SCI_STYLE_PROP, OO_NS_NUMBER, "scientific-number", 
GSF_XML_NO_CONTENT, &odf_scientific, NULL),
              GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_MAP, OO_NS_STYLE,             "map", GSF_XML_NO_CONTENT, 
&odf_map, NULL),
               GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_TEXT_PROP, OO_NS_STYLE,    "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
+              GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_FILL_CHARACTER, OO_NS_NUMBER, "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
            GSF_XML_IN_NODE (OFFICE_STYLES, DATE_STYLE, OO_NS_NUMBER, "date-style", GSF_XML_NO_CONTENT, 
&oo_date_style, &oo_date_style_end),
              GSF_XML_IN_NODE (DATE_STYLE, DATE_DAY, OO_NS_NUMBER,              "day", GSF_XML_NO_CONTENT,    
  &oo_date_day, NULL),
              GSF_XML_IN_NODE (DATE_STYLE, DATE_MONTH, OO_NS_NUMBER,            "month", GSF_XML_NO_CONTENT,  
  &oo_date_month, NULL),
@@ -11114,6 +11125,7 @@ static GsfXMLInNode const opendoc_content_dtd [] =
              GSF_XML_IN_NODE (DATE_STYLE, DATE_TEXT, OO_NS_NUMBER,             "text", GSF_XML_CONTENT,  
&odf_date_text_start, &oo_date_text_end),
              GSF_XML_IN_NODE (DATE_STYLE, DATE_TEXT_PROP, OO_NS_STYLE,         "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
              GSF_XML_IN_NODE (DATE_STYLE, DATE_MAP, OO_NS_STYLE,               "map", GSF_XML_NO_CONTENT, 
NULL, NULL),
+              GSF_XML_IN_NODE (DATE_STYLE, DATE_FILL_CHARACTER, OO_NS_NUMBER, "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
            GSF_XML_IN_NODE (OFFICE_STYLES, TIME_STYLE, OO_NS_NUMBER,   "time-style", GSF_XML_NO_CONTENT, 
&oo_date_style, &oo_date_style_end),
              GSF_XML_IN_NODE (TIME_STYLE, TIME_HOURS, OO_NS_NUMBER,    "hours", GSF_XML_NO_CONTENT,    
&oo_date_hours, NULL),
              GSF_XML_IN_NODE (TIME_STYLE, TIME_MINUTES, OO_NS_NUMBER,  "minutes", GSF_XML_NO_CONTENT, 
&oo_date_minutes, NULL),
@@ -11122,6 +11134,7 @@ static GsfXMLInNode const opendoc_content_dtd [] =
              GSF_XML_IN_NODE (TIME_STYLE, TIME_TEXT, OO_NS_NUMBER,     "text", GSF_XML_CONTENT, 
&odf_date_text_start, &oo_date_text_end),
              GSF_XML_IN_NODE (TIME_STYLE, TIME_TEXT_PROP, OO_NS_STYLE, "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
              GSF_XML_IN_NODE (TIME_STYLE, TIME_MAP, OO_NS_STYLE,       "map", GSF_XML_NO_CONTENT, NULL, 
NULL),
+              GSF_XML_IN_NODE (TIME_STYLE, TIME_FILL_CHARACTER, OO_NS_NUMBER, "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
            GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_BOOL, OO_NS_NUMBER,   "boolean-style", GSF_XML_NO_CONTENT, 
NULL, NULL),
              GSF_XML_IN_NODE (STYLE_BOOL, BOOL_PROP, OO_NS_NUMBER,     "boolean", GSF_XML_NO_CONTENT, NULL, 
NULL),
            GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_CURRENCY, OO_NS_NUMBER,       "currency-style", 
GSF_XML_NO_CONTENT, &odf_number_style, &odf_number_style_end),
@@ -11131,11 +11144,13 @@ static GsfXMLInNode const opendoc_content_dtd [] =
              GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_SYMBOL, OO_NS_NUMBER,   "currency-symbol", 
GSF_XML_CONTENT, NULL, &odf_currency_symbol_end),
              GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_TEXT, OO_NS_NUMBER,     "text", GSF_XML_CONTENT, 
&odf_date_text_start, &oo_date_text_end),
              GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_TEXT_PROP, OO_NS_STYLE, "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
+              GSF_XML_IN_NODE (STYLE_CURRENCY, CURRENCY_FILL_CHARACTER, OO_NS_NUMBER, "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
            GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_PERCENTAGE, OO_NS_NUMBER, "percentage-style", 
GSF_XML_NO_CONTENT, &odf_number_percentage_style, &odf_number_style_end),
              GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_STYLE_PROP, OO_NS_NUMBER,   "number", 
GSF_XML_NO_CONTENT, &odf_number, NULL),
              GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_TEXT, OO_NS_NUMBER,         "text", 
GSF_XML_CONTENT, &odf_date_text_start, &oo_date_text_end),
              GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_MAP, OO_NS_STYLE,           "map", 
GSF_XML_NO_CONTENT, &odf_map, NULL),
              GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_TEXT_PROP, OO_NS_STYLE,     "text-properties", 
GSF_XML_NO_CONTENT, &odf_number_color, NULL),
+              GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_FILL_CHARACTER, OO_NS_NUMBER, "fill-character", 
GSF_XML_NO_CONTENT, NULL, NULL),
            GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_TEXT, OO_NS_NUMBER,           "text-style", 
GSF_XML_NO_CONTENT, NULL, NULL),
              GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_CONTENT, OO_NS_NUMBER,    "text-content", 
GSF_XML_NO_CONTENT, NULL, NULL),
              GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_PROP, OO_NS_NUMBER,       "text", GSF_XML_NO_CONTENT, 
NULL, NULL),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]