[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmloff/source

[Kohei Yoshida]

 xmloff/source/chart/SchXMLTableContext.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 2b959fb871a68f08a06850909abd16f71033aa3a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Jun 5 15:17:00 2014 -0400

    fdo#72727: Revert "-Werror=unused-but-set-variable second try"
    
    This reverts commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc.
    (cherry picked from commit 61d958f37ed2aad6be2eab7bb507e0fb77716eec)
    
    Change-Id: I3fbb037200d3df0e392b66bdd0c9cafc573e1a57
    Reviewed-on: https://gerrit.libreoffice.org/9659
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index bab2a9f..6c0398c 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
                         {