[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

Kohei Yoshida kohei.yoshida at collabora.com
Mon Aug 18 22:49:14 PDT 2014


 sc/source/filter/excel/excrecds.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9cc0baaea4ec20dda6996b74a64a12f4094eee5c
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Aug 18 15:16:19 2014 -0400

    Let's not export sheet tab color when it's not set.
    
    COL_AUTO is the default value which is treated as color not being set.  The
    old code would export it as a white color which is not correct.
    
    Change-Id: Ib68fccfb228333f2059edc4cfffeed90880ebc60
    (cherry picked from commit 3104f95254530c76c3fc0c3b840254912c067ad8)
    Reviewed-on: https://gerrit.libreoffice.org/11005
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 847e61d..7d8ac31 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -471,8 +471,9 @@ void XclExpXmlSheetPr::SaveXml( XclExpXmlStream& rStrm )
 
     // OOXTODO: XML_outlinePr
 
-    rWorksheet->singleElement(
-        XML_tabColor, XML_rgb, XclXmlUtils::ToOString(maTabColor).getStr(), FSEND);
+    if (maTabColor != Color(COL_AUTO))
+        rWorksheet->singleElement(
+            XML_tabColor, XML_rgb, XclXmlUtils::ToOString(maTabColor).getStr(), FSEND);
 
     rWorksheet->singleElement(XML_pageSetUpPr,
             // OOXTODO: XML_autoPageBreaks,


More information about the Libreoffice-commits mailing list