[gnumeric] xlsx: fix background color roundtrip issue.



commit 5974209cc82e2c935c159c050dd5ed4df5f571fe
Author: Morten Welinder <terra gnome org>
Date:   Tue Feb 18 23:06:49 2014 -0500

    xlsx: fix background color roundtrip issue.

 NEWS                      |    2 +-
 plugins/excel/ChangeLog   |    5 +++++
 plugins/excel/xlsx-read.c |    4 ++++
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 0d2ba6c..c40cfda 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ Jean:
 Morten:
        * Fix BIFF7 import of long strings.  [#724399]
        * Improve testing.
-       * Fix XLSX number roundtrip issue.
+       * Fix XLSX number roundtrip issues.  [?] and [#724661]
        * Improve ssdiff's report of differences.
 
 --------------------------------------------------------------------------
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 64c242e..e1e54e9 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-18  Morten Welinder  <terra gnome org>
+
+       * xlsx-read.c (xlsx_xf_begin): Make sure the background color we
+       set isn't "auto".  [#724661]
+
 2014-02-17  Morten Welinder  <terra gnome org>
 
        * xlsx-utils.c (xlsx_conventions_new): use same
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index cd47e1e..f058712 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -4330,6 +4330,10 @@ xlsx_xf_begin (GsfXMLIn *xin, xmlChar const **attrs)
        }
        if (NULL == parent) {
                result = gnm_style_new_default ();
+               /* We need to make the color explicit.  */
+               gnm_style_set_back_color
+                       (result,
+                        gnm_color_new_go (gnm_style_get_back_color (result)->go_color));
                gnm_style_merge (result, accum);
        } else
                result = gnm_style_new_merged (parent, accum);


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