diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-09 05:07:28 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-09 05:07:28 +0200 |
| commit | 56347571c16676e4fe7ae1e364c0a09f24ed5e23 (patch) | |
| tree | 155cf397b0c30b2b54c1067c15c64c3c616b6a88 /sc | |
| parent | ca64be56cbb46ea313d1dc39b0d737d5b0640150 (diff) | |
add accidently deleted parts and WaE
Change-Id: I829ce61a7db77fe9db3cadce5f87952120b476d0
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/oox/condformatcontext.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index 66b0f77ee743..0ba54c712263 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& ) |