From 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 15 Feb 2017 23:55:18 +0200 Subject: Drop :: prefix from std in c*/ Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155 Reviewed-on: https://gerrit.libreoffice.org/34324 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- chart2/source/model/main/Axis.cxx | 6 +++--- chart2/source/model/main/BaseCoordinateSystem.cxx | 12 ++++++------ chart2/source/model/main/ChartModel.cxx | 2 +- chart2/source/model/main/ChartModel_Persistence.cxx | 4 ++-- chart2/source/model/main/DataPoint.cxx | 4 ++-- chart2/source/model/main/DataPointProperties.cxx | 2 +- chart2/source/model/main/DataPointProperties.hxx | 2 +- chart2/source/model/main/DataSeries.cxx | 14 +++++++------- chart2/source/model/main/DataSeriesProperties.cxx | 2 +- chart2/source/model/main/DataSeriesProperties.hxx | 2 +- chart2/source/model/main/Diagram.cxx | 16 ++++++++-------- chart2/source/model/main/FormattedString.cxx | 4 ++-- chart2/source/model/main/GridProperties.cxx | 6 +++--- chart2/source/model/main/Legend.cxx | 6 +++--- chart2/source/model/main/PageBackground.cxx | 4 ++-- chart2/source/model/main/StockBar.cxx | 4 ++-- chart2/source/model/main/Title.cxx | 6 +++--- chart2/source/model/main/Wall.cxx | 4 ++-- 18 files changed, 50 insertions(+), 50 deletions(-) (limited to 'chart2/source/model/main') diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 140998b0057a..35b5c6df84f1 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -85,7 +85,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Show", @@ -273,13 +273,13 @@ struct StaticAxisInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 0204c59dab15..fcff9a60aad1 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -46,7 +46,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "SwapXAndYAxis", @@ -81,11 +81,11 @@ struct StaticCooSysInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -253,7 +253,7 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int // ____ XChartTypeContainer ____ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChartType >& aChartType ) { - if( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ) + if( std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ) != m_aChartTypes.end()) throw lang::IllegalArgumentException(); @@ -264,8 +264,8 @@ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChar void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XChartType >& aChartType ) { - ::std::vector< uno::Reference< chart2::XChartType > >::iterator - aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )); + std::vector< uno::Reference< chart2::XChartType > >::iterator + aIt( std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )); if( aIt == m_aChartTypes.end()) throw container::NoSuchElementException( "The given chart type is no element of the container", diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index d502324dec2a..a3c26532907a 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1149,7 +1149,7 @@ enum eServiceType SERVICE_NAMESPACE_MAP }; -typedef ::std::map< OUString, enum eServiceType > tServiceNameMap; +typedef std::map< OUString, enum eServiceType > tServiceNameMap; tServiceNameMap & lcl_getStaticServiceNameMap() { diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index a88a1da027e9..c19aeaf7c4d6 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -63,7 +63,7 @@ using ::osl::MutexGuard; namespace { -struct lcl_PropNameEquals : public ::std::unary_function< beans::PropertyValue, bool > +struct lcl_PropNameEquals : public std::unary_function< beans::PropertyValue, bool > { explicit lcl_PropNameEquals( const OUString & rStrToCompareWith ) : m_aStr( rStrToCompareWith ) @@ -86,7 +86,7 @@ T lcl_getProperty( { const beans::PropertyValue * pIt = rMediaDescriptor.getConstArray(); const beans::PropertyValue * pEndIt = pIt + + rMediaDescriptor.getLength(); - pIt = ::std::find_if( pIt, pEndIt, lcl_PropNameEquals( rPropName )); + pIt = std::find_if( pIt, pEndIt, lcl_PropNameEquals( rPropName )); if( pIt != pEndIt ) (*pIt).Value >>= aResult; } diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index ec5b6bc28d29..ec3e3cfe292d 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -51,12 +51,12 @@ struct StaticDataPointInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; ::chart::DataPointProperties::AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 2dd85a0e78b1..6d34a139fba1 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -44,7 +44,7 @@ namespace chart { void DataPointProperties::AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { // DataPointProperties diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx index 39362498a52a..ad1169cdd6bc 100644 --- a/chart2/source/model/main/DataPointProperties.hxx +++ b/chart2/source/model/main/DataPointProperties.hxx @@ -86,7 +86,7 @@ namespace DataPointProperties }; void AddPropertiesToVector( - ::std::vector< css::beans::Property > & rOutProperties ); + std::vector< css::beans::Property > & rOutProperties ); void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); } diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 956a750d49d6..6eebded278cb 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -64,12 +64,12 @@ struct StaticDataSeriesInfoHelper : public rtl::StaticWithInit< ::cppu::OPropert { uno::Sequence< Property > operator()() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; ::chart::DataSeriesProperties::AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -93,7 +93,7 @@ void lcl_SetParent( xChild->setParent( xParentInterface ); } -typedef ::std::map< sal_Int32, css::uno::Reference< css::beans::XPropertySet > > +typedef std::map< sal_Int32, css::uno::Reference< css::beans::XPropertySet > > lcl_tDataPointMap; void lcl_CloneAttributedDataPoints( @@ -307,7 +307,7 @@ Reference< beans::XPropertySet > aSequences = comphelper::containerToSequence( m_aDataSequences ); } - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aValuesSeries( + std::vector< Reference< chart2::data::XLabeledDataSequence > > aValuesSeries( DataSeriesHelper::getAllDataSequencesByRole( aSequences , "values", true ) ); if (aValuesSeries.empty()) @@ -420,7 +420,7 @@ void SAL_CALL DataSeries::addRegressionCurve( { MutexGuard aGuard( GetMutex() ); xModifyEventForwarder = m_xModifyEventForwarder; - if( ::std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) + if( std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) != m_aRegressionCurves.end()) throw lang::IllegalArgumentException(); m_aRegressionCurves.push_back( xRegressionCurve ); @@ -440,7 +440,7 @@ void SAL_CALL DataSeries::removeRegressionCurve( MutexGuard aGuard( GetMutex() ); xModifyEventForwarder = m_xModifyEventForwarder; tRegressionCurveContainerType::iterator aIt( - ::std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) ); + std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) ); if( aIt == m_aRegressionCurves.end()) throw container::NoSuchElementException( "The given regression curve is no element of this series", @@ -513,7 +513,7 @@ void SAL_CALL DataSeries::disposing( const lang::EventObject& rEventObject ) { // forget disposed data sequences tDataSequenceContainer::iterator aIt( - ::std::find( m_aDataSequences.begin(), m_aDataSequences.end(), rEventObject.Source )); + std::find( m_aDataSequences.begin(), m_aDataSequences.end(), rEventObject.Source )); if( aIt != m_aDataSequences.end()) m_aDataSequences.erase( aIt ); } diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index 1912e99d2e61..91f24eb4cad6 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -35,7 +35,7 @@ namespace chart { void DataSeriesProperties::AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "AttributedDataPoints", diff --git a/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx index a189b662a6cf..5742c99b8e95 100644 --- a/chart2/source/model/main/DataSeriesProperties.hxx +++ b/chart2/source/model/main/DataSeriesProperties.hxx @@ -39,7 +39,7 @@ namespace DataSeriesProperties }; void AddPropertiesToVector( - ::std::vector< css::beans::Property > & rOutProperties ); + std::vector< css::beans::Property > & rOutProperties ); void AddDefaultsToMap( tPropertyValueMap & rOutMap ); } diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 12aea1fe3496..06ce4ac9cab6 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -81,7 +81,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "RelativePosition", @@ -241,12 +241,12 @@ struct StaticDiagramInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::SceneProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -273,8 +273,8 @@ struct StaticDiagramInfo : public rtl::StaticAggregate< uno::Reference< beans::X /// clones a UNO-sequence of UNO-References typedef Reference< chart2::XCoordinateSystem > lcl_tCooSysRef; -typedef ::std::map< lcl_tCooSysRef, lcl_tCooSysRef > lcl_tCooSysMapping; -typedef ::std::vector< lcl_tCooSysRef > lcl_tCooSysVector; +typedef std::map< lcl_tCooSysRef, lcl_tCooSysRef > lcl_tCooSysMapping; +typedef std::vector< lcl_tCooSysRef > lcl_tCooSysVector; lcl_tCooSysMapping lcl_CloneCoordinateSystems( const lcl_tCooSysVector & rSource, @@ -507,7 +507,7 @@ void SAL_CALL Diagram::addCoordinateSystem( { { MutexGuard aGuard( GetMutex() ); - if( ::std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys ) + if( std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys ) != m_aCoordSystems.end()) throw lang::IllegalArgumentException(); @@ -527,8 +527,8 @@ void SAL_CALL Diagram::removeCoordinateSystem( { { MutexGuard aGuard( GetMutex() ); - ::std::vector< uno::Reference< chart2::XCoordinateSystem > >::iterator - aIt( ::std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys )); + std::vector< uno::Reference< chart2::XCoordinateSystem > >::iterator + aIt( std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys )); if( aIt == m_aCoordSystems.end()) throw container::NoSuchElementException( "The given coordinate-system is no element of the container", diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index bc0224d88b2e..846223462a01 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -59,10 +59,10 @@ struct StaticFormattedStringInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 4014cbd1dda6..6d17c39c601c 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -43,7 +43,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Show", @@ -89,12 +89,12 @@ struct StaticGridInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index a3a80d642875..e7b80dd4fd9d 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -58,7 +58,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "AnchorPosition", @@ -144,14 +144,14 @@ struct StaticLegendInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 52308600f912..9587664faa3f 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -74,12 +74,12 @@ struct StaticPageBackgroundInfoHelper_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index a66243b847cd..200934b67d34 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -50,12 +50,12 @@ struct StaticStockBarInfoHelper_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 042b8ad18ec5..92fc6a36fa80 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -66,7 +66,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "ParaAdjust", @@ -204,12 +204,12 @@ struct StaticTitleInfoHelper_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index dae09c4ac598..78fd38ae5d4b 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -78,12 +78,12 @@ struct StaticWallInfoHelper_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); ::chart::FillProperties::AddPropertiesToVector( aProperties ); ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); -- cgit v1.2.3