diff options
author | Andras Timar <andras.timar@collabora.com> | 2014-05-11 07:22:02 -0700 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-05-11 07:22:02 -0700 |
commit | d7207901cebba61845c86eb8d4c5337979a57ce6 (patch) | |
tree | ea767994179f859e006dc59a6316c7e7e0b426f9 | |
parent | 8ee9a8f96cbaa466d64cf644506fa95334c2016a (diff) |
Revert "-Werror=unused-but-set-variable second try"cp-4.2-3
This reverts commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc.
-rw-r--r-- | xmloff/source/chart/SchXMLTableContext.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index bab2a9f19a48..6c0398c3d69a 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -856,6 +856,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( const OUString lcl_aCategoriesRange(aCategoriesRange); + bool bCategoriesApplied = false; // translate ranges (using the map created before) for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt( rLSequencesPerIndex.begin()); aLSeqIt != rLSequencesPerIndex.end(); ++aLSeqIt ) @@ -884,7 +885,12 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( } else { - if( !lcl_tableOfRangeMatches( aRange, rTable.aTableNameOfFile )) + if( lcl_tableOfRangeMatches( aRange, rTable.aTableNameOfFile )) + { + if( aLSeqIt->first.first == SCH_XML_CATEGORIES_INDEX ) + bCategoriesApplied = true; + } + else { if( aLSeqIt->first.first == SCH_XML_CATEGORIES_INDEX ) { @@ -895,6 +901,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( SchXMLTools::copyProperties( xOldSequenceProp, Reference< beans::XPropertySet >( xNewSequence, uno::UNO_QUERY )); aLSeqIt->second->setValues( xNewSequence ); + bCategoriesApplied = true; } else { |