diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-05 15:17:00 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-05 15:18:34 -0400 |
| commit | 84c8157b46e5b2feff48f8a9e8d5df2879c5a740 (patch) | |
| tree | 91a2e4c2706e7ad1650829dc219693758c577d14 /xmloff | |
| parent | 9f025f22e8dfd7fe03527604e0edee8a8a818cca (diff) | |
fdo#72727: Revert "-Werror=unused-but-set-variable second try"
This reverts commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc.
(cherry picked from commit 61d958f37ed2aad6be2eab7bb507e0fb77716eec)
Diffstat (limited to 'xmloff')
| -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 48936b37a2e3..a443522c0030 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -855,6 +855,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 ) @@ -883,7 +884,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 ) { @@ -894,6 +900,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( SchXMLTools::copyProperties( xOldSequenceProp, Reference< beans::XPropertySet >( xNewSequence, uno::UNO_QUERY )); aLSeqIt->second->setValues( xNewSequence ); + bCategoriesApplied = true; } else { |