[gnumeric] xlsx: fix comment export.



commit 50308742fea1dd4b59aaa16f291524cbea601dd4
Author: Morten Welinder <terra gnome org>
Date:   Sun Feb 1 20:55:01 2015 -0500

    xlsx: fix comment export.

 NEWS                       |    1 +
 plugins/excel/ChangeLog    |    3 +++
 plugins/excel/xlsx-write.c |    2 +-
 test/ChangeLog             |    4 ++++
 test/t6152-xlsx-syntax.pl  |    1 +
 5 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index ca5d44a..a4b86f0 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ Morten:
        * Export sliders as scrollbars for xls.
        * Fix xls loading of horizontal scrollbars.  [#743754]
        * Plug leaks.
+       * Fix xlsx comment export.
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.19
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index bf1e628..bfd58bb 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,5 +1,8 @@
 2015-02-01  Morten Welinder  <terra gnome org>
 
+       * xlsx-write.c (xlsx_write_comments): We cannot use xml:space in
+       comments.
+
        * xlsx-read.c (xlsx_comment_end): Plug leak.
 
 2015-01-30  Morten Welinder  <terra gnome org>
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index 9791b9d..c15a773 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -2654,7 +2654,7 @@ xlsx_write_comments (XLSXWriteState *state, GsfOutput *sheet_part, GSList *objec
                /* Save text as rich text */
                g_object_get (ptr->data, "text", &name, "markup", &attrs, NULL);
                if (name && *name)
-                       xlsx_write_rich_text (xml, name, attrs, TRUE);
+                       xlsx_write_rich_text (xml, name, attrs, FALSE);
                g_free (name);
                pango_attr_list_unref (attrs);
                gsf_xml_out_end_element (xml); /* </text> */
diff --git a/test/ChangeLog b/test/ChangeLog
index ba3dbf8..c9b3235 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,5 +1,9 @@
 2015-02-01  Morten Welinder  <terra gnome org>
 
+       * t6152-xlsx-syntax.pl: Also check comments.
+
+2015-02-01  Morten Welinder  <terra gnome org>
+
        * t6150-ods-syntax.pl: Move schema location to test.
 
 2015-01-28  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/test/t6152-xlsx-syntax.pl b/test/t6152-xlsx-syntax.pl
index 200279f..d6914cc 100755
--- a/test/t6152-xlsx-syntax.pl
+++ b/test/t6152-xlsx-syntax.pl
@@ -131,6 +131,7 @@ foreach my $src (@sources) {
     push @check_members, ['xl/sharedStrings.xml',0] if $members{'xl/sharedStrings.xml'};
     foreach my $member (sort keys %members) {
        push @check_members, [$member,0] if $member =~ m{^xl/worksheets/sheet\d+\.xml$};
+       push @check_members, [$member,0] if $member =~ m{^xl/comments\d+\.xml$};
        push @check_members, [$member,1] if $member =~ m{^xl/charts/chart\d+\.xml$};
        push @check_members, [$member,2] if $member =~ m{^xl/drawings/drawing\d+\.xml$};
     }


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