diff options
Diffstat (limited to 'chart2/source/view')
29 files changed, 239 insertions, 239 deletions
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 022025ba8751..1c7016e0e94a 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -353,7 +353,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( double fTempValue = fSourceMinimum; fSourceMinimum = -fSourceMaximum; fSourceMaximum = -fTempValue; - ::std::swap( bAutoMinimum, bAutoMaximum ); + std::swap( bAutoMinimum, bAutoMaximum ); } // *** STEP 2: find temporary (unrounded) axis minimum and maximum *** @@ -518,7 +518,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( rExplicitScale.Maximum = 10.0; } if( rExplicitScale.Maximum < rExplicitScale.Minimum ) - ::std::swap( rExplicitScale.Maximum, rExplicitScale.Minimum ); + std::swap( rExplicitScale.Maximum, rExplicitScale.Minimum ); } //fill explicit sub increment @@ -773,7 +773,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear( double fTempValue = fSourceMinimum; fSourceMinimum = -fSourceMaximum; fSourceMaximum = -fTempValue; - ::std::swap( bAutoMinimum, bAutoMaximum ); + std::swap( bAutoMinimum, bAutoMaximum ); } // *** STEP 2: find temporary (unrounded) axis minimum and maximum *** diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 53770dc9b6b2..8178ab8c6edf 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -129,7 +129,7 @@ struct AxisProperties final */ sal_Int32 m_nMajorTickmarks; sal_Int32 m_nMinorTickmarks; - ::std::vector<TickmarkProperties> m_aTickmarkPropertiesList; + std::vector<TickmarkProperties> m_aTickmarkPropertiesList; VLineProperties m_aLineProperties; diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 5dcb9a89bd1a..8a38c8cb1597 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -295,9 +295,9 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick { awt::Size aSize = AbstractShapeFactory::getSizeAfterRotation( xShape2DText, fRotationAngleDegree ); if(fabs(aStaggerDirection.getX())>fabs(aStaggerDirection.getY())) - nDistance = ::std::max(nDistance,aSize.Width); + nDistance = std::max(nDistance,aSize.Width); else - nDistance = ::std::max(nDistance,aSize.Height); + nDistance = std::max(nDistance,aSize.Height); } } @@ -1092,8 +1092,8 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do return aRet; } -typedef ::std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList; -struct lcl_LessXPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool > +typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList; +struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool > { inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 ) { @@ -1101,7 +1101,7 @@ struct lcl_LessXPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicP } }; -struct lcl_GreaterYPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool > +struct lcl_GreaterYPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool > { inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 ) { @@ -1201,14 +1201,14 @@ void VCartesianAxis::get2DAxisMainLine( { rAlignment.meAlignment = LABEL_ALIGN_LEFT; //choose most left positions - ::std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() ); + std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() ); rAlignment.mfLabelDirection = (fDeltaY < 0) ? -1.0 : 1.0; } else { rAlignment.meAlignment = LABEL_ALIGN_BOTTOM; //choose most bottom positions - ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() ); + std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() ); rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0; } ScreenPosAndLogicPos aBestPos( aPosList[0] ); @@ -1255,14 +1255,14 @@ void VCartesianAxis::get2DAxisMainLine( { rAlignment.meAlignment = LABEL_ALIGN_LEFT; //choose most left positions - ::std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() ); + std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() ); rAlignment.mfLabelDirection = (fDeltaY < 0) ? -1.0 : 1.0; } else { rAlignment.meAlignment = LABEL_ALIGN_BOTTOM; //choose most bottom positions - ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() ); + std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() ); rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0; } ScreenPosAndLogicPos aBestPos( aPosList[0] ); @@ -1330,7 +1330,7 @@ void VCartesianAxis::get2DAxisMainLine( aPosList.push_back( getScreenPosAndLogicPos( fXOther, fYOnYPlane, fMinZ ) ); aPosList.push_back( getScreenPosAndLogicPos( fXOnXPlane, fYOther, fMinZ ) ); - ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() ); + std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() ); ScreenPosAndLogicPos aBestPos( aPosList[0] ); ScreenPosAndLogicPos aNotSoGoodPos( aPosList[1] ); @@ -1768,7 +1768,7 @@ void VCartesianAxis::createShapes() pTickFactory2D->updateScreenValues( aComplexTickInfos ); hideIdenticalScreenValues( aComplexTickInfos ); - ::std::vector<TickmarkProperties> aTickmarkPropertiesList; + std::vector<TickmarkProperties> aTickmarkPropertiesList; static bool bIncludeSpaceBetweenTickAndText = false; sal_Int32 nOffset = static_cast<sal_Int32>(pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties, false, bIncludeSpaceBetweenTickAndText ).getLength()); sal_Int32 nTextLevelCount = getTextLevelCount(); diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 02b23221c50a..8da909ffef3f 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -174,7 +174,7 @@ VCartesianGrid::~VCartesianGrid() m_pPosHelper = nullptr; } -void VCartesianGrid::fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList +void VCartesianGrid::fillLinePropertiesFromGridModel( std::vector<VLineProperties>& rLinePropertiesList , const Sequence< Reference< beans::XPropertySet > > & rGridPropertiesList ) { rLinePropertiesList.clear(); @@ -205,7 +205,7 @@ void VCartesianGrid::createShapes() if(!xGroupShape_Shapes.is()) return; - ::std::vector<VLineProperties> aLinePropertiesList; + std::vector<VLineProperties> aLinePropertiesList; fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList ); //create all scaled tickmark values diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index dddb629bd6dd..31b6fb878775 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -40,7 +40,7 @@ public: virtual void createShapes() override; - static void fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList + static void fillLinePropertiesFromGridModel( std::vector<VLineProperties>& rLinePropertiesList , const css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > >& rGridPropertiesList ); diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index 6eaed3385128..997663b6e325 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -49,7 +49,7 @@ protected: protected: //member PolarPlottingPositionHelper* m_pPosHelper; - ::std::vector< ExplicitIncrementData > m_aIncrements; + std::vector< ExplicitIncrementData > m_aIncrements; }; } //namespace chart diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 9dbc47df44cd..c20f1a68730e 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -105,7 +105,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis( void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicTarget , TickInfoArraysType& /* rRadiusTickInfos */ , TickInfoArraysType& rAngleTickInfos - , const ::std::vector<VLineProperties>& rLinePropertiesList ) + , const std::vector<VLineProperties>& rLinePropertiesList ) { Reference< drawing::XShapes > xMainTarget( this->createGroupShape( xLogicTarget, m_aCID ) ); @@ -159,7 +159,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget , TickInfoArraysType& rRadiusTickInfos , TickInfoArraysType& rAngleTickInfos - , const ::std::vector<VLineProperties>& rLinePropertiesList ) + , const std::vector<VLineProperties>& rLinePropertiesList ) { Reference< drawing::XShapes > xMainTarget( this->createGroupShape( xLogicTarget, m_aCID ) ); @@ -233,7 +233,7 @@ void VPolarGrid::createShapes() getAllTickInfos( 0, aAngleTickInfos ); getAllTickInfos( 1, aRadiusTickInfos ); - ::std::vector<VLineProperties> aLinePropertiesList; + std::vector<VLineProperties> aLinePropertiesList; VCartesianGrid::fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList ); //create tick mark line shapes diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 6d8a128b3210..645c341bf4fc 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -57,14 +57,14 @@ private: //member css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > m_aGridPropertiesList;//main grid, subgrid, subsubgrid etc PolarPlottingPositionHelper* m_pPosHelper; - ::std::vector< ExplicitIncrementData > m_aIncrements; + std::vector< ExplicitIncrementData > m_aIncrements; void getAllTickInfos( sal_Int32 nDimensionIndex, TickInfoArraysType& rAllTickInfos ) const; void create2DRadiusGrid( const css::uno::Reference<css::drawing::XShapes>& xLogicTarget , TickInfoArraysType& rRadiusTickInfos , TickInfoArraysType& rAngleTickInfos - , const ::std::vector<VLineProperties>& rLinePropertiesList ); + , const std::vector<VLineProperties>& rLinePropertiesList ); }; } //namespace chart diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index e4f2d85da738..bdf23f29751b 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -47,7 +47,7 @@ public: virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override; - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; + virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index b0f3fdb63d86..da8a20f3e117 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -531,19 +531,19 @@ void AreaChart::impl_createSeriesShapes() //the polygon shapes for each series need to be created before //iterate through all series again to create the series shapes - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + 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 ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { - ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex drawing::PolyPolygonShape3D* pSeriesPoly = nullptr; @@ -580,20 +580,20 @@ void AreaChart::impl_createSeriesShapes() namespace { -void lcl_reorderSeries( ::std::vector< ::std::vector< VDataSeriesGroup > >& rZSlots ) +void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >& rZSlots ) { - ::std::vector< ::std::vector< VDataSeriesGroup > > aRet; + std::vector< std::vector< VDataSeriesGroup > > aRet; aRet.reserve( rZSlots.size() ); - ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() ); - ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() ); + std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() ); + std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() ); for( ; aZIt != aZEnd; ++aZIt ) { - ::std::vector< VDataSeriesGroup > aXSlot; + std::vector< VDataSeriesGroup > aXSlot; aXSlot.reserve( aZIt->size() ); - ::std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() ); - ::std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() ); + std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() ); + std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() ); for( ; aXIt != aXEnd; ++aXIt ) aXSlot.push_back(*aXIt); @@ -667,14 +667,14 @@ void AreaChart::createShapes() bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis()); - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); + const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); std::vector<std::map< sal_Int32, double > > aLogicYSumMapByX(nEndIndex);//one for each different nAttachedAxisIndex for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end(); //iterate through all x slots in this category to get 100percent sum for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) @@ -715,8 +715,8 @@ void AreaChart::createShapes() aZSlotIter = m_aZSlots.begin(); for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ ) { - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); //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??? diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 764dae06a6eb..df796f73e04e 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -451,15 +451,15 @@ void BarChart::createShapes() //iterate through all x values per indices for( sal_Int32 nPointIndex = nStartIndex; nPointIndex < nEndIndex; nPointIndex++ ) { - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); + const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); //sum up the values for all series in a complete z zlot per attached axis - ::std::map< sal_Int32, double > aLogicYSumMap; + std::map< sal_Int32, double > aLogicYSumMap; for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter ) { @@ -485,8 +485,8 @@ void BarChart::createShapes() 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(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); //iterate through all x slots in this category double fSlotX=0; @@ -508,7 +508,7 @@ void BarChart::createShapes() pPosHelper->updateSeriesCount( aZSlotIter->size() ); double fLogicBaseWidth = pPosHelper->getScaledSlotWidth(); - ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); // get distance from base value to maximum and minimum @@ -553,8 +553,8 @@ void BarChart::createShapes() double fPositiveLogicYForNextSeries = fBaseValue; double fNegativeLogicYForNextSeries = fBaseValue; - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -862,12 +862,12 @@ void BarChart::createShapes() }//next category if( bDrawConnectionLines ) { - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + 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++ ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); BarPositionHelper* pPosHelper = m_pMainPosHelper.get(); if( aXSlotIter != aXSlotEnd ) @@ -883,10 +883,10 @@ void BarChart::createShapes() //iterate through all x slots in this category for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 ) { - ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); //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 a435ceed43d6..5bb940aa7dc4 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -72,17 +72,17 @@ void BubbleChart::calculateMaximumLogicBubbleSize() sal_Int32 nEndIndex = VSeriesPlotter::getPointCount(); for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + 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 ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); 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(); + 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 ) { VDataSeries* pSeries( *aSeriesIter ); @@ -215,19 +215,19 @@ void BubbleChart::createShapes() //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + 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++ ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX ) { - ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); //iterate through all series for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex ) diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 439ed56ea1ce..58e0f3aac533 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -139,12 +139,12 @@ void CandleStickChart::createShapes() //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + 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=0; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); sal_Int32 nAttachedAxisIndex = 0; BarPositionHelper* pPosHelper = m_pMainPosHelper.get(); @@ -163,10 +163,10 @@ void CandleStickChart::createShapes() //iterate through all x slots in this category for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 ) { - ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 591e4c98969e..c1cebdcc97bd 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -244,19 +244,19 @@ void NetChart::impl_createSeriesShapes() //the polygon shapes for each series need to be created before //iterate through all series again to create the series shapes - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + 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 ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { - ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex drawing::PolyPolygonShape3D* pSeriesPoly = nullptr; @@ -290,20 +290,20 @@ void NetChart::impl_createSeriesShapes() namespace { -void lcl_reorderSeries( ::std::vector< ::std::vector< VDataSeriesGroup > >& rZSlots ) +void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >& rZSlots ) { - ::std::vector< ::std::vector< VDataSeriesGroup > > aRet; + std::vector< std::vector< VDataSeriesGroup > > aRet; aRet.reserve( rZSlots.size() ); - ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() ); - ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() ); + std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() ); + std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() ); for( ; aZIt != aZEnd; ++aZIt ) { - ::std::vector< VDataSeriesGroup > aXSlot; + std::vector< VDataSeriesGroup > aXSlot; aXSlot.reserve( aZIt->size() ); - ::std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() ); - ::std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() ); + std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() ); + std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() ); for( ; aXIt != aXEnd; ++aXIt ) aXSlot.push_back(*aXIt); @@ -375,14 +375,14 @@ void NetChart::createShapes() //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); + const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); std::map< sal_Int32, double > aLogicYSumMap;//one for each different nAttachedAxisIndex for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end(); //iterate through all x slots in this category to get 100percent sum for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) @@ -419,8 +419,8 @@ void NetChart::createShapes() aZSlotIter = m_aZSlots.begin(); for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ ) { - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); //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??? diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index a510604d44fc..34001ef1f9f0 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -394,7 +394,7 @@ double PieChart::getMaxOffset() if( m_aZSlots[0].size()<=0 ) return m_fMaxOffset; - const ::std::vector< VDataSeries* >& rSeriesList( m_aZSlots[0][0].m_aSeriesVector ); + const std::vector< VDataSeries* >& rSeriesList( m_aZSlots[0][0].m_aSeriesVector ); if( rSeriesList.size()<=0 ) return m_fMaxOffset; @@ -511,8 +511,8 @@ void PieChart::createShapes() ///that the radius axis scale is the one with index 0 and the angle axis ///scale is the one with index 1. - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = m_aZSlots[0].begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = m_aZSlots[0].end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = m_aZSlots[0].begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = m_aZSlots[0].end(); ///m_bUseRings == true if chart type is `donut`, == false if chart type is ///`pie`; if the chart is of `donut` type we have as many rings as many data @@ -527,7 +527,7 @@ void PieChart::createShapes() ///the `explodeable` ring is the first one except when the radius axis ///orientation is reversed (always!?) and we are dealing with a donut: in ///such a case the `explodeable` ring is the last one. - ::std::vector< VDataSeriesGroup >::size_type nExplodeableSlot = 0; + std::vector< VDataSeriesGroup >::size_type nExplodeableSlot = 0; if( m_pPosHelper->isMathematicalOrientationRadius() && m_bUseRings ) nExplodeableSlot = m_aZSlots[0].size()-1; @@ -552,7 +552,7 @@ void PieChart::createShapes() { ShapeParam aParam; - ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); if( pSeriesList->size()<=0 )//there should be only one series in each x slot continue; VDataSeries* pSeries = (*pSeriesList)[0]; @@ -628,7 +628,7 @@ void PieChart::createShapes() ///property of the current data series entry only for slices ///belonging to the outer ring aParam.mfExplodePercentage = 0.0; - bool bDoExplode = ( nExplodeableSlot == static_cast< ::std::vector< VDataSeriesGroup >::size_type >(fSlotX) ); + bool bDoExplode = ( nExplodeableSlot == static_cast< std::vector< VDataSeriesGroup >::size_type >(fSlotX) ); if(bDoExplode) try { xPointProperties->getPropertyValue( "Offset") >>= aParam.mfExplodePercentage; diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index 6ec5356a6eeb..8743bc0d2af8 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -44,7 +44,7 @@ public: virtual void createShapes() override; virtual void rearrangeLabelToAvoidOverlapIfRequested( const css::awt::Size& rPageSize ) override; - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; + virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; @@ -134,7 +134,7 @@ private: //member css::awt::Point aPreviousPosition; }; - ::std::vector< PieLabelInfo > m_aLabelInfoList; + std::vector< PieLabelInfo > m_aLabelInfoList; double m_fMaxOffset; /// cached max offset value (init'ed to NaN) }; diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index a06a76a2be8f..ca8051155164 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -33,8 +33,8 @@ using namespace ::com::sun::star; namespace { -typedef ::std::pair< double, double > tPointType; -typedef ::std::vector< tPointType > tPointVecType; +typedef std::pair< double, double > tPointType; +typedef std::vector< tPointType > tPointVecType; typedef tPointVecType::size_type lcl_tSizeType; class lcl_SplineCalculation @@ -76,7 +76,7 @@ private: tPointVecType m_aPoints; /// the result of the Calculate() method - ::std::vector< double > m_aSecDerivY; + std::vector< double > m_aSecDerivY; double m_fYp1; double m_fYpN; @@ -146,7 +146,7 @@ void lcl_SplineCalculation::Calculate() // n is the last valid index to m_aPoints const lcl_tSizeType n = m_aPoints.size() - 1; - ::std::vector< double > u( n ); + std::vector< double > u( n ); m_aSecDerivY.resize( n + 1, 0.0 ); if( ::rtl::math::isInf( m_fYp1 ) ) @@ -219,25 +219,25 @@ void lcl_SplineCalculation::CalculatePeriodic() // u is used for vector f in A*c=f in [3], vector a in Ax=a in [2], // vector z in Rtranspose z = a and Dr=z in [2] - ::std::vector< double > u( n + 1, 0.0 ); + std::vector< double > u( n + 1, 0.0 ); // used for vector c in A*c=f and vector x in Ax=a in [2] m_aSecDerivY.resize( n + 1, 0.0 ); // diagonal of matrix A, used index 1 to n - ::std::vector< double > Adiag( n + 1, 0.0 ); + std::vector< double > Adiag( n + 1, 0.0 ); // secondary diagonal of matrix A with index 1 to n-1 and upper right element in A[n] - ::std::vector< double > Aupper( n + 1, 0.0 ); + std::vector< double > Aupper( n + 1, 0.0 ); // diagonal of matrix D in A=(R transpose)*D*R in [2], used index 1 to n - ::std::vector< double > Ddiag( n+1, 0.0 ); + std::vector< double > Ddiag( n+1, 0.0 ); // right column of matrix R, used index 1 to n-2 - ::std::vector< double > Rright( n-1, 0.0 ); + std::vector< double > Rright( n-1, 0.0 ); // secondary diagonal of matrix R, used index 1 to n-1 - ::std::vector< double > Rupper( n, 0.0 ); + std::vector< double > Rupper( n, 0.0 ); if (n<4) { @@ -557,7 +557,7 @@ void SplineCalculater::CalculateCubicSplines( const double* pOldY = rInput.SequenceY[nOuter].getConstArray(); const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray(); - ::std::vector < double > aParameter(nMaxIndexPoints+1); + std::vector < double > aParameter(nMaxIndexPoints+1); aParameter[0]=0.0; for( sal_uInt32 nIndex=1; nIndex<=nMaxIndexPoints; nIndex++ ) { @@ -703,7 +703,7 @@ void SplineCalculater::CalculateBSplines( aPointsIn[ i ].first = pOldX[i]; aPointsIn[ i ].second = pOldY[i]; } - aPointsIn.erase( ::std::unique( aPointsIn.begin(), aPointsIn.end()), + aPointsIn.erase( std::unique( aPointsIn.begin(), aPointsIn.end()), aPointsIn.end() ); // n is the last valid index to the reduced aPointsIn diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index ebdb4f82755c..134a9898e6d4 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -118,8 +118,8 @@ VDataSeriesGroup::~VDataSeriesGroup() 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(); + std::vector< VDataSeries* >::const_iterator aIter = m_aSeriesVector.begin(); + const std::vector< VDataSeries* >::const_iterator aEnd = m_aSeriesVector.end(); for( ; aIter != aEnd; ++aIter ) { delete *aIter; @@ -158,12 +158,12 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode VSeriesPlotter::~VSeriesPlotter() { //delete all data series help objects: - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + 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 ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { aXSlotIter->deleteSeries(); @@ -209,14 +209,14 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32 if(zSlot<0 || zSlot>=static_cast<sal_Int32>(m_aZSlots.size())) { //new z slot - ::std::vector< VDataSeriesGroup > aZSlot; + std::vector< VDataSeriesGroup > aZSlot; aZSlot.push_back( VDataSeriesGroup(pSeries) ); m_aZSlots.push_back( aZSlot ); } else { //existing zslot - ::std::vector< VDataSeriesGroup >& rXSlots = m_aZSlots[zSlot]; + std::vector< VDataSeriesGroup >& rXSlots = m_aZSlots[zSlot]; if(xSlot<0 || xSlot>=static_cast<sal_Int32>(rXSlots.size())) { @@ -271,18 +271,18 @@ drawing::Direction3D VSeriesPlotter::getPreferredDiagramAspectRatio() const void VSeriesPlotter::releaseShapes() { - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + 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 ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { - ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); - ::std::vector< VDataSeries* >::iterator aSeriesIter = pSeriesList->begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); + std::vector< VDataSeries* >::iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) @@ -1558,12 +1558,12 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu ::rtl::math::setInf(&rfMinimum, false); ::rtl::math::setInf(&rfMaximum, true); - ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin(); + const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { double fLocalMinimum, fLocalMaximum; @@ -1585,12 +1585,12 @@ void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d ::rtl::math::setInf(&rfMinY, false); ::rtl::math::setInf(&rfMaxY, true); - ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin(); + const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { double fLocalMinimum, fLocalMaximum; @@ -1611,13 +1611,13 @@ sal_Int32 VSeriesPlotter::getPointCount() const { sal_Int32 nRet = 0; - ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin(); + const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { @@ -1651,8 +1651,8 @@ sal_Int32 VDataSeriesGroup::getPointCount() const return m_nMaxPointCount; sal_Int32 nRet = 0; - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end(); for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter) { @@ -1670,8 +1670,8 @@ sal_Int32 VDataSeriesGroup::getPointCount() const sal_Int32 VDataSeriesGroup::getAttachedAxisIndexForFirstSeries() const { sal_Int32 nRet = 0; - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end(); if( aSeriesIter != aSeriesEnd ) nRet = (*aSeriesIter)->getAttachedAxisIndex(); @@ -1681,10 +1681,10 @@ sal_Int32 VDataSeriesGroup::getAttachedAxisIndexForFirstSeries() const void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const { - const ::std::vector< VDataSeries* >* pSeriesList = &this->m_aSeriesVector; + const std::vector< VDataSeries* >* pSeriesList = &this->m_aSeriesVector; - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); ::rtl::math::setInf(&rfMinimum, false); ::rtl::math::setInf(&rfMaximum, true); @@ -1916,8 +1916,8 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex ::rtl::math::setNan( &fFirstPositiveY ); ::rtl::math::setNan( &fFirstNegativeY ); - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin(); - ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end(); + std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin(); + std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end(); if( bSeparateStackingForDifferentSigns ) { @@ -2063,12 +2063,12 @@ void VSeriesPlotter::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& / VDataSeries* VSeriesPlotter::getFirstSeries() const { - ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() ); - ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() ); + std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() ); + std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() ); for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); if( aXSlotIter != aXSlotEnd ) { @@ -2086,18 +2086,18 @@ VDataSeries* VSeriesPlotter::getFirstSeries() const uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const { - ::std::vector< OUString > aRetVector; + std::vector< OUString > aRetVector; OUString aRole; if( m_xChartTypeModel.is() ) aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel(); - ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() ); - ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() ); + std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() ); + std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() ); for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); if( aXSlotIter != aXSlotEnd ) { @@ -2119,13 +2119,13 @@ uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const namespace { -struct lcl_setRefSizeAtSeriesGroup : public ::std::unary_function< VDataSeriesGroup, void > +struct lcl_setRefSizeAtSeriesGroup : public std::unary_function< VDataSeriesGroup, void > { explicit lcl_setRefSizeAtSeriesGroup( awt::Size aRefSize ) : m_aRefSize( aRefSize ) {} void operator()( VDataSeriesGroup & rGroup ) { - ::std::vector< VDataSeries* >::iterator aIt( rGroup.m_aSeriesVector.begin()); - const ::std::vector< VDataSeries* >::iterator aEndIt( rGroup.m_aSeriesVector.end()); + std::vector< VDataSeries* >::iterator aIt( rGroup.m_aSeriesVector.begin()); + const std::vector< VDataSeries* >::iterator aEndIt( rGroup.m_aSeriesVector.end()); for( ; aIt != aEndIt; ++aIt ) (*aIt)->setPageReferenceSize( m_aRefSize ); } @@ -2141,8 +2141,8 @@ void VSeriesPlotter::setPageReferenceSize( const css::awt::Size & rPageRefSize ) // set reference size also at all data series - ::std::vector< VDataSeriesGroup > aSeriesGroups( FlattenVector( m_aZSlots )); - ::std::for_each( aSeriesGroups.begin(), aSeriesGroups.end(), + std::vector< VDataSeriesGroup > aSeriesGroups( FlattenVector( m_aZSlots )); + std::for_each( aSeriesGroups.begin(), aSeriesGroups.end(), lcl_setRefSizeAtSeriesGroup( m_aPageReferenceSize )); } @@ -2180,17 +2180,17 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( //iterate through all series bool bBreak = false; 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(); + 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 ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter!=aXSlotEnd && !bBreak; ++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(); + std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); + std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); + const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); //iterate through all series in this x slot for( ; aSeriesIter!=aSeriesEnd && !bBreak; ++aSeriesIter ) { @@ -2232,18 +2232,18 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( return aResult; } -::std::vector< VDataSeries* > VSeriesPlotter::getAllSeries() +std::vector< VDataSeries* > VSeriesPlotter::getAllSeries() { - ::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(); + 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 ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { - ::std::vector< VDataSeries* > aSeriesList = aXSlotIter->m_aSeriesVector; + std::vector< VDataSeries* > aSeriesList = aXSlotIter->m_aSeriesVector; aAllSeries.insert( aAllSeries.end(), aSeriesList.begin(), aSeriesList.end() ); } } @@ -2301,9 +2301,9 @@ awt::Size VSeriesPlotter::getPreferredLegendKeyAspectRatio() bool bSeriesAllowsLines = (getLegendSymbolStyle() == LegendSymbolStyle_LINE); bool bHasLines = false; bool bHasDashedLines = false; - ::std::vector< VDataSeries* > aAllSeries( getAllSeries() ); - ::std::vector< VDataSeries* >::const_iterator aSeriesIter = aAllSeries.begin(); - const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = aAllSeries.end(); + std::vector< VDataSeries* > aAllSeries( getAllSeries() ); + 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 ) { diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index 3c2baf9b0ed5..303c1c5c8ac9 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -86,7 +86,7 @@ public: virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) override; private: - typedef ::std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet; + typedef std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet; MinimumAndMaximumSupplierSet m_aMinimumAndMaximumSupplierList; inline MinimumAndMaximumSupplierSet::iterator begin() { return m_aMinimumAndMaximumSupplierList.begin(); } diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 8c408328f419..9544cf3b7343 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -56,7 +56,7 @@ public: , const OUString& rCID ); - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); + virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ); diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 99ed5c864492..19c341b061ce 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -49,8 +49,8 @@ public: virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix); - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); - const ::std::vector< ExplicitScaleData >& getScales() const { return m_aScales;} + virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); + const std::vector< ExplicitScaleData >& getScales() const { return m_aScales;} //better performance for big data inline void setCoordinateSystemResolution( const css::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); @@ -111,7 +111,7 @@ public: void AllowShiftZAxisPos( bool bAllowShift ); protected: //member - ::std::vector< ExplicitScaleData > m_aScales; + std::vector< ExplicitScaleData > m_aScales; ::basegfx::B3DHomMatrix m_aMatrixScreenToScene; //this is calculated based on m_aScales and m_aMatrixScreenToScene diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index fbdd90a27be6..5af3b7fdf27b 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -31,8 +31,8 @@ namespace chart { -typedef ::std::map< OUString, OUString > tPropertyNameMap; -typedef ::std::map< OUString, css::uno::Any > tPropertyNameValueMap; +typedef std::map< OUString, OUString > tPropertyNameMap; +typedef std::map< OUString, css::uno::Any > tPropertyNameValueMap; typedef css::uno::Sequence< OUString > tNameSequence; typedef css::uno::Sequence< css::uno::Any > tAnySequence; diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 97ceebd16050..b5a404ff2bb3 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -73,9 +73,9 @@ public: ExplicitCategoriesProvider* getExplicitCategoriesProvider(); // returns a complete scale set for a given dimension and index; for example if nDimensionIndex==1 and nAxisIndex==2 you get returned the secondary x axis, main y axis and main z axis - ::std::vector< ExplicitScaleData > getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; + std::vector< ExplicitScaleData > getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; // returns a complete increment set for a given dimension and index; for example if nDimensionIndex==1 and nAxisIndex==2 you get returned the secondary x axis, main y axis and main z axis - ::std::vector< ExplicitIncrementData > getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; + std::vector< ExplicitIncrementData > getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; void addMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier ); bool hasMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier ); diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 571d903843dd..de1a3fdd1aa2 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -97,7 +97,7 @@ public: , bool bSeparateStackingForDifferentSigns , double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex ); - ::std::vector< VDataSeries* > m_aSeriesVector; + std::vector< VDataSeries* > m_aSeriesVector; private: //cached values @@ -113,7 +113,7 @@ private: mutable bool m_bMaxPointCountDirty; mutable sal_Int32 m_nMaxPointCount; typedef std::map< sal_Int32, CachedYValues > tCachedYValuesPerAxisIndexMap; - mutable ::std::vector< tCachedYValuesPerAxisIndexMap > m_aListOfCachedYValues; + mutable std::vector< tCachedYValuesPerAxisIndexMap > m_aListOfCachedYValues; }; class VSeriesPlotter : public PlotterBase, public MinimumAndMaximumSupplier, public LegendEntryProvider @@ -220,7 +220,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext ); - ::std::vector< VDataSeries* > getAllSeries(); + std::vector< VDataSeries* > getAllSeries(); // This method creates a series plotter of the requested type; e.g. : return new PieChart .... static VSeriesPlotter* createSeriesPlotter( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel @@ -394,7 +394,7 @@ protected: css::uno::Reference< css::chart2::XChartType > m_xChartTypeModel; css::uno::Reference< css::beans::XPropertySet > m_xChartTypeModelProps; - ::std::vector< ::std::vector< VDataSeriesGroup > > m_aZSlots; + std::vector< std::vector< VDataSeriesGroup > > m_aZSlots; bool m_bCategoryXAxis;//true->xvalues are indices (this would not be necessary if series for category chart wouldn't have x-values) long m_nTimeResolution; diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 4909b1223239..213d12fec963 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -52,7 +52,7 @@ ChartItemPool::ChartItemPool(): rPoolDefaults[SCHATTR_DATADESCR_WRAP_TEXT - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_WRAP_TEXT); rPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR," "); rPoolDefaults[SCHATTR_DATADESCR_PLACEMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_DATADESCR_PLACEMENT,0); - rPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, ::std::vector < sal_Int32 >() ); + rPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, std::vector < sal_Int32 >() ); rPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE); rPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE - SCHATTR_START] = new SfxUInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0); rPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE); @@ -143,7 +143,7 @@ ChartItemPool::ChartItemPool(): rPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, false ); rPoolDefaults[SCHATTR_MISSING_VALUE_TREATMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT, 0); - rPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, ::std::vector < sal_Int32 >() ); + rPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, std::vector < sal_Int32 >() ); rPoolDefaults[SCHATTR_INCLUDE_HIDDEN_CELLS - SCHATTR_START] = new SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, true); rPoolDefaults[SCHATTR_AXIS_FOR_ALL_SERIES - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_FOR_ALL_SERIES, 0); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index f509436e2092..fce14c83e5b2 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -152,7 +152,7 @@ struct AxisUsage ~AxisUsage(); void addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - ::std::vector< VCoordinateSystem* > getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); + std::vector< VCoordinateSystem* > getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); sal_Int32 getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex ); void prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex ); @@ -211,9 +211,9 @@ void AxisUsage::addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDime aMaxIndexPerDimension[nDimensionIndex]=nAxisIndex; } -::std::vector< VCoordinateSystem* > AxisUsage::getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) +std::vector< VCoordinateSystem* > AxisUsage::getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { - ::std::vector< VCoordinateSystem* > aRet; + std::vector< VCoordinateSystem* > aRet; tCoordinateSystemMap::const_iterator aIter; for( aIter = aCoordinateSystems.begin(); aIter!=aCoordinateSystems.end();++aIter ) @@ -357,7 +357,7 @@ private: /** A map whose key is a `XAxis` interface and the related value is * an object of `AxisUsage` type. */ - ::std::map< uno::Reference< XAxis >, AxisUsage > m_aAxisUsageList; + std::map< uno::Reference< XAxis >, AxisUsage > m_aAxisUsageList; /** * Max axis index of all dimensions. Currently this can be either 0 or 1 @@ -703,8 +703,8 @@ void SeriesPlotterContainer::initAxisUsageList(const Date& rNullDate) } // Determine the highest axis index of all dimensions. - ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin(); - const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end(); + std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin(); + const std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end(); m_nMaxAxisIndex = 0; for (VCoordinateSystem* pVCooSys : m_rVCooSysList) { @@ -797,8 +797,8 @@ void SeriesPlotterContainer::doAutoScaling( ChartModel& rChartModel ) // We need these two containers populated to do auto-scaling. Bail out. return; - ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin(); - const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end(); + std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin(); + const std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end(); //iterate over the main scales first than secondary axis for (sal_Int32 nAxisIndex = 0; nAxisIndex <= m_nMaxAxisIndex; ++nAxisIndex) @@ -842,15 +842,15 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& { //issue #i80518# - ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin(); - const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end(); + std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin(); + const std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end(); for( sal_Int32 nAxisIndex=0; nAxisIndex<=m_nMaxAxisIndex; nAxisIndex++ ) { for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter ) { AxisUsage& rAxisUsage = (*aAxisIter).second; - ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex ); + std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex ); if( aVCooSysList_Y.empty() ) continue; @@ -861,8 +861,8 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& bool bSeriesAttachedToThisAxis = false; sal_Int32 nAttachedAxisIndex = -1; { - ::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); - ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin(); + std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); + std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin(); for( ; aIter != aSeriesVector.end(); ++aIter ) { sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter ); @@ -946,7 +946,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter ) { AxisUsage& rAxisUsage = (*aAxisIter).second; - ::std::vector< VCoordinateSystem* > aVCooSysList = rAxisUsage.getCoordinateSystems(nDimensionIndex,nAxisIndex); + std::vector< VCoordinateSystem* > aVCooSysList = rAxisUsage.getCoordinateSystems(nDimensionIndex,nAxisIndex); size_t nC; for( nC=0; nC < aVCooSysList.size(); nC++) { @@ -1243,10 +1243,10 @@ ChartView::~ChartView() void ChartView::impl_deleteCoordinateSystems() { //delete all coordinate systems - ::std::vector< VCoordinateSystem* > aVectorToDeleteObjects; - ::std::swap( aVectorToDeleteObjects, m_aVCooSysList );//#i109770# - ::std::vector< VCoordinateSystem* >::const_iterator aIter = aVectorToDeleteObjects.begin(); - const ::std::vector< VCoordinateSystem* >::const_iterator aEnd = aVectorToDeleteObjects.end(); + std::vector< VCoordinateSystem* > aVectorToDeleteObjects; + 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 ) { delete *aIter; diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 2b4e85555dc7..4a8489425063 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -209,7 +209,7 @@ uno::Any createPolyPolygon_Cylinder( double fY2 = fHeight; if( fHeight<0.0 ) - ::std::swap(fY1,fY2); + std::swap(fY1,fY2); for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -302,8 +302,8 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig if( fHeight<0.0 ) { - ::std::swap(fX1,fX3); - ::std::swap(fY1,fY3); + std::swap(fX1,fX3); + std::swap(fY1,fY3); } for(sal_Int32 nN = 2; nN--;) diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 81e7bd2a2ce1..e9a16e7dbf3a 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -285,7 +285,7 @@ void VDataSeries::doSortByXValues() if( m_aValues_X.is() && m_aValues_X.Doubles.getLength() ) { //prepare a vector for sorting - std::vector< ::std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of the point + std::vector< std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of the point double fNan; ::rtl::math::setNan( & fNan ); sal_Int32 nPointIndex = 0; @@ -780,7 +780,7 @@ double VDataSeries::getYMeanValue() const std::unique_ptr<Symbol> getSymbolPropertiesFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) { - ::std::unique_ptr< Symbol > apSymbolProps( new Symbol() ); + std::unique_ptr< Symbol > apSymbolProps( new Symbol() ); try { if( xProp->getPropertyValue("Symbol") >>= *apSymbolProps ) @@ -926,7 +926,7 @@ uno::Reference<beans::XPropertySet> VDataSeries::getPropertiesOfSeries() const std::unique_ptr<DataPointLabel> getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) { - ::std::unique_ptr< DataPointLabel > apLabel( new DataPointLabel() ); + std::unique_ptr< DataPointLabel > apLabel( new DataPointLabel() ); try { if( !(xProp->getPropertyValue(CHART_UNONAME_LABEL) >>= *apLabel) ) diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 9506b250bda2..5cddb573af95 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -55,7 +55,7 @@ namespace chart namespace { -typedef ::std::pair< ::chart::tNameSequence, ::chart::tAnySequence > tPropertyValues; +typedef std::pair< ::chart::tNameSequence, ::chart::tAnySequence > tPropertyValues; double lcl_CalcViewFontSize( const Reference< beans::XPropertySet > & xProp, @@ -148,7 +148,7 @@ awt::Size lcl_createTextShapes( const std::vector<ViewLegendEntry> & rEntries, const Reference< lang::XMultiServiceFactory > & xShapeFactory, const Reference< drawing::XShapes > & xTarget, - ::std::vector< Reference< drawing::XShape > > & rOutTextShapes, + std::vector< Reference< drawing::XShape > > & rOutTextShapes, const tPropertyValues & rTextProperties ) { awt::Size aResult; @@ -178,8 +178,8 @@ awt::Size lcl_createTextShapes( // adapt max-extent awt::Size aCurrSize( xEntry->getSize()); - aResult.Width = ::std::max( aResult.Width, aCurrSize.Width ); - aResult.Height = ::std::max( aResult.Height, aCurrSize.Height ); + aResult.Width = std::max( aResult.Width, aCurrSize.Width ); + aResult.Height = std::max( aResult.Height, aCurrSize.Height ); rOutTextShapes.push_back( xEntry ); } @@ -193,7 +193,7 @@ awt::Size lcl_createTextShapes( } void lcl_collectColumnWidths( std::vector< sal_Int32 >& rColumnWidths, const sal_Int32 nNumberOfRows, const sal_Int32 nNumberOfColumns, - const ::std::vector< Reference< drawing::XShape > >& rTextShapes, sal_Int32 nSymbolPlusDistanceWidth ) + const std::vector< Reference< drawing::XShape > >& rTextShapes, sal_Int32 nSymbolPlusDistanceWidth ) { rColumnWidths.clear(); sal_Int32 nNumberOfEntries = rTextShapes.size(); @@ -209,14 +209,14 @@ void lcl_collectColumnWidths( std::vector< sal_Int32 >& rColumnWidths, const sal if( nRow==0 ) rColumnWidths.push_back( nWidth ); else - rColumnWidths[nColumn] = ::std::max( nWidth, rColumnWidths[nColumn] ); + rColumnWidths[nColumn] = std::max( nWidth, rColumnWidths[nColumn] ); } } } } void lcl_collectRowHeighs( std::vector< sal_Int32 >& rRowHeights, const sal_Int32 nNumberOfRows, const sal_Int32 nNumberOfColumns, - const ::std::vector< Reference< drawing::XShape > >& rTextShapes ) + const std::vector< Reference< drawing::XShape > >& rTextShapes ) { // calculate maximum height for each row // and collect column widths @@ -231,7 +231,7 @@ void lcl_collectRowHeighs( std::vector< sal_Int32 >& rRowHeights, const sal_Int3 if( nEntry < nNumberOfEntries ) { awt::Size aTextSize( rTextShapes[ nEntry ]->getSize() ); - nCurrentRowHeight = ::std::max( nCurrentRowHeight, aTextSize.Height ); + nCurrentRowHeight = std::max( nCurrentRowHeight, aTextSize.Height ); } } rRowHeights.push_back( nCurrentRowHeight ); @@ -292,7 +292,7 @@ awt::Size lcl_placeLegendEntries( *pFrameWidthAny <<= nMaxTextWidth; } - ::std::vector< Reference< drawing::XShape > > aTextShapes; + std::vector< Reference< drawing::XShape > > aTextShapes; awt::Size aMaxEntryExtent = lcl_createTextShapes( rEntries, xShapeFactory, xTarget, aTextShapes, rTextProperties ); OSL_ASSERT( aTextShapes.size() == rEntries.size()); @@ -547,7 +547,7 @@ awt::Size lcl_placeLegendEntries( nCurrentYPos += aRowHeights[ nRow ]; if( nRow+1 < nNumberOfRows ) nCurrentYPos += nYOffset; - nMaxYPos = ::std::max( nMaxYPos, nCurrentYPos ); + nMaxYPos = std::max( nMaxYPos, nCurrentYPos ); } if( bSymbolsLeftSide ) { |