Kaydet (Commit) 61d958f3 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

fdo#72727: Revert "-Werror=unused-but-set-variable second try"

This reverts commit ccf7b15c.
üst 91ca3a92
...@@ -855,6 +855,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( ...@@ -855,6 +855,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
const OUString lcl_aCategoriesRange(aCategoriesRange); const OUString lcl_aCategoriesRange(aCategoriesRange);
bool bCategoriesApplied = false;
// translate ranges (using the map created before) // translate ranges (using the map created before)
for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt( rLSequencesPerIndex.begin()); for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt( rLSequencesPerIndex.begin());
aLSeqIt != rLSequencesPerIndex.end(); ++aLSeqIt ) aLSeqIt != rLSequencesPerIndex.end(); ++aLSeqIt )
...@@ -883,7 +884,12 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( ...@@ -883,7 +884,12 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
} }
else 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 ) if( aLSeqIt->first.first == SCH_XML_CATEGORIES_INDEX )
{ {
...@@ -894,6 +900,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( ...@@ -894,6 +900,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
SchXMLTools::copyProperties( SchXMLTools::copyProperties(
xOldSequenceProp, Reference< beans::XPropertySet >( xNewSequence, uno::UNO_QUERY )); xOldSequenceProp, Reference< beans::XPropertySet >( xNewSequence, uno::UNO_QUERY ));
aLSeqIt->second->setValues( xNewSequence ); aLSeqIt->second->setValues( xNewSequence );
bCategoriesApplied = true;
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment