[gnumeric] Don't export filter combos to ODF. [#610399]

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

commit 7a907f1e94a47f4565d4f1171c812e23329417f0
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Thu Feb 18 15:14:16 2010 -0700

    Don't export filter combos to ODF. [#610399]
    
    2010-02-18  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-write.c (odf_write_objects): don't export the filter
    	  combos

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-write.c |    3 ++-
 3 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index f1cf2b7..4ccfb1f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Gnumeric 1.10.1
 
 Andreas:
 	* Fix storing of error-literals in ODF. [#610175]
+	* Don't export filter combos to ODF. [#610399]
 
 Jean:
 	* Fix a crasher in excelplugin: don't call a NULL function. [#610012]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index c3df528..c840ce9 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2010-02-18  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-write.c (odf_write_objects): don't export the filter
+	  combos
+
+2010-02-18  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-write.c (odf_write_cell): use value_get_as_gstring
 	  rather than value_get_as_float [#610372]
 	(odf_write_filter_cond): use value_get_as_gstring rather than
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 70185bf..1bdd981 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -64,6 +64,7 @@
 #include <sheet-object.h>
 #include <sheet-object-graph.h>
 #include <sheet-object-cell-comment.h>
+#include <sheet-filter-combo.h>
 
 #include <gsf/gsf-libxml.h>
 #include <gsf/gsf-output.h>
@@ -2225,7 +2226,7 @@ odf_write_objects (GnmOOExport *state, GSList *objects)
 		}
 		if (IS_CELL_COMMENT (so))
 			odf_write_comment (state, CELL_COMMENT (so));
-		else
+		else if (!IS_GNM_FILTER_COMBO (so))
 			odf_write_frame (state, so);
 	}
 }