[gnumeric] Don't write unnecessary manifest entries in ODF export.



commit 3f111ec2a09164991d6be8ef55107e8c96e8b8b3
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Tue Apr 6 13:43:02 2010 -0600

    Don't write unnecessary manifest entries in ODF export.
    
    2010-04-06  Andreas J. Guelzow <aguelzow pyrshep ca>
    
            * openoffice-write.c (odf_write_manifest): only write a manifest
              entry for Pictures/ if we have any
    
    2010-04-06  Andreas J. Guelzow <aguelzow pyrshep ca>
    
            * moduleset: use git not svn

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-write.c |    9 ++++++---
 tools/ChangeLog                       |    4 ++++
 tools/moduleset                       |    4 ++--
 5 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index 74409de..2ff9ebe 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Andreas:
 	* Extend regression tool to perform multiple simple regressions.
 	  [#614031]
 	* Fix ZTEST description. [#614746]
+	* Don't write unnecessary manifest entries in ODF export.
 
 Morten:
 	* Improve object sizing tooltip positioning a bit.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 42e75c9..b052425 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-06  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-write.c (odf_write_manifest): only write a manifest
+	  entry for Pictures/ if we have any
+
 2010-03-08  Morten Welinder <terra gnome org>
 
 	* Release 1.10.1
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 3b048e1..251b441 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -3202,14 +3202,17 @@ odf_write_manifest (GnmOOExport *state, GsfOutput *child)
 	gsf_xml_out_add_cstr_unchecked (xml, "xmlns:manifest",
 		"urn:oasis:names:tc:opendocument:xmlns:manifest:1.0");
 	odf_file_entry (xml, "application/vnd.oasis.opendocument.spreadsheet" ,"/");
-	odf_file_entry (xml, "", "Pictures/");
 	odf_file_entry (xml, "text/xml", "content.xml");
 	odf_file_entry (xml, "text/xml", "styles.xml");
 	odf_file_entry (xml, "text/xml", "meta.xml");
 	odf_file_entry (xml, "text/xml", "settings.xml");
 
-	state->xml = xml;
-	g_hash_table_foreach (state->objects, (GHFunc) odf_write_graph_manifest, state);
+	if (g_hash_table_size (state->objects) > 0) {
+		odf_file_entry (xml, "", "Pictures/");
+		state->xml = xml;
+		g_hash_table_foreach (state->objects, (GHFunc) odf_write_graph_manifest, state);
+		state->xml = NULL;
+	}
 
 	gsf_xml_out_end_element (xml); /* </manifest:manifest> */
 	g_object_unref (xml);
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 1b1e67d..71acac9 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-06  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* moduleset: use git not svn
+
 2010-03-08  Morten Welinder <terra gnome org>
 
 	* Release 1.10.1
diff --git a/tools/moduleset b/tools/moduleset
index 6144898..2c59c3b 100644
--- a/tools/moduleset
+++ b/tools/moduleset
@@ -2,8 +2,8 @@
 <!DOCTYPE doc [
 ]>
 <moduleset>
-    <repository type="svn" name="svn.gnome.org" default="yes"
-		href="http://svn.gnome.org/svn/"/>
+    <repository type="git" name="git.gnome.org" default="yes"
+		href="git://git.gnome.org/"/>
 
     <autotools id="libgsf" version="trunk">
 	<branch/>



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