[Libreoffice-commits] .: chart2/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Thu May 5 14:40:44 PDT 2011
chart2/source/controller/dialogs/tp_ChartType.cxx | 6 -
chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx | 4 -
chart2/source/controller/main/SelectionHelper.cxx | 2
chart2/source/tools/AxisHelper.cxx | 2
chart2/source/tools/ExplicitCategoriesProvider.cxx | 2
chart2/source/tools/RegressionEquation.cxx | 3
chart2/source/view/axes/Tickmarks.cxx | 4 -
chart2/source/view/axes/VAxisBase.cxx | 2
chart2/source/view/axes/VCartesianAxis.cxx | 4 -
chart2/source/view/axes/VCartesianGrid.cxx | 4 -
chart2/source/view/axes/VPolarGrid.cxx | 4 -
chart2/source/view/charttypes/AreaChart.cxx | 14 ++--
chart2/source/view/charttypes/BarChart.cxx | 10 +--
chart2/source/view/charttypes/BubbleChart.cxx | 8 +-
chart2/source/view/charttypes/CandleStickChart.cxx | 4 -
chart2/source/view/charttypes/PieChart.cxx | 2
chart2/source/view/charttypes/VSeriesPlotter.cxx | 30 ++++-----
chart2/source/view/main/ChartView.cxx | 32 +++++-----
chart2/source/view/main/VLegend.cxx | 4 -
19 files changed, 71 insertions(+), 70 deletions(-)
New commits:
commit 964286fef5a1d3848a21e233dfa4a45d5013b4b3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu May 5 23:32:12 2011 +0200
Some cppcheck cleaning
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 86f89ae..0e30b42 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -879,7 +879,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent
::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin();
const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
- for( ; aIter != aEnd; aIter++ )
+ for( ; aIter != aEnd; ++aIter )
{
m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage() );
(*aIter)->setChangeListener( this );
@@ -900,7 +900,7 @@ ChartTypeTabPage::~ChartTypeTabPage()
//delete all dialog controller
::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin();
const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
- for( ; aIter != aEnd; aIter++ )
+ for( ; aIter != aEnd; ++aIter )
{
delete *aIter;
}
@@ -1107,7 +1107,7 @@ void ChartTypeTabPage::initializePage()
::std::vector< ChartTypeDialogController* >::iterator aIter = m_aChartTypeDialogControllerList.begin();
const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
- for( sal_uInt16 nM=0; aIter != aEnd; aIter++, nM++ )
+ for( sal_uInt16 nM=0; aIter != aEnd; ++aIter, ++nM )
{
if( (*aIter)->isSubType(aServiceName) )
{
diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
index 225ee12..e4a4706 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
@@ -55,9 +55,9 @@ void MultipleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
if( aIter != aEnd )
{
(*aIter)->FillItemSet( rOutItemSet );
- aIter++;
+ ++aIter;
}
- for( ; aIter != aEnd; aIter++ )
+ for( ; aIter != aEnd; ++aIter )
{
SfxItemSet aSet = this->CreateEmptyItemSet();
(*aIter)->FillItemSet( aSet );
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 766b36a..a141a78 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -490,7 +490,7 @@ bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID
}
SelectionHelper::SelectionHelper( SdrObject* pSelectedObj )
- : m_pSelectedObj( pSelectedObj )
+ : m_pSelectedObj( pSelectedObj ), m_pMarkObj(NULL)
{
}
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index b617532..15304b0 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -1149,7 +1149,7 @@ Reference< XChartType > AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisInd
Reference< XChartType > xChartType;
::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
- for( ; aIter != aSeriesVector.end(); aIter++ )
+ for( ; aIter != aSeriesVector.end(); ++aIter )
{
sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
if( nAttachedAxisIndex == nCurrentIndex )
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index c45ebde..1889525 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -420,7 +420,7 @@ Sequence< OUString > ExplicitCategoriesProvider::getExplicitSimpleCategories(
struct DatePlusIndexComparator
{
inline bool operator() ( const DatePlusIndex& aFirst,
- const DatePlusIndex& aSecond )
+ const DatePlusIndex& aSecond ) const
{
return ( aFirst.fValue < aSecond.fValue );
}
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index b866770..c4c0aa1 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -206,7 +206,8 @@ RegressionEquation::RegressionEquation( const RegressionEquation & rOther ) :
MutexContainer(),
impl::RegressionEquation_Base(),
::property::OPropertySet( rOther, m_aMutex ),
- m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder())
+ m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()),
+ m_xContext( NULL )
{}
RegressionEquation::~RegressionEquation()
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 27d42f5..f9a80db 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -93,7 +93,7 @@ TickInfo* PureTickIter::nextInfo()
{
if(m_aTickIter!=m_rTickVector.end())
{
- m_aTickIter++;
+ ++m_aTickIter;
if(m_aTickIter!=m_rTickVector.end())
return &*m_aTickIter;
}
@@ -319,7 +319,7 @@ void TickFactory_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo
{
::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
- for( ; aTickIter != aTickEnd; aTickIter++ )
+ for( ; aTickIter != aTickEnd; ++aTickIter )
{
TickInfo& rTickInfo = (*aTickIter);
rTickInfo.aTickScreenPosition =
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 0b87a0a..cb90890 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -235,7 +235,7 @@ void VAxisBase::removeTextShapesFromTicks()
{
::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
- for( ; aTickIter != aTickEnd; aTickIter++ )
+ for( ; aTickIter != aTickEnd; ++aTickIter )
{
TickInfo& rTickInfo = (*aTickIter);
if(rTickInfo.xTextShape.is())
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 22fd9af..0d1988a 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1487,7 +1487,7 @@ void VCartesianAxis::updatePositions()
{
::std::vector< TickInfo >::iterator aTickIter = aDepthIter->begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = aDepthIter->end();
- for( ; aTickIter != aTickEnd; aTickIter++ )
+ for( ; aTickIter != aTickEnd; ++aTickIter )
{
TickInfo& rTickInfo = (*aTickIter);
Reference< drawing::XShape > xShape2DText( rTickInfo.xTextShape );
@@ -1541,7 +1541,7 @@ void VCartesianAxis::createTickMarkLineShapes( ::std::vector< TickInfo >& rTickI
::std::vector< TickInfo >::const_iterator aTickIter = rTickInfos.begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = rTickInfos.end();
sal_Int32 nN = 0;
- for( ; aTickIter != aTickEnd; aTickIter++ )
+ for( ; aTickIter != aTickEnd; ++aTickIter )
{
if( !(*aTickIter).bPaintIt )
continue;
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index bc4239c..d2b6784 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -274,7 +274,7 @@ void VCartesianGrid::createShapes()
::std::vector< TickInfo >::const_iterator aTickIter = (*aDepthIter).begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
sal_Int32 nRealPointCount = 0;
- for( ; aTickIter != aTickEnd; aTickIter++ )
+ for( ; aTickIter != aTickEnd; ++aTickIter )
{
if( !(*aTickIter).bPaintIt )
continue;
@@ -314,7 +314,7 @@ void VCartesianGrid::createShapes()
const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
sal_Int32 nRealPointCount = 0;
sal_Int32 nPolyIndex = 0;
- for( ; aTickIter != aTickEnd; aTickIter++, nPolyIndex++ )
+ for( ; aTickIter != aTickEnd; ++aTickIter, ++nPolyIndex )
{
if( !(*aTickIter).bPaintIt )
continue;
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index fff4465..847a229 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -148,7 +148,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
drawing::PointSequenceSequence aAllPoints;
::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
- for( ; aTickIter != aTickEnd; aTickIter++ )
+ for( ; aTickIter != aTickEnd; ++aTickIter )
{
TickInfo& rTickInfo = *aTickIter;
if( !rTickInfo.bPaintIt )
@@ -215,7 +215,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
drawing::PointSequenceSequence aAllPoints;
::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
- for( ; aTickIter != aTickEnd; aTickIter++ )
+ for( ; aTickIter != aTickEnd; ++aTickIter )
{
TickInfo& rTickInfo = *aTickIter;
if( !rTickInfo.bPaintIt )
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 1a11d06..43d2978 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -498,13 +498,13 @@ void AreaChart::impl_createSeriesShapes()
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
//=============================================================================
- for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; aZSlotIter++, nZ++ )
+ 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();
//=============================================================================
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
@@ -516,7 +516,7 @@ void AreaChart::impl_createSeriesShapes()
drawing::PolyPolygonShape3D* pSeriesPoly = NULL;
//iterate through all series
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
@@ -646,13 +646,13 @@ void AreaChart::createShapes()
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
//iterate through all x slots in this category to get 100percent sum
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
VDataSeries* pSeries( *aSeriesIter );
if(!pSeries)
@@ -684,7 +684,7 @@ 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++ )
+ for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
@@ -693,7 +693,7 @@ void AreaChart::createShapes()
std::map< sal_Int32, double > aLogicYForNextSeriesMap;//one for each different nAttachedAxisIndex
//=============================================================================
//iterate through all series
- for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; aSeriesIter++, nSeriesIndex++ )
+ for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex )
{
VDataSeries* pSeries( *aSeriesIter );
if(!pSeries)
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index e2995fb..0b23e5e 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -476,7 +476,7 @@ void BarChart::createShapes()
::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
sal_Int32 nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries();
if( aLogicYSumMap.find(nAttachedAxisIndex)==aLogicYSumMap.end() )
@@ -503,7 +503,7 @@ void BarChart::createShapes()
//=============================================================================
//iterate through all x slots in this category
double fSlotX=0;
- for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; aXSlotIter++, fSlotX+=1.0 )
+ for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
{
sal_Int32 nAttachedAxisIndex = 0;
BarPositionHelper* pPosHelper = m_pMainPosHelper;
@@ -570,7 +570,7 @@ void BarChart::createShapes()
aSeriesIter = pSeriesList->begin();
//=============================================================================
//iterate through all series in this x slot
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
VDataSeries* pSeries( *aSeriesIter );
if(!pSeries)
@@ -890,7 +890,7 @@ void BarChart::createShapes()
//=============================================================================
//iterate through all x slots in this category
- for( double fSlotX=0; aXSlotIter != aXSlotEnd; aXSlotIter++, fSlotX+=1.0 )
+ for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
@@ -899,7 +899,7 @@ void BarChart::createShapes()
aSeriesIter = pSeriesList->begin();
//=============================================================================
//iterate through all series in this x slot
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
VDataSeries* pSeries( *aSeriesIter );
if(!pSeries)
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index b160f81..0f52487 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -96,12 +96,12 @@ void BubbleChart::calculateMaximumLogicBubbleSize()
{
::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
VDataSeries* pSeries( *aSeriesIter );
if(!pSeries)
@@ -257,7 +257,7 @@ void BubbleChart::createShapes()
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
aXSlotIter = aZSlotIter->begin();
- for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; aXSlotIter++, nX++ )
+ for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
@@ -265,7 +265,7 @@ void BubbleChart::createShapes()
//=============================================================================
//iterate through all series
- for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; aSeriesIter++, nSeriesIndex++ )
+ for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex )
{
VDataSeries* pSeries( *aSeriesIter );
if(!pSeries)
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 7033017..5b944e7 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -208,7 +208,7 @@ void CandleStickChart::createShapes()
pPosHelper->updateSeriesCount( aZSlotIter->size() );
//=============================================================================
//iterate through all x slots in this category
- for( double fSlotX=0; aXSlotIter != aXSlotEnd; aXSlotIter++, fSlotX+=1.0 )
+ for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
@@ -217,7 +217,7 @@ void CandleStickChart::createShapes()
aSeriesIter = pSeriesList->begin();
//=============================================================================
//iterate through all series in this x slot
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
//collect data point information (logic coordinates, style ):
double fUnscaledX = (*aSeriesIter)->getXValue( nIndex );
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index ffb8f59..ec06867 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -355,7 +355,7 @@ void PieChart::createShapes()
::rtl::math::setNan(&m_fMaxOffset);
//=============================================================================
- for( double fSlotX=0; aXSlotIter != aXSlotEnd && (m_bUseRings||fSlotX<0.5 ); aXSlotIter++, fSlotX+=1.0 )
+ for( double fSlotX=0; aXSlotIter != aXSlotEnd && (m_bUseRings||fSlotX<0.5 ); ++aXSlotIter, fSlotX+=1.0 )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
if( pSeriesList->size()<=0 )//there should be only one series in each x slot
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 91dba89..2bd8afe 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -127,7 +127,7 @@ void VDataSeriesGroup::deleteSeries()
//delete all data series help objects:
::std::vector< VDataSeries* >::const_iterator aIter = m_aSeriesVector.begin();
const ::std::vector< VDataSeries* >::const_iterator aEnd = m_aSeriesVector.end();
- for( ; aIter != aEnd; aIter++ )
+ for( ; aIter != aEnd; ++aIter )
{
delete *aIter;
}
@@ -173,7 +173,7 @@ VSeriesPlotter::~VSeriesPlotter()
{
::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
aXSlotIter->deleteSeries();
}
@@ -288,7 +288,7 @@ void VSeriesPlotter::releaseShapes()
{
::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
@@ -296,7 +296,7 @@ void VSeriesPlotter::releaseShapes()
const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
VDataSeries* pSeries( *aSeriesIter );
pSeries->releaseShapes();
@@ -1358,7 +1358,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
{
::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
double fLocalMinimum, fLocalMaximum;
aXSlotIter->getMinimumAndMaximiumX( fLocalMinimum, fLocalMaximum );
@@ -1385,7 +1385,7 @@ void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d
{
::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
double fLocalMinimum, fLocalMaximum;
aXSlotIter->getMinimumAndMaximiumYInContinuousXRange( fLocalMinimum, fLocalMaximum, fMinX, fMaxX, nAxisIndex );
@@ -1413,7 +1413,7 @@ sal_Int32 VSeriesPlotter::getPointCount() const
::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
sal_Int32 nPointCount = aXSlotIter->getPointCount();
if( nPointCount>nRet )
@@ -1448,7 +1448,7 @@ sal_Int32 VDataSeriesGroup::getPointCount() const
::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter)
{
sal_Int32 nPointCount = (*aSeriesIter)->getTotalPointCount();
if( nPointCount>nRet )
@@ -1483,7 +1483,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaxi
::rtl::math::setInf(&rfMinimum, false);
::rtl::math::setInf(&rfMaximum, true);
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
sal_Int32 nPointCount = (*aSeriesIter)->getTotalPointCount();
for(sal_Int32 nN=0;nN<nPointCount;nN++)
@@ -1512,7 +1512,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY,
::rtl::math::setInf(&rfMinY, false);
::rtl::math::setInf(&rfMaxY, true);
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
sal_Int32 nPointCount = (*aSeriesIter)->getTotalPointCount();
for(sal_Int32 nN=0;nN<nPointCount;nN++)
@@ -1834,11 +1834,11 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
bool bFirstSeries = true;
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
- for( ; aZSlotIter!=aZSlotEnd && !bBreak; aZSlotIter++ )
+ for( ; aZSlotIter!=aZSlotEnd && !bBreak; ++aZSlotIter )
{
::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( ; aXSlotIter!=aXSlotEnd && !bBreak; aXSlotIter++ )
+ for( ; aXSlotIter!=aXSlotEnd && !bBreak; ++aXSlotIter )
{
::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
@@ -1889,11 +1889,11 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
::std::vector< VDataSeries* > aAllSeries;
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
- for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ )
+ for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
- for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+ for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
::std::vector< VDataSeries* > aSeriesList = aXSlotIter->m_aSeriesVector;
aAllSeries.insert( aAllSeries.end(), aSeriesList.begin(), aSeriesList.end() );
@@ -1957,7 +1957,7 @@ awt::Size VSeriesPlotter::getPreferredLegendKeyAspectRatio()
::std::vector< VDataSeries* >::const_iterator aSeriesIter = aAllSeries.begin();
const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = aAllSeries.end();
//iterate through all series
- for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+ for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
if( bSeriesAllowsLines )
{
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 9f64a88..df7db38 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -225,7 +225,7 @@ void ChartView::impl_deleteCoordinateSystems()
::std::swap( aVectorToDeleteObjects, m_aVCooSysList );//#i109770#
::std::vector< VCoordinateSystem* >::const_iterator aIter = aVectorToDeleteObjects.begin();
const ::std::vector< VCoordinateSystem* >::const_iterator aEnd = aVectorToDeleteObjects.end();
- for( ; aIter != aEnd; aIter++ )
+ for( ; aIter != aEnd; ++aIter )
{
delete *aIter;
}
@@ -587,7 +587,7 @@ SeriesPlotterContainer::~SeriesPlotterContainer()
// - delete all plotter
::std::vector< VSeriesPlotter* >::const_iterator aPlotterIter = m_aSeriesPlotterList.begin();
const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = m_aSeriesPlotterList.end();
- for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+ for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
delete *aPlotterIter;
m_aSeriesPlotterList.clear();
}
@@ -836,7 +836,7 @@ void SeriesPlotterContainer::initAxisUsageList(const Date& rNullDate)
m_nMaxAxisIndex = 0;
for(sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++)
{
- for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+ for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
{
sal_Int32 nLocalMax = aAxisIter->second.getMaxAxisIndexForDimension( nDimensionIndex );
if( m_nMaxAxisIndex < nLocalMax )
@@ -850,7 +850,7 @@ void SeriesPlotterContainer::setScalesFromCooSysToPlotter()
//set scales to plotter to enable them to provide the preferred scene AspectRatio
::std::vector< VSeriesPlotter* >::const_iterator aPlotterIter = m_aSeriesPlotterList.begin();
const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = m_aSeriesPlotterList.end();
- for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+ for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( m_rVCooSysList, pSeriesPlotter );
@@ -870,7 +870,7 @@ void SeriesPlotterContainer::setNumberFormatsFromAxes()
::std::vector< VSeriesPlotter* >::const_iterator aPlotterIter = m_aSeriesPlotterList.begin();
const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = m_aSeriesPlotterList.end();
- for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+ for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( m_rVCooSysList, pSeriesPlotter );
@@ -933,7 +933,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
{
// - first do autoscale for all x and z scales (because they are treated independent)
- for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+ for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
{
AxisUsage& rAxisUsage = (*aAxisIter).second;
::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex);
@@ -955,7 +955,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
}
// - second do autoscale for the dependent y scales (the coordinate systems are prepared with x and z scales already )
- for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+ for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
{
AxisUsage& rAxisUsage = (*aAxisIter).second;
::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex);
@@ -992,7 +992,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
for( sal_Int32 nAxisIndex=0; nAxisIndex<=m_nMaxAxisIndex; nAxisIndex++ )
{
- for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+ for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
{
AxisUsage& rAxisUsage = (*aAxisIter).second;
::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex );
@@ -1007,7 +1007,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
{
::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
- for( ; aIter != aSeriesVector.end(); aIter++ )
+ for( ; aIter != aSeriesVector.end(); ++aIter )
{
sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
if( nAxisIndex == nCurrentIndex )
@@ -1088,7 +1088,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
//correct origin for y main axis (the origin is where the other main axis crosses)
sal_Int32 nAxisIndex=0;
sal_Int32 nDimensionIndex=1;
- for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+ for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
{
AxisUsage& rAxisUsage = (*aAxisIter).second;
::std::vector< VCoordinateSystem* > aVCooSysList = rAxisUsage.getCoordinateSystems(nDimensionIndex,nAxisIndex);
@@ -1138,7 +1138,7 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio()
::std::vector< VSeriesPlotter* >::const_iterator aPlotterIter = m_aSeriesPlotterList.begin();
const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = m_aSeriesPlotterList.end();
for( aPlotterIter = m_aSeriesPlotterList.begin(), nPlotterCount=0
- ; aPlotterIter != aPlotterEnd; aPlotterIter++, nPlotterCount++ )
+ ; aPlotterIter != aPlotterEnd; ++aPlotterIter, ++nPlotterCount )
{
drawing::Direction3D aSingleRatio( (*aPlotterIter)->getPreferredDiagramAspectRatio() );
if( fx<0 && aSingleRatio.DirectionX>0 )
@@ -1491,7 +1491,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
m_bPointsWereSkipped = false;
::std::vector< VSeriesPlotter* >::const_iterator aPlotterIter = rSeriesPlotterList.begin();
const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = rSeriesPlotterList.end();
- for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+ for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
{
//------------ set transformation to plotter / create series
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
@@ -1531,7 +1531,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
if( !bUseFixedInnerSize )
aNewInnerRect = aVDiagram.adjustInnerSize( aConsumedOuterRect );
- for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+ for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
pSeriesPlotter->releaseShapes();
@@ -1551,7 +1551,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
}
// - create data series for all charttypes
- for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+ for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
{
//------------ set transformation to plotter / create series
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
@@ -1562,7 +1562,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
m_bPointsWereSkipped = m_bPointsWereSkipped || pSeriesPlotter->PointsWereSkipped();
}
- for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+ for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
pSeriesPlotter->rearrangeLabelToAvoidOverlapIfRequested( rPageSize );
@@ -1577,7 +1577,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
aUsedOuterRect = awt::Rectangle( rAvailablePos.X, rAvailablePos.Y, rAvailableSize.Width, rAvailableSize.Height );
bool bSnapRectToUsedArea = false;
- for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+ for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
bSnapRectToUsedArea = pSeriesPlotter->shouldSnapRectToUsedArea();
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 1ad43df..b872ee4 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -928,7 +928,7 @@ void VLegend::createShapes(
::std::vector< LegendEntryProvider* >::const_iterator aIter = m_aLegendEntryProviderList.begin();
const ::std::vector< LegendEntryProvider* >::const_iterator aEnd = m_aLegendEntryProviderList.end();
- for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd; aIter++ )
+ for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd; ++aIter )
{
LegendEntryProvider* pLegendEntryProvider( *aIter );
if( pLegendEntryProvider )
@@ -945,7 +945,7 @@ void VLegend::createShapes(
awt::Size aMaxSymbolExtent( nSymbolWidth, nSymbolHeigth );
tViewLegendEntryContainer aViewEntries;
- for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd; aIter++ )
+ for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd; ++aIter )
{
LegendEntryProvider* pLegendEntryProvider( *aIter );
if( pLegendEntryProvider )
More information about the Libreoffice-commits
mailing list