[Libreoffice-commits] .: sc/source

Markus Mohrhard mmohrhard at kemper.freedesktop.org
Tue May 8 20:09:15 PDT 2012


 sc/source/filter/oox/condformatcontext.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 56347571c16676e4fe7ae1e364c0a09f24ed5e23
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed May 9 05:07:28 2012 +0200

    add accidently deleted parts and WaE
    
    Change-Id: I829ce61a7db77fe9db3cadce5f87952120b476d0

diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx
index 66b0f77..0ba54c7 100644
--- a/sc/source/filter/oox/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -74,17 +74,17 @@ void ColorScaleContext::onStartElement( const AttributeList& rAttribs )
     }
 }
 
-void ColorScaleContext::onCharacters( const OUString& rChars )
+void ColorScaleContext::onCharacters( const OUString&  )
 {
 
 }
 
-ContextHandlerRef ColorScaleContext::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& )
+ContextHandlerRef ColorScaleContext::onCreateRecordContext( sal_Int32, SequenceInputStream& )
 {
     return 0;
 }
 
-void ColorScaleContext::onStartRecord( SequenceInputStream& rStrm )
+void ColorScaleContext::onStartRecord( SequenceInputStream& )
 {
 }
 
@@ -125,6 +125,8 @@ void CondFormatContext::onStartElement( const AttributeList& rAttribs )
 
 void CondFormatContext::onCharacters( const OUString& rChars )
 {
+    if( isCurrentElement( XLS_TOKEN( formula ) ) && mxCondFmt.get() && mxRule.get() )
+        mxRule->appendFormula( rChars );
 }
 
 ContextHandlerRef CondFormatContext::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& )


More information about the Libreoffice-commits mailing list