[Libreoffice-commits] .: chart2/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 30 09:51:27 PDT 2012


 chart2/source/view/charttypes/AreaChart.cxx        |    1 -
 chart2/source/view/charttypes/BarChart.cxx         |    2 --
 chart2/source/view/charttypes/BubbleChart.cxx      |    2 --
 chart2/source/view/charttypes/CandleStickChart.cxx |    1 -
 4 files changed, 6 deletions(-)

New commits:
commit 4ece397f21fdb97841a0d355e2d62d446e2c89ac
Author: jailletc36 <christophe.jaillet at wanadoo.fr>
Date:   Tue Oct 30 05:09:28 2012 +0100

    cppCheck: Remove some 'redundantAssignment'
    
    These iterators are already assigned with the same value a few lines above.
    
    Change-Id: I4051db7599824cf407af9ec91ef8f6633467ea36
    Signed-off-by: jailletc36 <christophe.jaillet at wanadoo.fr>
    Reviewed-on: https://gerrit.libreoffice.org/938
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index b088d72..fa0ec3d 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -660,7 +660,6 @@ void AreaChart::createShapes()
 
             //for the area chart there should be at most one x slot (no side by side stacking available)
             //attention different: xSlots are always interpreted as independent areas one behind the other: @todo this doesn't work why not???
-            aXSlotIter = aZSlotIter->begin();
             for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
             {
                 std::vector<VDataSeries*>& rSeriesList = aXSlotIter->m_aSeriesVector;
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 37b23ca..5058bc6 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -553,7 +553,6 @@ void BarChart::createShapes()
 
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
                 const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
-                aSeriesIter = pSeriesList->begin();
     //=============================================================================
                 //iterate through all series in this x slot
                 for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
@@ -882,7 +881,6 @@ void BarChart::createShapes()
 
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
                 const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
-                aSeriesIter = pSeriesList->begin();
 //=============================================================================
                 //iterate through all series in this x slot
                 for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index ad84a15..9177bab 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -238,13 +238,11 @@ void BubbleChart::createShapes()
         ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator             aZSlotIter = m_aZSlots.begin();
         const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator  aZSlotEnd = m_aZSlots.end();
 
-        aZSlotIter = m_aZSlots.begin();
         for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
         {
             ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
             const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
 
-            aXSlotIter = aZSlotIter->begin();
             for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 7fa8a47..5a9787f 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -187,7 +187,6 @@ void CandleStickChart::createShapes()
 
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
                 const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
-                aSeriesIter = pSeriesList->begin();
     //=============================================================================
                 //iterate through all series in this x slot
                 for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )


More information about the Libreoffice-commits mailing list