diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-04 05:03:42 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-11 08:01:24 +0200 |
commit | 08ed74c89f7f018167b858e74cc30ae0272fae6c (patch) | |
tree | 6a254c979cab2dff9edec61f740b800f3696b01d /sc/source/filter/excel/xecontent.cxx | |
parent | 13ed8001c9e825d28a9a0aa67fbf88d2d3e3b30e (diff) |
integrate color formats into conditional formats
Change-Id: I3c235f6dd0b69d3fc560910fcc890d2c80c995c0
Diffstat (limited to 'sc/source/filter/excel/xecontent.cxx')
-rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index aa17d60482b9..3395cf9d77c5 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -972,6 +972,10 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat { if(pFormatEntry->GetType() == condformat::CONDITION) maCFList.AppendNewRecord( new XclExpCF( GetRoot(), static_cast<const ScCondFormatEntry&>(*pFormatEntry), nIndex ) ); + else if(pFormatEntry->GetType() == condformat::COLORSCALE) + ; + else if(pFormatEntry->GetType() == condformat::DATABAR) + ; } aScRanges.Format( msSeqRef, SCA_VALID, NULL, formula::FormulaGrammar::CONV_XL_A1 ); } @@ -1086,18 +1090,6 @@ XclExpCondFormatBuffer::XclExpCondFormatBuffer( const XclExpRoot& rRoot ) : maCondfmtList.AppendRecord( xCondfmtRec ); } } - if( const ScColorFormatList* pColorScaleList = GetDoc().GetColorScaleList(GetCurrScTab()) ) - { - for( ScColorFormatList::const_iterator itr = pColorScaleList->begin(); - itr != pColorScaleList->end(); ++itr) - { - if(itr->GetType() == COLORSCALE) - { - XclExpColorScaleList::RecordRefType xColorScaleRec( new XclExpColorScale( GetRoot(), static_cast<const ScColorScaleFormat&>(*itr) ) ); - maColorScaleList.AppendRecord( xColorScaleRec ); - } - } - } } void XclExpCondFormatBuffer::Save( XclExpStream& rStrm ) |