[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xestream.cxx |    2 +-
 sc/source/filter/excel/xestyle.cxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f6e8e15afb4108c2e1de47dd45b9f421c6ef92e9
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Mon Nov 5 01:01:24 2012 +0100

    fix ooxml color export
    
    Change-Id: I4b94883f594e13e9923bdd05593447a152fa8b0a
    Signed-off-by: Kohei Yoshida <kohei.yosh...@gmail.com>

diff --git a/sc/source/filter/excel/xestream.cxx 
b/sc/source/filter/excel/xestream.cxx
index 67df56f..d2686d6 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -757,7 +757,7 @@ rtl::OUString XclXmlUtils::GetStreamName( const char* 
sStreamDir, const char* sS
 OString XclXmlUtils::ToOString( const Color& rColor )
 {
     char buf[9];
-    sprintf( buf, "%.2X%.2X%.2X%.2X", rColor.GetTransparency(), 
rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue() );
+    sprintf( buf, "%.2X%.2X%.2X%.2X", 0xFF-rColor.GetTransparency(), 
rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue() );
     buf[8] = '\0';
     return OString( buf );
 }
commit 7cf1096087bf9fa7a379a893222364563a52e32f
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Mon Nov 5 01:03:36 2012 +0100

    export dxfs at the correct place
    
    Change-Id: I2ab31904169adad4f173d4655d0511855de77464
    Signed-off-by: Kohei Yoshida <kohei.yosh...@gmail.com>

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index 3373d7d..83f2650 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3067,8 +3067,8 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm 
)
     CreateRecord( EXC_ID_FORMATLIST )->SaveXml( rStrm );
     CreateRecord( EXC_ID_FONTLIST )->SaveXml( rStrm );
     CreateRecord( EXC_ID_XFLIST )->SaveXml( rStrm );
-    CreateRecord( EXC_ID_PALETTE )->SaveXml( rStrm );
     CreateRecord( EXC_ID_DXFS )->SaveXml( rStrm );
+    CreateRecord( EXC_ID_PALETTE )->SaveXml( rStrm );
 
     aStyleSheet->endElement( XML_styleSheet );
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits