diff options
Diffstat (limited to 'chart2/source/model')
42 files changed, 127 insertions, 127 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 8ea6da924081..1aaef1f5b1c2 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -78,7 +78,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage( { Reference< lang::XSingleServiceFactory > xStorageFact( embed::StorageFactory::create( xContext ) ); - ::std::vector< beans::PropertyValue > aPropertiesForStorage; + std::vector< beans::PropertyValue > aPropertiesForStorage; for( sal_Int32 i=rMediaDescriptor.getLength(); i--; ) { @@ -142,7 +142,7 @@ uno::Reference< embed::XStorage > lcl_getReadStorage( { // get XStream from MediaDescriptor uno::Reference< io::XInputStream > xStream; - ::std::vector< beans::PropertyValue > aPropertiesForStorage; + std::vector< beans::PropertyValue > aPropertiesForStorage; for( sal_Int32 i=rMediaDescriptor.getLength(); i--; ) { if( rMediaDescriptor[i].Name == "InputStream" ) diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index 73d7bf87a7a7..7b6edaf87c18 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -121,10 +121,10 @@ protected: private: sal_Int32 m_nDimensionCount; - typedef ::std::vector< ::std::vector< css::uno::Reference< css::chart2::XAxis > > > tAxisVecVecType; + typedef std::vector< std::vector< css::uno::Reference< css::chart2::XAxis > > > tAxisVecVecType; tAxisVecVecType m_aAllAxis; //outer sequence is the dimension; inner sequence is the axis index that indicates main or secondary axis css::uno::Sequence< css::uno::Any > m_aOrigin; - ::std::vector< css::uno::Reference< css::chart2::XChartType > > m_aChartTypes; + std::vector< css::uno::Reference< css::chart2::XChartType > > m_aChartTypes; }; } // namespace chart diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 3c477e0afefe..e74da8a2baab 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -152,15 +152,15 @@ protected: void fireModifyEvent(); private: - typedef ::std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer; + typedef std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer; tDataSequenceContainer m_aDataSequences; - typedef ::std::map< sal_Int32, + typedef std::map< sal_Int32, css::uno::Reference< css::beans::XPropertySet > > tDataPointAttributeContainer; tDataPointAttributeContainer m_aAttributedDataPoints; typedef - ::std::vector< css::uno::Reference< css::chart2::XRegressionCurve > > + std::vector< css::uno::Reference< css::chart2::XRegressionCurve > > tRegressionCurveContainerType; tRegressionCurveContainerType m_aRegressionCurves; diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 88023bb1f0d6..da39d9ad8d4a 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -156,7 +156,7 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; typedef - ::std::vector< css::uno::Reference< css::chart2::XCoordinateSystem > > + std::vector< css::uno::Reference< css::chart2::XCoordinateSystem > > tCoordinateSystemContainerType; tCoordinateSystemContainerType m_aCoordSystems; 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 ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index abe4f805d69d..188a7925928c 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -43,7 +43,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Dimension", @@ -78,10 +78,10 @@ struct StaticAreaChartTypeTemplateInfoHelper_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -185,10 +185,10 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle( void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) { ChartTypeTemplate::resetStyles( xDiagram ); - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); uno::Any aLineStyleAny( drawing::LineStyle_NONE ); - for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin()); + for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin()); aIt != aSeriesVec.end(); ++aIt ) { Reference< beans::XPropertyState > xState( *aIt, uno::UNO_QUERY ); diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index a2943f81a633..85eb2d5c7724 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -45,7 +45,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Dimension", @@ -92,10 +92,10 @@ struct StaticBarChartTypeTemplateInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -271,10 +271,10 @@ void SAL_CALL BarChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) { ChartTypeTemplate::resetStyles( xDiagram ); - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); uno::Any aLineStyleAny( drawing::LineStyle_NONE ); - for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin()); + for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin()); aIt != aSeriesVec.end(); ++aIt ) { Reference< beans::XPropertyState > xState( *aIt, uno::UNO_QUERY ); diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 4af09ba28611..2da52840c01b 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -62,9 +62,9 @@ struct StaticBubbleChartTypeInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > 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/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 39a33f1a8908..1ee18079f5fb 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -64,9 +64,9 @@ struct StaticBubbleChartTypeTemplateInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > 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/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 4e0d14f3b540..32cae2fa556c 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -45,7 +45,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Japanese", @@ -114,10 +114,10 @@ struct StaticCandleStickChartTypeInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -223,7 +223,7 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst; getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow; - ::std::vector< OUString > aMandRoles; + std::vector< OUString > aMandRoles; aMandRoles.push_back( "label"); if( bShowFirst ) @@ -247,7 +247,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst; getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow; - ::std::vector< OUString > aOptRoles; + std::vector< OUString > aOptRoles; if( ! bShowFirst ) aOptRoles.push_back( "values-first"); diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index e17a5344542d..a6b182c2497d 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -127,7 +127,7 @@ OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() void ChartType::impl_addDataSeriesWithoutNotification( const Reference< chart2::XDataSeries >& xDataSeries ) { - if( ::std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries ) + if( std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries ) != m_aDataSeries.end()) throw lang::IllegalArgumentException(); @@ -152,7 +152,7 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries SolarMutexGuard g; tDataSeriesContainerType::iterator aIt( - ::std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries ) ); + std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries ) ); if( aIt == m_aDataSeries.end()) throw container::NoSuchElementException( diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index f239f7f38824..6d5a686e32fe 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -130,7 +130,7 @@ private: const m_xContext; typedef - ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > tDataSeriesContainerType; + std::vector< css::uno::Reference< css::chart2::XDataSeries > > tDataSeriesContainerType; // --- mutable members: the following members need mutex guard --- diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 08eba875e4b0..a746bf29fdd3 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -129,7 +129,7 @@ enum TemplateId TEMPLATE_NOT_FOUND = 0xffff }; -typedef ::std::map< OUString, TemplateId > tTemplateMapType; +typedef std::map< OUString, TemplateId > tTemplateMapType; const tTemplateMapType & lcl_DefaultChartTypeMap() { @@ -563,12 +563,12 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithA uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() { - ::std::vector< OUString > aServices; + std::vector< OUString > aServices; const tTemplateMapType & rMap = lcl_DefaultChartTypeMap(); aServices.reserve( rMap.size()); // get own default templates - ::std::transform( rMap.begin(), rMap.end(), ::std::back_inserter( aServices ), + std::transform( rMap.begin(), rMap.end(), std::back_inserter( aServices ), ::o3tl::select1st< tTemplateMapType::value_type >() ); // add components that were registered in the context's factory diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index d62068c9afac..76fc37d00564 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -293,7 +293,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( Sequence< Reference< XChartType > > aChartTypes( DiagramHelper::getChartTypesFromDiagram( xDiagram )); - sal_Int32 nMax = ::std::min( aChartTypes.getLength(), aSeriesSeq.getLength()); + sal_Int32 nMax = std::min( aChartTypes.getLength(), aSeriesSeq.getLength()); for( i=0; i<nMax; ++i ) { Reference< XDataSeriesContainer > xDSCnt( aChartTypes[i], uno::UNO_QUERY_THROW ); @@ -842,7 +842,7 @@ void ChartTypeTemplate::createChartTypes( Sequence< Reference< XDataSeries > > aNewSeriesSeq( xDSCnt->getDataSeries()); sal_Int32 nNewStartIndex = aNewSeriesSeq.getLength(); aNewSeriesSeq.realloc( nNewStartIndex + aSeriesSeq[nSeriesIdx].getLength() ); - ::std::copy( aSeriesSeq[nSeriesIdx].begin(), + std::copy( aSeriesSeq[nSeriesIdx].begin(), aSeriesSeq[nSeriesIdx].end(), aNewSeriesSeq.getArray() + nNewStartIndex ); xDSCnt->setDataSeries( aNewSeriesSeq ); diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 84c6054badbd..b04fd86b299f 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -38,7 +38,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "OverlapSequence", @@ -91,10 +91,10 @@ struct StaticColumnChartTypeInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_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/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 4ca7024bd139..33bac477aaf7 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -48,7 +48,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "NumberOfLines", @@ -83,10 +83,10 @@ struct StaticColumnLineChartTypeTemplateInfoHelper_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -204,7 +204,7 @@ void ColumnLineChartTypeTemplate::createChartTypes( { Reference< XDataSeriesContainer > xDSCnt( xCT, uno::UNO_QUERY_THROW ); Sequence< Reference< XDataSeries > > aColumnSeq( nNumberOfColumns ); - ::std::copy( aFlatSeriesSeq.begin(), + std::copy( aFlatSeriesSeq.begin(), aFlatSeriesSeq.begin() + nNumberOfColumns, aColumnSeq.getArray()); xDSCnt->setDataSeries( aColumnSeq ); @@ -220,7 +220,7 @@ void ColumnLineChartTypeTemplate::createChartTypes( { Reference< XDataSeriesContainer > xDSCnt( xCT, uno::UNO_QUERY_THROW ); Sequence< Reference< XDataSeries > > aLineSeq( nNumberOfLines ); - ::std::copy( aFlatSeriesSeq.begin() + nNumberOfColumns, + std::copy( aFlatSeriesSeq.begin() + nNumberOfColumns, aFlatSeriesSeq.end(), aLineSeq.getArray()); xDSCnt->setDataSeries( aLineSeq ); diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 735ca0ba976d..f3000954d5ca 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -66,13 +66,13 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource( // if we have more than one series put the last nNumOfLines ones into a new group if( nNumberOfSeries > 1 && m_nNumberOfLines > 0 ) { - sal_Int32 nNumOfLines = ::std::min( m_nNumberOfLines, nNumberOfSeries - 1 ); + sal_Int32 nNumOfLines = std::min( m_nNumberOfLines, nNumberOfSeries - 1 ); aResult.Series.realloc(2); Sequence< Reference< XDataSeries > > & rColumnDataSeries = aResult.Series[0]; Sequence< Reference< XDataSeries > > & rLineDataSeries = aResult.Series[1]; rLineDataSeries.realloc( nNumOfLines ); - ::std::copy( rColumnDataSeries.begin() + nNumberOfSeries - nNumOfLines, + std::copy( rColumnDataSeries.begin() + nNumberOfSeries - nNumOfLines, rColumnDataSeries.begin() + nNumberOfSeries, rLineDataSeries.getArray() ); rColumnDataSeries.realloc( nNumberOfSeries - nNumOfLines ); diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index c1af371763c5..58b3fb2686e3 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -43,7 +43,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( CHART_UNONAME_CURVE_STYLE, @@ -101,10 +101,10 @@ struct StaticLineChartTypeInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_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/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 759a5aa7fe86..a06f74466003 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -50,7 +50,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( CHART_UNONAME_CURVE_STYLE, @@ -107,10 +107,10 @@ struct StaticLineChartTypeTemplateInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -208,10 +208,10 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( bool bSymbolFound = false; bool bLineFound = false; - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); - for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = + for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt ) { try diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index a12dccf3a574..77eda20191a6 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -101,10 +101,10 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( bool bSymbolFound = false; bool bLineFound = false; - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); - for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = + for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt ) { try diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index c758d67353ad..2645b2f0f285 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -44,7 +44,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "UseRings", @@ -90,10 +90,10 @@ struct StaticPieChartTypeInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_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/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 15a27541bedb..1c61f0004347 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -55,7 +55,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "OffsetMode", @@ -116,10 +116,10 @@ struct StaticPieChartTypeTemplateInfoHelper_Initializer private: static uno::Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -320,7 +320,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( double fOffset=0.0; bool bAllOffsetsEqual = true; - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); //check offset of outer series @@ -572,10 +572,10 @@ void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagr // vary colors by point, // line style - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); uno::Any aLineStyleAny( drawing::LineStyle_NONE ); - for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin()); + for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin()); aIt != aSeriesVec.end(); ++aIt ) { Reference< beans::XPropertyState > xState( *aIt, uno::UNO_QUERY ); diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index be1f3ec99472..af78b959f7b4 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -48,7 +48,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( CHART_UNONAME_CURVE_STYLE, @@ -106,10 +106,10 @@ struct StaticScatterChartTypeInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_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/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index ea5c553637f5..e510280b215f 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -52,7 +52,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( CHART_UNONAME_CURVE_STYLE, @@ -109,10 +109,10 @@ struct StaticScatterChartTypeTemplateInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -240,10 +240,10 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( bool bSymbolFound = false; bool bLineFound = false; - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); - for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = + for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt ) { try diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index d453fec3cf51..bc29b89ac2b3 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -57,7 +57,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Volume", @@ -118,10 +118,10 @@ struct StaticStockChartTypeTemplateInfoHelper_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -266,9 +266,9 @@ void SAL_CALL StockChartTypeTemplate::resetStyles( ChartTypeTemplate::resetStyles( xDiagram ); if( getDimension() == 3 ) { - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); - for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin()); + for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin()); aIt != aSeriesVec.end(); ++aIt ) { Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY ); |