[gnumeric] Fix script handling in ODF roundtrip of conditional formats. [#726201]



commit 30efbd84de05e0974a82c0cd66935d7fcdac9e28
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Mon Mar 17 08:10:24 2014 -0600

    Fix script handling in  ODF roundtrip of conditional formats. [#726201]
    
    2014-03-17  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (openoffice-read.c): also set the script to
        standard when appropriate

 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 12ee353..2b33c2c 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2014-03-17  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+       * openoffice-read.c (openoffice-read.c): also set the script to
+       standard when appropriate
+
+2014-03-17  Andreas J. Guelzow <aguelzow pyrshep ca>
+
        * openoffice-write.c (odf_write_style_cell_properties): even write
        pattern and background colour for pattern 0
        * openoffice-read.c (oo_style_prop_cell): set pattern and background
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index ccca69c..93dc7af 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -6338,6 +6338,8 @@ oo_style_prop_cell (GsfXMLIn *xin, xmlChar const **attrs)
                                gnm_style_set_font_script (style, GO_FONT_SCRIPT_SUPER);
                        else if (g_str_has_prefix (attrs[1], "sub"))
                                gnm_style_set_font_script (style, GO_FONT_SCRIPT_SUB);
+                       else 
+                               gnm_style_set_font_script (style, GO_FONT_SCRIPT_STANDARD);
                } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_FO, "margin-left")) {
                        tmp_f = 0.;
                        oo_parse_distance (xin, attrs[1], "margin-left", &tmp_f);


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