[libgsf] Add some more OOo 3.2 namespaces.

[Andreas J. Guelzow <guelzow src gnome org>]

commit 4ca12057b80d29cc6ca02eba30eff6544db2294d
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Aug 15 15:39:16 2010 -0600

    Add some more OOo 3.2 namespaces.
    
    2009-08-15  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* gsf/gsf-opendoc-utils.c (gsf_ooo_ns): add some more of OOo's namespaces
    	* gsf/gsf-opendoc-utils.h: add new enum values to support above name spaces)
    	* gsf/gsf-output-bzip.c (gsf_output_bzip_close): quieten compile

 ChangeLog               |    6 ++++++
 NEWS                    |    3 +++
 gsf/gsf-opendoc-utils.c |    5 +++++
 gsf/gsf-opendoc-utils.h |    7 ++++++-
 gsf/gsf-output-bzip.c   |    8 ++++++--
 5 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f59f805..0f4868f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-15  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* gsf/gsf-opendoc-utils.c (gsf_ooo_ns): add some more of OOo's namespaces
+	* gsf/gsf-opendoc-utils.h: add new enum values to support above name spaces)
+	* gsf/gsf-output-bzip.c (gsf_output_bzip_close): quieten compile
+
 2010-07-28  Morten Welinder  <terra gnome org>
 
 	* gsf/gsf-utils.c (gsf_debug_flag): New function.
diff --git a/NEWS b/NEWS
index 3236982..57ccd32 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 libgsf 1.14.19
 
+Andreas:
+	* Add some more OOo 3.2 namespaces.
+
 Morten:
 	* Quiet xml parsing a bit.
 
diff --git a/gsf/gsf-opendoc-utils.c b/gsf/gsf-opendoc-utils.c
index c1c1a5e..b58e42e 100644
--- a/gsf/gsf-opendoc-utils.c
+++ b/gsf/gsf-opendoc-utils.c
@@ -110,6 +110,11 @@ GsfXMLInNS gsf_ooo_ns[] = {
 	GSF_XML_IN_NS (OO_NS_RPT,       "http://openoffice.org/2005/report";),
 	GSF_XML_IN_NS (OO_NS_RDFA,      "http://docs.oasis-open.org/opendocument/meta/rdfa#";),
 
+	/* OOo 3.2.x */
+	GSF_XML_IN_NS (OO_NS_GRDDL,     "http://www.w3.org/2003/g/data-view#";),
+	GSF_XML_IN_NS (OO_NS_XHTML,     "http://www.w3.org/1999/xhtml";),
+	GSF_XML_IN_NS (OO_NS_TABLE_OOO, "http://openoffice.org/2009/table";),
+
 	/* Other OpenDocument v 1.1 */
 	GSF_XML_IN_NS (OO_NS_CONFIG,    "urn:oasis:names:tc:opendocument:xmlns:config:1.0"),
 	GSF_XML_IN_NS (OO_NS_ANIM,      "urn:oasis:names:tc:opendocument:xmlns:animation:1.0"),
diff --git a/gsf/gsf-opendoc-utils.h b/gsf/gsf-opendoc-utils.h
index 0b307f3..9539bac 100644
--- a/gsf/gsf-opendoc-utils.h
+++ b/gsf/gsf-opendoc-utils.h
@@ -87,7 +87,12 @@ enum {
 	OO_MS_NS_MSOXL,
 
 	/* Gnumeric ODF extensions */
-	OO_GNUM_NS_EXT
+	OO_GNUM_NS_EXT,
+
+	/* New in ODF 3.2 */
+	OO_NS_GRDDL,
+	OO_NS_XHTML,
+	OO_NS_TABLE_OOO
 };
 
 G_MODULE_EXPORT GsfXMLInNS *get_gsf_ooo_ns (void);
diff --git a/gsf/gsf-output-bzip.c b/gsf/gsf-output-bzip.c
index 74686a0..d566160 100644
--- a/gsf/gsf-output-bzip.c
+++ b/gsf/gsf-output-bzip.c
@@ -180,10 +180,10 @@ gsf_output_bzip_seek (G_GNUC_UNUSED GsfOutput *output,
 	return FALSE;
 }
 
+#ifdef HAVE_BZ2
 static gboolean
 gsf_output_bzip_close (GsfOutput *output)
 {
-#ifdef HAVE_BZ2
 	GsfOutputBzip *bzip = GSF_OUTPUT_BZIP (output);
 	gboolean rt;
 
@@ -191,10 +191,14 @@ gsf_output_bzip_close (GsfOutput *output)
 	BZ2_bzCompressEnd (&bzip->stream);
 
 	return rt;
+}
 #else
+static gboolean
+gsf_output_bzip_close (G_GNUC_UNUSED GsfOutput *output)
+{
 	return FALSE;
-#endif
 }
+#endif
 
 static void
 gsf_output_bzip_init (GObject *obj)