[gnumeric] Use gnm_style_cond_canonicalize in ODF import



commit 2b46c3c3419b3fc5694a63604fec4a5a0755e499
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Fri Mar 14 01:52:54 2014 -0600

    Use gnm_style_cond_canonicalize in ODF import
    
    2014-03-14  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (odf_style_add_condition): use
        gnm_style_cond_canonicalize

 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 692ed08..9db3fe3 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-12  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (odf_style_add_condition): use
+       gnm_style_cond_canonicalize
+
 2014-03-14  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-write.c (odf_save_style_map): use
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 73ea1de..d1b9d10 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -3328,6 +3328,7 @@ odf_style_add_condition (GsfXMLIn *xin, GnmStyle *style, GnmStyle *cstyle,
                return;
        }
 
+       gnm_style_cond_canonicalize (cond);
        gnm_style_cond_set_overlay (cond, cstyle);
 
        if (gnm_style_is_element_set (style, MSTYLE_CONDITIONS) &&


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