[gnumeric] xlsx: fix export of rich text.



commit 19075ea01ac93cdee4d4a66c96aa59933943cf3a
Author: Morten Welinder <terra gnome org>
Date:   Tue Jun 3 19:35:43 2014 -0400

    xlsx: fix export of rich text.
    
    Underlines were messed up and we got multiple "val" attributes.

 plugins/excel/ChangeLog    |    2 ++
 plugins/excel/xlsx-write.c |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 5d53fa9..215e270 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,5 +1,7 @@
 2014-06-03  Morten Welinder  <terra gnome org>
 
+       * xlsx-write.c (xlsx_write_rich_text): Add two missing "break;"
+
        * xlsx-read.c (xlsx_run_color): Handle indexed colours.
        (xlsx_run_weight): Fix handling of bold.
        (xlsx_run_underline): Fix handling of underline.
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index 369d6e9..f6f24be 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -322,13 +322,18 @@ xlsx_write_rich_text (GsfXMLOut *xml, char const *text, PangoAttrList *attrs)
                        default:
                                gsf_xml_out_add_cstr_unchecked (xml, "val", "none");
                                break;
-                       case PANGO_UNDERLINE_ERROR: /* not supported by OpenXML */
+                       case PANGO_UNDERLINE_ERROR:
+                               /* not supported by OpenXML */
+                               /* Fall through. */
                        case PANGO_UNDERLINE_SINGLE:
                                gsf_xml_out_add_cstr_unchecked (xml, "val", "single");
+                               break;
                        case PANGO_UNDERLINE_DOUBLE:
                                gsf_xml_out_add_cstr_unchecked (xml, "val", "double");
+                               break;
                        case PANGO_UNDERLINE_LOW:
                                gsf_xml_out_add_cstr_unchecked (xml, "val", "singleAccounting");
+                               break;
                        }
                } else
                        gsf_xml_out_add_cstr_unchecked (xml, "val", "none");


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