diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-04 03:14:26 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-11 08:01:24 +0200 |
| commit | 13ed8001c9e825d28a9a0aa67fbf88d2d3e3b30e (patch) | |
| tree | 0be815e9eaec1bb04f2d42bab59e2cbefbd09385 /sc/source/filter/excel/xecontent.cxx | |
| parent | 2f4ff04f7178226901377709bb6f851dfa103109 (diff) | |
prepare cond format code for merge with color formats
Change-Id: Id49eb1da20b75a9ab83d20c29ad8e976d46b9423
Diffstat (limited to 'sc/source/filter/excel/xecontent.cxx')
| -rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 7c8a34621c08..aa17d60482b9 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -967,9 +967,12 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat GetAddressConverter().ConvertRangeList( maXclRanges, aScRanges, true ); if( !maXclRanges.empty() ) { - for( sal_uInt16 nIndex = 0, nCount = rCondFormat.Count(); nIndex < nCount; ++nIndex ) - if( const ScCondFormatEntry* pEntry = rCondFormat.GetEntry( nIndex ) ) - maCFList.AppendNewRecord( new XclExpCF( GetRoot(), *pEntry, nIndex ) ); + for( size_t nIndex = 0, nCount = rCondFormat.size(); nIndex < nCount; ++nIndex ) + if( const ScFormatEntry* pFormatEntry = rCondFormat.GetEntry( nIndex ) ) + { + if(pFormatEntry->GetType() == condformat::CONDITION) + maCFList.AppendNewRecord( new XclExpCF( GetRoot(), static_cast<const ScCondFormatEntry&>(*pFormatEntry), nIndex ) ); + } aScRanges.Format( msSeqRef, SCA_VALID, NULL, formula::FormulaGrammar::CONV_XL_A1 ); } } |