[gnumeric] Quieten the complaints when importing a kspread odf file



commit 62d6586f04fab4cc89b6311837d3e000d1988d13
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Mon May 11 07:46:24 2009 -0600

    Quieten the complaints when importing a kspread odf file
    
    2009-05-11  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (styles_dtd): there can be column and row
    	  properties in the default style
    	* plugin.xml.in: remove the UNFINISHED label to see what aspects
    	  people are in fact trying to use
---
 plugins/openoffice/ChangeLog         |    7 +++++++
 plugins/openoffice/openoffice-read.c |    2 ++
 plugins/openoffice/plugin.xml.in     |    8 ++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 2d380d9..e6f62fc 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-11  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-read.c (styles_dtd): there can be column and row 
+	  properties in the default style
+	* plugin.xml.in: remove the UNFINISHED label to see what aspects
+	  people are in fact trying to use
+
 2009-05-10  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* openoffice-read.c (oo_extent_sheet_cols): new
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 18f0a98..c92d37a 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -2630,6 +2630,8 @@ GSF_XML_IN_NODE (START, OFFICE_STYLES, OO_NS_OFFICE, "styles", GSF_XML_NO_CONTEN
       GSF_XML_IN_NODE (DEFAULT_PARAGRAPH_PROPS, DEFAULT_PARA_TABS, OO_NS_STYLE,  "tab-stops", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (DEFAULT_STYLE, DEFAULT_STYLE_PROP, OO_NS_STYLE,	   "properties", GSF_XML_NO_CONTENT, &oo_style_prop, NULL),
       GSF_XML_IN_NODE (DEFAULT_STYLE_PROP, STYLE_TAB_STOPS, OO_NS_STYLE, "tab-stops", GSF_XML_NO_CONTENT, NULL, NULL),
+    GSF_XML_IN_NODE (DEFAULT_STYLE, DEFAULT_TABLE_COL_PROPS, OO_NS_STYLE, "table-column-properties", GSF_XML_NO_CONTENT, &oo_style_prop, NULL),
+    GSF_XML_IN_NODE (DEFAULT_STYLE, DEFAULT_TABLE_ROW_PROPS, OO_NS_STYLE, "table-row-properties", GSF_XML_NO_CONTENT, &oo_style_prop, NULL),
 
   GSF_XML_IN_NODE (OFFICE_STYLES, NUMBER_STYLE, OO_NS_NUMBER, "number-style", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (NUMBER_STYLE, NUMBER_STYLE_NUMBER, OO_NS_NUMBER,	"number", GSF_XML_NO_CONTENT, NULL, NULL),
diff --git a/plugins/openoffice/plugin.xml.in b/plugins/openoffice/plugin.xml.in
index 3b1d537..f3564ce 100644
--- a/plugins/openoffice/plugin.xml.in
+++ b/plugins/openoffice/plugin.xml.in
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin id="Gnumeric_OpenCalc">
 	<information>
-		<_name>OpenCalc/StarCalc</_name>
-		<_description>Open/Star Office spreadsheet</_description>
+		<_name>Open Document Format</_name>
+		<_description>Open Document Format as used by OpenOffice, Lotus Symphony, etc.</_description>
 	</information>
 	<loader type="Gnumeric_Builtin:module">
 		<attribute name="module_file" value="openoffice"/>
@@ -10,7 +10,7 @@
 	<services>
 		<service type="file_opener" id="openoffice" priority="1" probe="TRUE">
 			<information>
-				<_description>Open/Star Calc (*.sxc, *.ods)</_description>
+				<_description>Open Document Format (*.sxc, *.ods)</_description>
 			</information>
 			<suffixes>
 				<suffix>ods</suffix>
@@ -28,7 +28,7 @@
 		<service type="file_saver" id="openoffice" file_extension="ods"
 		         format_level="auto" overwrite_files="TRUE">
 			<information>
-				<_description>OpenDocument/OpenOffice _UNFINISHED_ (*.ods)</_description>
+				<_description>Open Document Format/OpenOffice (*.ods)</_description>
 			</information>
 		</service>
 	</services>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]