From 110d0915c6a5a791e0f7f544667eb933f69e5f87 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 9 Oct 2014 19:56:16 -0400 Subject: Use typedef rather than raw nested std::vector everywhere... Change-Id: Id4b58d13b229776f2ef1f270e937547ece9e1248 --- chart2/source/view/axes/Tickmarks.cxx | 16 ++++---- chart2/source/view/axes/Tickmarks.hxx | 17 ++++---- chart2/source/view/axes/Tickmarks_Dates.cxx | 10 ++--- chart2/source/view/axes/Tickmarks_Dates.hxx | 6 +-- chart2/source/view/axes/Tickmarks_Equidistant.cxx | 8 ++-- chart2/source/view/axes/Tickmarks_Equidistant.hxx | 8 ++-- chart2/source/view/axes/VAxisBase.cxx | 10 ++--- chart2/source/view/axes/VAxisBase.hxx | 4 +- chart2/source/view/axes/VCartesianAxis.cxx | 48 +++++++++++------------ chart2/source/view/axes/VCartesianAxis.hxx | 8 ++-- chart2/source/view/axes/VCartesianGrid.cxx | 14 +++---- chart2/source/view/axes/VPolarGrid.cxx | 30 +++++++------- chart2/source/view/axes/VPolarGrid.hxx | 10 ++--- chart2/source/view/axes/VPolarRadiusAxis.cxx | 2 +- 14 files changed, 97 insertions(+), 94 deletions(-) (limited to 'chart2') diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 39c1faea0d41..4c37771f7c84 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -58,7 +58,7 @@ sal_Int32 TickInfo::getScreenDistanceBetweenTicks( const TickInfo& rOherTickInfo return nRet; } -PureTickIter::PureTickIter( ::std::vector< TickInfo >& rTickInfoVector ) +PureTickIter::PureTickIter( TickInfoArrayType& rTickInfoVector ) : m_rTickVector(rTickInfoVector) , m_aTickIter(m_rTickVector.begin()) { @@ -116,7 +116,7 @@ bool TickFactory::isDateAxis() const return m_rScale.AxisType == chart2::AxisType::DATE; } -void TickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const +void TickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) const { if( isDateAxis() ) DateTickFactory( m_rScale, m_rIncrement ).getAllTicks( rAllTickInfos ); @@ -124,7 +124,7 @@ void TickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllT EquidistantTickFactory( m_rScale, m_rIncrement ).getAllTicks( rAllTickInfos ); } -void TickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const +void TickFactory::getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const { if( isDateAxis() ) DateTickFactory( m_rScale, m_rIncrement ).getAllTicksShifted( rAllTickInfos ); @@ -288,15 +288,15 @@ void TickFactory2D::createPointSequenceForAxisMainLine( drawing::PointSequenceSe rPoints[0][1].Y = static_cast(m_aAxisEndScreenPosition2D.getY()); } -void TickFactory2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const +void TickFactory2D::updateScreenValues( TickInfoArraysType& rAllTickInfos ) const { //get the transformed screen values for all tickmarks in rAllTickInfos - ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = rAllTickInfos.begin(); - const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rAllTickInfos.end(); + TickInfoArraysType::iterator aDepthIter = rAllTickInfos.begin(); + const TickInfoArraysType::const_iterator aDepthEnd = rAllTickInfos.end(); for( ; aDepthIter != aDepthEnd; ++aDepthIter ) { - ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin(); - const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); + TickInfoArrayType::iterator aTickIter = (*aDepthIter).begin(); + const TickInfoArrayType::const_iterator aTickEnd = (*aDepthIter).end(); for( ; aTickIter != aTickEnd; ++aTickIter ) { TickInfo& rTickInfo = (*aTickIter); diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index e791b4103230..882646cf1576 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -53,6 +53,9 @@ private: TickInfo(); }; +typedef std::vector TickInfoArrayType; +typedef std::vector TickInfoArraysType; + class TickIter { public: @@ -64,14 +67,14 @@ public: class PureTickIter : public TickIter { public: - PureTickIter( ::std::vector< TickInfo >& rTickInfoVector ); + PureTickIter( TickInfoArrayType& rTickInfoVector ); virtual ~PureTickIter(); virtual TickInfo* firstInfo() SAL_OVERRIDE; virtual TickInfo* nextInfo() SAL_OVERRIDE; private: - ::std::vector< TickInfo >& m_rTickVector; - ::std::vector< TickInfo >::iterator m_aTickIter; + TickInfoArrayType& m_rTickVector; + TickInfoArrayType::iterator m_aTickIter; }; class TickFactory @@ -82,9 +85,9 @@ public: , const ExplicitIncrementData& rIncrement ); virtual ~TickFactory(); - void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; - void getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; - virtual void updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& /*rAllTickInfos*/ ) const {} + void getAllTicks( TickInfoArraysType& rAllTickInfos ) const; + void getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const; + virtual void updateScreenValues( TickInfoArraysType& /*rAllTickInfos*/ ) const {} private: //methods bool isDateAxis() const; @@ -122,7 +125,7 @@ public: , bool bIncludeFarAwayDistanceIfSo = false , bool bIncludeSpaceBetweenTickAndText = true ) const; - virtual void updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const SAL_OVERRIDE; + virtual void updateScreenValues( TickInfoArraysType& rAllTickInfos ) const SAL_OVERRIDE; bool isHorizontalAxis() const; bool isVerticalAxis() const; diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx index 3b51061e6240..71fb1f382b8e 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.cxx +++ b/chart2/source/view/axes/Tickmarks_Dates.cxx @@ -59,11 +59,11 @@ DateTickFactory::~DateTickFactory() { } -void DateTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos, bool bShifted ) const +void DateTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos, bool bShifted ) const { rAllTickInfos.resize(2); - ::std::vector< TickInfo >& rMajorTicks = rAllTickInfos[0]; - ::std::vector< TickInfo >& rMinorTicks = rAllTickInfos[1]; + TickInfoArrayType& rMajorTicks = rAllTickInfos[0]; + TickInfoArrayType& rMinorTicks = rAllTickInfos[1]; rMajorTicks.clear(); rMinorTicks.clear(); @@ -143,12 +143,12 @@ void DateTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& r } } -void DateTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const +void DateTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) const { getAllTicks( rAllTickInfos, false ); } -void DateTickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const +void DateTickFactory::getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const { getAllTicks( rAllTickInfos, true ); } diff --git a/chart2/source/view/axes/Tickmarks_Dates.hxx b/chart2/source/view/axes/Tickmarks_Dates.hxx index bafdedd09a83..b9556494f243 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.hxx +++ b/chart2/source/view/axes/Tickmarks_Dates.hxx @@ -32,11 +32,11 @@ public: , const ExplicitIncrementData& rIncrement ); ~DateTickFactory(); - void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; - void getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; + void getAllTicks( TickInfoArraysType& rAllTickInfos ) const; + void getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const; private: //methods - void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos, bool bShifted ) const; + void getAllTicks( TickInfoArraysType& rAllTickInfos, bool bShifted ) const; private: //member ExplicitScaleData m_aScale; diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index 99fc3e3e574a..de3c7cf0d87f 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -310,7 +310,7 @@ bool EquidistantTickFactory::isVisible( double fScaledValue ) const return true; } -void EquidistantTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const +void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) const { uno::Sequence< uno::Sequence< double > > aAllTicks; @@ -395,7 +395,7 @@ void EquidistantTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo { sal_Int32 nCount = aAllTicks[nDepth].getLength(); - ::std::vector< TickInfo >& rTickInfoVector = rAllTickInfos[nDepth]; + TickInfoArrayType& rTickInfoVector = rAllTickInfos[nDepth]; rTickInfoVector.clear(); rTickInfoVector.reserve( nCount ); for(sal_Int32 nN = 0; nN >& rAllTickInfos ) const +void EquidistantTickFactory::getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const { ExplicitIncrementData aShiftedIncrement( m_rIncrement ); aShiftedIncrement.BaseValue = m_rIncrement.BaseValue-m_rIncrement.Distance/2.0; @@ -428,7 +428,7 @@ EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< do initIter( nMinDepth, nMaxDepth ); } -EquidistantTickIter::EquidistantTickIter( ::std::vector< ::std::vector< TickInfo > >& rTicks +EquidistantTickIter::EquidistantTickIter( TickInfoArraysType& rTicks , const ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) : m_pSimpleTicks(NULL) diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 5301d753bdee..66f6760438db 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -31,7 +31,7 @@ public: ::com::sun::star::uno::Sequence< double > >& rTicks , const ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); - EquidistantTickIter( ::std::vector< ::std::vector< TickInfo > >& rTickInfos + EquidistantTickIter( TickInfoArraysType& rTickInfos , const ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); virtual ~EquidistantTickIter(); @@ -79,7 +79,7 @@ private: //methods private: //member const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >* m_pSimpleTicks; - ::std::vector< ::std::vector< TickInfo > >* m_pInfoTicks; + TickInfoArraysType* m_pInfoTicks; const ExplicitIncrementData& m_rIncrement; sal_Int32 m_nMaxDepth; sal_Int32 m_nTickCount; @@ -100,8 +100,8 @@ public: , const ExplicitIncrementData& rIncrement ); ~EquidistantTickFactory(); - void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; - void getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; + void getAllTicks( TickInfoArraysType& rAllTickInfos ) const; + void getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const; static double getMinimumAtIncrement( double fMin, const ExplicitIncrementData& rIncrement ); static double getMaximumAtIncrement( double fMax, const ExplicitIncrementData& rIncrement ); diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 94f3799bc7bc..c391382390b7 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -151,7 +151,7 @@ void VAxisBase::setExplicitScaleAndIncrement( m_aIncrement = rIncrement; } -void VAxisBase::createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) +void VAxisBase::createAllTickInfos( TickInfoArraysType& rAllTickInfos ) { boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); if( m_aScale.ShiftedCategoryPosition ) @@ -208,12 +208,12 @@ void VAxisBase::removeTextShapesFromTicks() { if( m_xTextTarget.is() ) { - ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin(); - const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = m_aAllTickInfos.end(); + TickInfoArraysType::iterator aDepthIter = m_aAllTickInfos.begin(); + const TickInfoArraysType::const_iterator aDepthEnd = m_aAllTickInfos.end(); for( ; aDepthIter != aDepthEnd; ++aDepthIter ) { - ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin(); - const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); + TickInfoArrayType::iterator aTickIter = (*aDepthIter).begin(); + const TickInfoArrayType::const_iterator aTickEnd = (*aDepthIter).end(); for( ; aTickIter != aTickEnd; ++aTickIter ) { TickInfo& rTickInfo = (*aTickIter); diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index a53341abd2fa..d43ef58b4851 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -60,7 +60,7 @@ public: throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); - virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); + virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos ); void setExrtaLinePositionAtOtherAxis( double fCrossingAt ); @@ -96,7 +96,7 @@ protected: //member * It may have more than 2 TickInfo vectors for complex category axis * which has multi-level axis labels. */ - std::vector< std::vector > m_aAllTickInfos; + TickInfoArraysType m_aAllTickInfos; bool m_bReCreateAllTickInfos; bool m_bRecordMaximumTextSize; diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 1d0c7196149e..827973eac0fc 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -202,7 +202,7 @@ class LabelIterator : public TickIter //we iterate through all labels public: - LabelIterator( ::std::vector< TickInfo >& rTickInfoVector + LabelIterator( TickInfoArrayType& rTickInfoVector , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine ); @@ -215,7 +215,7 @@ private: //member bool m_bInnerLine; }; -LabelIterator::LabelIterator( ::std::vector< TickInfo >& rTickInfoVector +LabelIterator::LabelIterator( TickInfoArrayType& rTickInfoVector , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine ) : m_aPureTickIter( rTickInfoVector ) @@ -375,7 +375,7 @@ bool lcl_hasWordBreak( const Reference< drawing::XShape >& rxShape ) class MaxLabelTickIter : public TickIter { public: - MaxLabelTickIter( ::std::vector< TickInfo >& rTickInfoVector + MaxLabelTickIter( TickInfoArrayType& rTickInfoVector , sal_Int32 nLongestLabelIndex ); virtual ~MaxLabelTickIter(); @@ -383,12 +383,12 @@ public: virtual TickInfo* nextInfo() SAL_OVERRIDE; private: - ::std::vector< TickInfo >& m_rTickInfoVector; + TickInfoArrayType& m_rTickInfoVector; ::std::vector< sal_Int32 > m_aValidIndices; sal_Int32 m_nCurrentIndex; }; -MaxLabelTickIter::MaxLabelTickIter( ::std::vector< TickInfo >& rTickInfoVector +MaxLabelTickIter::MaxLabelTickIter( TickInfoArrayType& rTickInfoVector , sal_Int32 nLongestLabelIndex ) : m_rTickInfoVector(rTickInfoVector) , m_nCurrentIndex(0) @@ -466,7 +466,7 @@ bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed( const AxisLabelProperties& return false; } -void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos, bool bShiftedPosition ) +void VCartesianAxis::createAllTickInfosFromComplexCategories( TickInfoArraysType& rAllTickInfos, bool bShiftedPosition ) { //no minor tickmarks will be generated! //order is: inner labels first , outer labels last (that is different to all other TickIter cases) @@ -477,7 +477,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s sal_Int32 nLevelCount = m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoryLevelCount(); for( ; nLevel aTickInfoVector; + TickInfoArrayType aTickInfoVector; const std::vector* pComplexCategories = m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoriesByLevel(nLevel); @@ -517,7 +517,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s sal_Int32 nLevelCount = m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoryLevelCount(); for( ; nLevel aTickInfoVector; + TickInfoArrayType aTickInfoVector; const std::vector* pComplexCategories = m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoriesByLevel(nLevel); sal_Int32 nCatIndex = 0; @@ -558,7 +558,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s } } -void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) +void VCartesianAxis::createAllTickInfos( TickInfoArraysType& rAllTickInfos ) { if( isComplexCategoryAxis() ) createAllTickInfosFromComplexCategories( rAllTickInfos, false ); @@ -1271,7 +1271,7 @@ void lcl_hideIdenticalScreenValues( TickIter& rTickIter ) } //'hide' tickmarks with identical screen values in aAllTickInfos -void VCartesianAxis::hideIdenticalScreenValues( ::std::vector< ::std::vector< TickInfo > >& rTickInfos ) const +void VCartesianAxis::hideIdenticalScreenValues( TickInfoArraysType& rTickInfos ) const { if( isComplexCategoryAxis() || isDateAxis() ) { @@ -1467,12 +1467,12 @@ void VCartesianAxis::updatePositions() //update positions of all existing text shapes pTickFactory2D->updateScreenValues( m_aAllTickInfos ); - ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin(); - const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = m_aAllTickInfos.end(); + TickInfoArraysType::iterator aDepthIter = m_aAllTickInfos.begin(); + const TickInfoArraysType::const_iterator aDepthEnd = m_aAllTickInfos.end(); for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd; ++aDepthIter, nDepth++ ) { - ::std::vector< TickInfo >::iterator aTickIter = aDepthIter->begin(); - const ::std::vector< TickInfo >::const_iterator aTickEnd = aDepthIter->end(); + TickInfoArrayType::iterator aTickIter = aDepthIter->begin(); + const TickInfoArrayType::const_iterator aTickEnd = aDepthIter->end(); for( ; aTickIter != aTickEnd; ++aTickIter ) { TickInfo& rTickInfo = (*aTickIter); @@ -1524,13 +1524,13 @@ void VCartesianAxis::updatePositions() doStaggeringOfLabels( m_aAxisLabelProperties, pTickFactory2D ); } -void VCartesianAxis::createTickMarkLineShapes( ::std::vector< TickInfo >& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickFactory2D& rTickFactory2D, bool bOnlyAtLabels ) +void VCartesianAxis::createTickMarkLineShapes( TickInfoArrayType& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickFactory2D& rTickFactory2D, bool bOnlyAtLabels ) { sal_Int32 nPointCount = rTickInfos.size(); drawing::PointSequenceSequence aPoints(2*nPointCount); - ::std::vector< TickInfo >::const_iterator aTickIter = rTickInfos.begin(); - const ::std::vector< TickInfo >::const_iterator aTickEnd = rTickInfos.end(); + TickInfoArrayType::const_iterator aTickIter = rTickInfos.begin(); + const TickInfoArrayType::const_iterator aTickEnd = rTickInfos.end(); sal_Int32 nN = 0; for( ; aTickIter != aTickEnd; ++aTickIter ) { @@ -1571,7 +1571,7 @@ void VCartesianAxis::createShapes() //create extra long ticks to separate complex categories (create them only there where the labels are) if( isComplexCategoryAxis() ) { - ::std::vector< ::std::vector< TickInfo > > aComplexTickInfos; + TickInfoArraysType aComplexTickInfos; createAllTickInfosFromComplexCategories( aComplexTickInfos, true ); pTickFactory2D->updateScreenValues( aComplexTickInfos ); hideIdenticalScreenValues( aComplexTickInfos ); @@ -1594,8 +1594,8 @@ void VCartesianAxis::createShapes() } sal_Int32 nTickmarkPropertiesCount = aTickmarkPropertiesList.size(); - ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = aComplexTickInfos.begin(); - const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = aComplexTickInfos.end(); + TickInfoArraysType::iterator aDepthIter = aComplexTickInfos.begin(); + const TickInfoArraysType::const_iterator aDepthEnd = aComplexTickInfos.end(); for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; ++aDepthIter, nDepth++ ) { if(nDepth==0 && !m_aAxisProperties.m_nMajorTickmarks) @@ -1605,17 +1605,17 @@ void VCartesianAxis::createShapes() } //create normal ticks for major and minor intervals { - ::std::vector< ::std::vector< TickInfo > > aUnshiftedTickInfos; + TickInfoArraysType aUnshiftedTickInfos; if( m_aScale.ShiftedCategoryPosition )// if ShiftedCategoryPosition==true the tickmarks in m_aAllTickInfos are shifted { pTickFactory2D->getAllTicks( aUnshiftedTickInfos ); pTickFactory2D->updateScreenValues( aUnshiftedTickInfos ); hideIdenticalScreenValues( aUnshiftedTickInfos ); } - ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos = m_aScale.ShiftedCategoryPosition ? aUnshiftedTickInfos : m_aAllTickInfos; + TickInfoArraysType& rAllTickInfos = m_aScale.ShiftedCategoryPosition ? aUnshiftedTickInfos : m_aAllTickInfos; - ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = rAllTickInfos.begin(); - const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rAllTickInfos.end(); + TickInfoArraysType::iterator aDepthIter = rAllTickInfos.begin(); + const TickInfoArraysType::const_iterator aDepthEnd = rAllTickInfos.end(); if(aDepthIter == aDepthEnd)//no tickmarks at all return; diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 22a52e95d19f..0bbeb43b5dcc 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -44,8 +44,8 @@ public: virtual void createShapes() SAL_OVERRIDE; virtual sal_Int32 estimateMaximumAutoMainIncrementCount() SAL_OVERRIDE; - virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) SAL_OVERRIDE; - void createAllTickInfosFromComplexCategories( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos, bool bShiftedPosition ); + virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos ) SAL_OVERRIDE; + void createAllTickInfosFromComplexCategories( TickInfoArraysType& rAllTickInfos, bool bShiftedPosition ); TickIter* createLabelTickIterator( sal_Int32 nTextLevel ); TickIter* createMaximumLabelTickIterator( sal_Int32 nTextLevel ); @@ -112,10 +112,10 @@ protected: //methods , TickFactory2D* pTickFactory , sal_Int32 nScreenDistanceBetweenTicks ); - void createTickMarkLineShapes( ::std::vector< TickInfo >& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickFactory2D& rTickFactory2D, bool bOnlyAtLabels ); + void createTickMarkLineShapes( TickInfoArrayType& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickFactory2D& rTickFactory2D, bool bOnlyAtLabels ); TickFactory2D* createTickFactory2D(); - void hideIdenticalScreenValues( ::std::vector< ::std::vector< TickInfo > >& rTickInfos ) const; + void hideIdenticalScreenValues( TickInfoArraysType& rTickInfos ) const; void doStaggeringOfLabels( const AxisLabelProperties& rAxisLabelProperties , TickFactory2D* pTickFactory2D ); diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index edef68f1dc4c..2c46562d9843 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -212,12 +212,12 @@ void VCartesianGrid::createShapes() //create all scaled tickmark values boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); TickFactory& aTickFactory = *apTickFactory.get(); - ::std::vector< ::std::vector< TickInfo > > aAllTickInfos; + TickInfoArraysType aAllTickInfos; aTickFactory.getAllTicks( aAllTickInfos ); //create tick mark line shapes - ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = aAllTickInfos.begin(); - const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = aAllTickInfos.end(); + TickInfoArraysType::iterator aDepthIter = aAllTickInfos.begin(); + const TickInfoArraysType::const_iterator aDepthEnd = aAllTickInfos.end(); if(aDepthIter == aDepthEnd)//no tickmarks at all return; @@ -248,8 +248,8 @@ void VCartesianGrid::createShapes() sal_Int32 nPointCount = (*aDepthIter).size(); drawing::PointSequenceSequence aPoints(nPointCount); - ::std::vector< TickInfo >::const_iterator aTickIter = (*aDepthIter).begin(); - const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); + TickInfoArrayType::const_iterator aTickIter = (*aDepthIter).begin(); + const TickInfoArrayType::const_iterator aTickEnd = (*aDepthIter).end(); sal_Int32 nRealPointCount = 0; for( ; aTickIter != aTickEnd; ++aTickIter ) { @@ -286,8 +286,8 @@ void VCartesianGrid::createShapes() aPoints.SequenceY.realloc(nPointCount); aPoints.SequenceZ.realloc(nPointCount); - ::std::vector< TickInfo >::const_iterator aTickIter = (*aDepthIter).begin(); - const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); + TickInfoArrayType::const_iterator aTickIter = (*aDepthIter).begin(); + const TickInfoArrayType::const_iterator aTickEnd = (*aDepthIter).end(); sal_Int32 nRealPointCount = 0; sal_Int32 nPolyIndex = 0; for( ; aTickIter != aTickEnd; ++aTickIter, ++nPolyIndex ) diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 9ce621e3b2bc..ff1541df3536 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -57,7 +57,7 @@ void VPolarGrid::setIncrements( const std::vector< ExplicitIncrementData >& rInc m_aIncrements = rIncrements; } -void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const +void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, TickInfoArraysType& rAllTickInfos ) const { TickFactory aTickFactory( m_pPosHelper->getScales()[nDimensionIndex], m_aIncrements[nDimensionIndex] ); @@ -66,7 +66,7 @@ void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::st void VPolarGrid::createLinePointSequence_ForAngleAxis( drawing::PointSequenceSequence& rPoints - , ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos + , TickInfoArraysType& rAllTickInfos , const ExplicitIncrementData& rIncrement , const ExplicitScaleData& rScale , PolarPlottingPositionHelper* pPosHelper @@ -103,8 +103,8 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis( } #ifdef NOTYET void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicTarget - , ::std::vector< ::std::vector< TickInfo > >& /* rRadiusTickInfos */ - , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos + , TickInfoArraysType& /* rRadiusTickInfos */ + , TickInfoArraysType& rAngleTickInfos , const ::std::vector& rLinePropertiesList ) { Reference< drawing::XShapes > xMainTarget( @@ -119,15 +119,15 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT double fLogicOuterRadius = m_pPosHelper->getOuterLogicRadius(); sal_Int32 nLinePropertiesCount = rLinePropertiesList.size(); - ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = rAngleTickInfos.begin(); + TickInfoArraysType::iterator aDepthIter = rAngleTickInfos.begin(); if(nLinePropertiesCount) { double fLogicZ = 1.0;//as defined sal_Int32 nDepth=0; //create axis main lines drawing::PointSequenceSequence aAllPoints; - ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin(); - const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); + TickInfoArrayType::iterator aTickIter = (*aDepthIter).begin(); + const TickInfoArrayType::const_iterator aTickEnd = (*aDepthIter).end(); for( ; aTickIter != aTickEnd; ++aTickIter ) { TickInfo& rTickInfo = *aTickIter; @@ -157,8 +157,8 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT #endif void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget - , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos - , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos + , TickInfoArraysType& rRadiusTickInfos + , TickInfoArraysType& rAngleTickInfos , const ::std::vector& rLinePropertiesList ) { Reference< drawing::XShapes > xMainTarget( @@ -172,8 +172,8 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic xInverseRadiusScaling = rRadiusScale.Scaling->getInverseScaling(); sal_Int32 nLinePropertiesCount = rLinePropertiesList.size(); - ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = rRadiusTickInfos.begin(); - const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rRadiusTickInfos.end(); + TickInfoArraysType::iterator aDepthIter = rRadiusTickInfos.begin(); + const TickInfoArraysType::const_iterator aDepthEnd = rRadiusTickInfos.end(); for( sal_Int32 nDepth=0 ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount ; ++aDepthIter, nDepth++ ) @@ -193,8 +193,8 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic //create axis main lines drawing::PointSequenceSequence aAllPoints; - ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin(); - const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); + TickInfoArrayType::iterator aTickIter = (*aDepthIter).begin(); + const TickInfoArrayType::const_iterator aTickEnd = (*aDepthIter).end(); for( ; aTickIter != aTickEnd; ++aTickIter ) { TickInfo& rTickInfo = *aTickIter; @@ -228,8 +228,8 @@ void VPolarGrid::createShapes() return; //create all scaled tickmark values - ::std::vector< ::std::vector< TickInfo > > aAngleTickInfos; - ::std::vector< ::std::vector< TickInfo > > aRadiusTickInfos; + TickInfoArraysType aAngleTickInfos; + TickInfoArraysType aRadiusTickInfos; getAllTickInfos( 0, aAngleTickInfos ); getAllTickInfos( 1, aRadiusTickInfos ); diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 95576b9cb093..ab2251387b3a 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -48,7 +48,7 @@ public: static void createLinePointSequence_ForAngleAxis( ::com::sun::star::drawing::PointSequenceSequence& rPoints - , ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos + , TickInfoArraysType& rAllTickInfos , const ExplicitIncrementData& rIncrement , const ExplicitScaleData& rScale , PolarPlottingPositionHelper* pPosHelper @@ -61,11 +61,11 @@ private: //member PolarPlottingPositionHelper* m_pPosHelper; ::std::vector< ExplicitIncrementData > m_aIncrements; - void getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; + void getAllTickInfos( sal_Int32 nDimensionIndex, TickInfoArraysType& rAllTickInfos ) const; - void create2DRadiusGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget - , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos - , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos + void create2DRadiusGrid( const css::uno::Reference& xLogicTarget + , TickInfoArraysType& rRadiusTickInfos + , TickInfoArraysType& rAngleTickInfos , const ::std::vector& rLinePropertiesList ); }; diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 4d89d26dc665..6db58e8b863d 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -130,7 +130,7 @@ void VPolarRadiusAxis::createShapes() const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0]; const ExplicitIncrementData& rAngleIncrement = m_aIncrements[0]; - ::std::vector< ::std::vector< TickInfo > > aAngleTickInfos; + TickInfoArraysType aAngleTickInfos; TickFactory aAngleTickFactory( rAngleScale, rAngleIncrement ); aAngleTickFactory.getAllTicks( aAngleTickInfos ); -- cgit v1.2.3