[gnumeric] Apply filter on ODF import. [#610399]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Apply filter on ODF import. [#610399]
- Date: Thu, 18 Feb 2010 22:36:58 +0000 (UTC)
commit 6910bbd3e72498cf8fd7198b694eea21fb07e3db
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Thu Feb 18 15:36:25 2010 -0700
Apply filter on ODF import. [#610399]
2010-02-18 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (oo_db_range_end): reapply filter [#610399]
NEWS | 1 +
plugins/openoffice/ChangeLog | 6 +++++-
plugins/openoffice/openoffice-read.c | 6 +++++-
3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4ccfb1f..4e8fb05 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Gnumeric 1.10.1
Andreas:
* Fix storing of error-literals in ODF. [#610175]
* Don't export filter combos to ODF. [#610399]
+ * Apply filter on ODF import. [#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 c840ce9..b61f760 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,7 +1,11 @@
2010-02-18 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-write.c (oo_db_range_end): reapply filter [#610399]
+
+2010-02-18 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-write.c (odf_write_objects): don't export the filter
- combos
+ combos [#610399]
2010-02-18 Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 953aacd..6c33c79 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -3084,7 +3084,11 @@ static void
oo_db_range_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
{
OOParseState *state = (OOParseState *)xin->user_state;
- state->filter = NULL;
+
+ if (state->filter != NULL) {
+ gnm_filter_reapply (state->filter);
+ state->filter = NULL;
+ }
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]