diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-15 23:55:18 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-15 23:01:23 +0000 |
| commit | 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 (patch) | |
| tree | 3f669db44367a2a072b899a1a1b87eb25ee607af /chart2 | |
| parent | 3e1e49561bb734475d2b7d1db1beef0d3e9b53cd (diff) | |
Drop :: prefix from std in c*/
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155
Reviewed-on: https://gerrit.libreoffice.org/34324
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'chart2')
199 files changed, 891 insertions, 891 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 5225b80ea600..6af2660954fe 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -144,7 +144,7 @@ private: css::uno::Reference< css::frame::XModel > m_xParent; css::uno::Reference< css::chart2::data::XRangeHighlighter > m_xRangeHighlighter; css::uno::Reference<css::chart2::data::XPopupRequest> m_xPopupRequest; - ::std::vector< GraphicObject > m_aGraphicObjectVector; + std::vector< GraphicObject > m_aGraphicObjectVector; css::uno::Reference< css::chart2::data::XDataProvider > m_xDataProvider; /** is only valid if m_xDataProvider is set. If m_xDataProvider is set to an diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index a7b545f49af0..b82a3086f45f 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -74,7 +74,7 @@ struct TimeBasedInfo Timer maTimer; // only valid when we are in the time based mode - ::std::vector< std::vector< VDataSeries* > > m_aDataSeriesList; + std::vector< std::vector< VDataSeries* > > m_aDataSeriesList; }; /** diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 4dd512a9d41f..d887fa67b734 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -229,23 +229,23 @@ bool AccessibleBase::ImplUpdateChildren() { ObjectHierarchy::tChildContainer aModelChildren( m_aAccInfo.m_spObjectHierarchy->getChildren( GetId() )); - ::std::vector< ChildOIDMap::key_type > aAccChildren; + std::vector< ChildOIDMap::key_type > aAccChildren; aAccChildren.reserve( aModelChildren.size()); - ::std::transform( m_aChildOIDMap.begin(), m_aChildOIDMap.end(), - ::std::back_inserter( aAccChildren ), + std::transform( m_aChildOIDMap.begin(), m_aChildOIDMap.end(), + std::back_inserter( aAccChildren ), ::o3tl::select1st< ChildOIDMap::value_type >() ); - ::std::sort( aModelChildren.begin(), aModelChildren.end()); + std::sort( aModelChildren.begin(), aModelChildren.end()); - ::std::vector< ObjectIdentifier > aChildrenToRemove, aChildrenToAdd; - ::std::set_difference( aModelChildren.begin(), aModelChildren.end(), + std::vector< ObjectIdentifier > aChildrenToRemove, aChildrenToAdd; + std::set_difference( aModelChildren.begin(), aModelChildren.end(), aAccChildren.begin(), aAccChildren.end(), - ::std::back_inserter( aChildrenToAdd )); - ::std::set_difference( aAccChildren.begin(), aAccChildren.end(), + std::back_inserter( aChildrenToAdd )); + std::set_difference( aAccChildren.begin(), aAccChildren.end(), aModelChildren.begin(), aModelChildren.end(), - ::std::back_inserter( aChildrenToRemove )); + std::back_inserter( aChildrenToRemove )); - ::std::vector< ObjectIdentifier >::const_iterator aIt( aChildrenToRemove.begin()); + std::vector< ObjectIdentifier >::const_iterator aIt( aChildrenToRemove.begin()); for( ; aIt != aChildrenToRemove.end(); ++aIt ) { RemoveChildByOId( *aIt ); @@ -313,7 +313,7 @@ void AccessibleBase::RemoveChildByOId( const ObjectIdentifier& rOId ) // search child in vector ChildListVectorType::iterator aVecIter = - ::std::find( m_aChildList.begin(), m_aChildList.end(), xChild ); + std::find( m_aChildList.begin(), m_aChildList.end(), xChild ); OSL_ENSURE( aVecIter != m_aChildList.end(), "Inconsistent ChildMap" ); diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index d18d405eadf0..7f93dc83ccd9 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -50,12 +50,12 @@ struct StaticAreaWrapperPropertyArray_Initializer private: static 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 ); @@ -148,7 +148,7 @@ const Sequence< beans::Property >& AreaWrapper::getPropertySequence() const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; aWrappedProperties.push_back( new WrappedDirectStateProperty("LineStyle","LineStyle") ); diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index c5a993e4e470..3dcbd4210a9f 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -102,7 +102,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { //Properties for scaling: rOutProperties.push_back( @@ -374,14 +374,14 @@ struct StaticAxisWrapperPropertyArray_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 ); ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -641,7 +641,7 @@ const Sequence< beans::Property >& AxisWrapper::getPropertySequence() const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; aWrappedProperties.push_back( new WrappedTextRotationProperty() ); aWrappedProperties.push_back( new WrappedProperty("Marks","MajorTickmarks") ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 2a912ff51b77..abc07cf85942 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -104,7 +104,7 @@ enum eServiceType SERVICE_NAME_IMPORT_GRAPHIC_RESOLVER }; -typedef ::std::map< OUString, enum eServiceType > tServiceNameMap; +typedef std::map< OUString, enum eServiceType > tServiceNameMap; tServiceNameMap & lcl_getStaticServiceNameMap() { @@ -152,7 +152,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "HasMainTitle", @@ -246,10 +246,10 @@ struct StaticChartDocumentWrapperPropertyArray_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 ); @@ -991,7 +991,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const // iterate 'flat' over all top-level objects // and determine all that are no chart objects - ::std::vector< uno::Reference< drawing::XShape > > aShapeVector; + std::vector< uno::Reference< drawing::XShape > > aShapeVector; sal_Int32 nSubCount = xDrawPageShapes->getCount(); uno::Reference< drawing::XShape > xShape; for( sal_Int32 nS = 0; nS < nSubCount; nS++ ) @@ -1012,7 +1012,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const OSL_ENSURE( xFoundShapes.is(), "Couldn't create a shape collection!" ); if( xFoundShapes.is()) { - ::std::vector< uno::Reference< drawing::XShape > >::iterator aIter; + std::vector< uno::Reference< drawing::XShape > >::iterator aIter; for( aIter = aShapeVector.begin(); aIter != aShapeVector.end(); ++aIter ) xFoundShapes->add( *aIter ); } @@ -1433,7 +1433,7 @@ const Sequence< beans::Property >& ChartDocumentWrapper::getPropertySequence() const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; aWrappedProperties.push_back( new WrappedDataSourceLabelsInFirstRowProperty( m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedDataSourceLabelsInFirstColumnProperty( m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedHasLegendProperty( m_spChart2ModelContact ) ); diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index a3769336501a..4eac71ec5864 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -89,7 +89,7 @@ enum }; void lcl_AddPropertiesToVector_PointProperties( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { //service chart::Chart3DBarProperties rOutProperties.push_back( @@ -186,7 +186,7 @@ void lcl_AddPropertiesToVector_PointProperties( } void lcl_AddPropertiesToVector_SeriesOnly( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Axis", @@ -205,7 +205,7 @@ void lcl_AddPropertiesToVector_SeriesOnly( uno::Sequence< Property > lcl_GetPropertySequence( DataSeriesPointWrapper::eType _eType ) { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; lcl_AddPropertiesToVector_PointProperties( aProperties ); if( _eType == DataSeriesPointWrapper::DATA_SERIES ) @@ -222,7 +222,7 @@ uno::Sequence< Property > lcl_GetPropertySequence( DataSeriesPointWrapper::eType ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties ); ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); } @@ -551,7 +551,7 @@ Reference< chart2::XDataSeries > DataSeriesPointWrapper::getDataSeries() if( !xSeries.is() ) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); - ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( + std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( ::chart::DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); if( m_nSeriesIndexInNewAPI >= 0 && m_nSeriesIndexInNewAPI < static_cast<sal_Int32>(aSeriesList.size()) ) @@ -719,7 +719,7 @@ const Sequence< beans::Property >& DataSeriesPointWrapper::getPropertySequence() const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index d6a9885df789..e18882add0da 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -143,7 +143,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "AttributedDataPoints", @@ -458,7 +458,7 @@ struct StaticDiagramWrapperPropertyArray_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 ); @@ -472,7 +472,7 @@ private: WrappedAutomaticPositionProperties::addProperties( aProperties ); WrappedGL3DProperties::addProperties(aProperties); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -508,7 +508,7 @@ sal_Int32 lcl_getNewAPIIndexForOldAPIIndex( nNewAPIIndex -= 1; } - ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( + std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( ::chart::DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); if( nNewAPIIndex >= static_cast<sal_Int32>(aSeriesList.size()) ) nNewAPIIndex = -1; @@ -1503,7 +1503,7 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con uno::Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); if( xDiagram.is() && xChartDoc.is() ) { - ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector( + std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); if( aSeriesVector.size() > 0 ) { @@ -1649,9 +1649,9 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal if( xDiagram.is() && xDiaProp.is()) { - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( + std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ::chart::DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); - ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = + std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin(); sal_Int32 i = 0; for( ; aIt != aSeriesVector.end(); ++aIt, ++i ) @@ -1681,12 +1681,12 @@ Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< bean if( xDiagram.is() && xDiaProp.is()) { - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( + std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ::chart::DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); uno::Sequence< uno::Sequence< sal_Int32 > > aResult( aSeriesVector.size() ); - ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = + std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin(); sal_Int32 i = 0; for( ; aIt != aSeriesVector.end(); ++aIt, ++i ) @@ -1896,7 +1896,7 @@ const Sequence< beans::Property >& DiagramWrapper::getPropertySequence() const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; WrappedAxisAndGridExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedAxisTitleExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index e95a0c8f3147..10694a8533cb 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -53,11 +53,11 @@ struct StaticGridWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > 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 ); @@ -159,7 +159,7 @@ const Sequence< beans::Property >& GridWrapper::getPropertySequence() const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; aWrappedProperties.push_back( new WrappedDefaultProperty( "LineColor", "LineColor", uno::Any( sal_Int32( 0x000000) ) ) ); // black diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 4d699c453584..36878f863fc3 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -209,7 +209,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Alignment", @@ -237,7 +237,7 @@ struct StaticLegendWrapperPropertyArray_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 ); @@ -246,7 +246,7 @@ private: ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties ); ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -387,7 +387,7 @@ const Sequence< beans::Property >& LegendWrapper::getPropertySequence() const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; aWrappedProperties.push_back( new WrappedLegendAlignmentProperty() ); aWrappedProperties.push_back( new WrappedProperty( "Expansion", "Expansion")); diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 4b9a84d24ce2..0e54a0096a65 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -67,12 +67,12 @@ struct StaticMinMaxLineWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > 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/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index e56f203765a1..5c03301bb21c 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -121,7 +121,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "String", @@ -155,7 +155,7 @@ struct StaticTitleWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< beans::Property > aProperties; + std::vector< beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); @@ -164,7 +164,7 @@ private: ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties ); ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); @@ -467,7 +467,7 @@ const Sequence< beans::Property >& TitleWrapper::getPropertySequence() const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; aWrappedProperties.push_back( new WrappedTitleStringProperty( m_spChart2ModelContact->m_xContext ) ); aWrappedProperties.push_back( new WrappedTextRotationProperty( true ) ); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 19bd0ba2ac1b..256eb8c29461 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -53,13 +53,13 @@ struct StaticUpDownBarWrapperPropertyArray_Initializer private: static 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/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index f179264767fe..ba9aa9978ec7 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -55,12 +55,12 @@ struct StaticWallFloorWrapperPropertyArray_Initializer private: static Sequence< Property > lcl_GetPropertySequence() { - ::std::vector< css::beans::Property > aProperties; + std::vector< css::beans::Property > aProperties; ::chart::FillProperties::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 ); @@ -137,7 +137,7 @@ const Sequence< beans::Property >& WallFloorWrapper::getPropertySequence() const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties() { - ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; + std::vector< ::chart::WrappedProperty* > aWrappedProperties; // use direct state always, so that in XML the value is always // exported. Because in the old chart the defaults is as follows: diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 39bcb5140f41..663d9c8dd2c5 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -105,7 +105,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList ) }//anonymous namespace -void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property > & rOutProperties ) +void WrappedAutomaticPositionProperties::addProperties( std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "AutomaticPosition", diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index 972ea658124e..389cefb683cb 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -31,7 +31,7 @@ namespace wrapper class WrappedAutomaticPositionProperties { public: - static void addProperties( ::std::vector< css::beans::Property >& rOutProperties ); + static void addProperties( std::vector< css::beans::Property >& rOutProperties ); static void addWrappedProperties( std::vector< WrappedProperty* >& rList ); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx index acd7741c0f76..0793658e908d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedDataCaptionProperties { public: - static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); + static void addProperties( std::vector< css::beans::Property > & rOutProperties ); static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 9f7cc28de789..1c3871ede3fd 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -112,7 +112,7 @@ enum }//anonymous namespace -void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOutProperties ) +void WrappedScaleTextProperties::addProperties( std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "ScaleText", diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx index b3e9ee9cd85e..f892fbbf5e83 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx @@ -34,7 +34,7 @@ namespace wrapper class WrappedScaleTextProperties { public: - static void addProperties( ::std::vector< css::beans::Property >& rOutProperties ); + static void addProperties( std::vector< css::beans::Property >& rOutProperties ); static void addWrappedProperties( std::vector< WrappedProperty* >& rList , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index e5ba28c44b45..47b2675cdcaa 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -66,9 +66,9 @@ public: if( m_ePropertyType == DIAGRAM && m_spChart2ModelContact.get() ) { - ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector( + std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector( ::chart::DiagramHelper::getDataSeriesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); - ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter = + std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter = aSeriesVector.begin(); for( ; aIter != aSeriesVector.end(); ++aIter ) { @@ -95,9 +95,9 @@ public: if( m_ePropertyType == DIAGRAM && m_spChart2ModelContact.get() ) { - ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector( + std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector( ::chart::DiagramHelper::getDataSeriesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); - ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter = + std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter = aSeriesVector.begin(); for( ; aIter != aSeriesVector.end(); ++aIter ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 2537b9ade1ce..f7ef66fbd572 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -175,7 +175,7 @@ enum }//anonymous namespace -void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutProperties ) +void WrappedSplineProperties::addProperties( std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( CHART_UNONAME_SPLINE_TYPE, diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx index 01cd3f034327..f47e3da4d70a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedSplineProperties { public: - static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); + static void addProperties( std::vector< css::beans::Property > & rOutProperties ); static void addWrappedProperties( std::vector< WrappedProperty* >& rList , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 012ee391e349..72d2ca86dd45 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -120,7 +120,7 @@ sal_Int32 lcl_getErrorBarStyle( const uno::Reference< beans::XPropertySet >& xEr } uno::Reference< chart2::data::XDataProvider > lcl_getDataProviderFromContact( - const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) + const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) { uno::Reference< chart2::data::XDataProvider > xResult; if( spChart2ModelContact.get()) @@ -135,7 +135,7 @@ uno::Reference< chart2::data::XDataProvider > lcl_getDataProviderFromContact( void lcl_ConvertRangeFromXML( OUString & rInOutRange, - const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) + const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) { if( !rInOutRange.isEmpty()) { @@ -151,7 +151,7 @@ void lcl_ConvertRangeFromXML( void lcl_ConvertRangeToXML( OUString & rInOutRange, - const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) + const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) { if( !rInOutRange.isEmpty()) { @@ -172,7 +172,7 @@ class WrappedStatisticProperty : public WrappedSeriesOrDiagramProperty< PROPERTY { public: explicit WrappedStatisticProperty( const OUString& rName, const Any& rDefaulValue - , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact + , std::shared_ptr< Chart2ModelContact > spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) : WrappedSeriesOrDiagramProperty< PROPERTYTYPE >(rName,rDefaulValue,spChart2ModelContact,ePropertyType) {} @@ -205,7 +205,7 @@ public: virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const override; - explicit WrappedConstantErrorLowProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedConstantErrorLowProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); private: @@ -213,7 +213,7 @@ private: }; WrappedConstantErrorLowProperty::WrappedConstantErrorLowProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< double >( "ConstantErrorLow" , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType ) @@ -255,7 +255,7 @@ public: virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const override; - explicit WrappedConstantErrorHighProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedConstantErrorHighProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); private: @@ -263,7 +263,7 @@ private: }; WrappedConstantErrorHighProperty::WrappedConstantErrorHighProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< double >( "ConstantErrorHigh" , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType ) @@ -305,12 +305,12 @@ public: virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& aNewValue ) const override; - explicit WrappedMeanValueProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedMeanValueProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); }; WrappedMeanValueProperty::WrappedMeanValueProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< bool >( "MeanValue", uno::Any( false ), spChart2ModelContact, ePropertyType ) { @@ -345,12 +345,12 @@ public: virtual css::chart::ChartErrorCategory getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartErrorCategory& aNewValue ) const override; - explicit WrappedErrorCategoryProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedErrorCategoryProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); }; WrappedErrorCategoryProperty::WrappedErrorCategoryProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< css::chart::ChartErrorCategory >( "ErrorCategory" , uno::Any( css::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType ) @@ -439,7 +439,7 @@ public: virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const override; - explicit WrappedPercentageErrorProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedPercentageErrorProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); private: @@ -447,7 +447,7 @@ private: }; WrappedPercentageErrorProperty::WrappedPercentageErrorProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< double >( "PercentageError" , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType ) @@ -489,7 +489,7 @@ public: virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const override; - explicit WrappedErrorMarginProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedErrorMarginProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); private: @@ -497,7 +497,7 @@ private: }; WrappedErrorMarginProperty::WrappedErrorMarginProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< double >( "ErrorMargin" , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType ) @@ -539,12 +539,12 @@ public: virtual css::chart::ChartErrorIndicatorType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartErrorIndicatorType& aNewValue ) const override; - explicit WrappedErrorIndicatorProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedErrorIndicatorProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); }; WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >( "ErrorIndicator" , uno::Any( css::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType ) @@ -608,12 +608,12 @@ public: virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& nNewValue ) const override; - explicit WrappedErrorBarStyleProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact1, + explicit WrappedErrorBarStyleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact1, tSeriesOrDiagramPropertyType ePropertyType ); }; WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< sal_Int32 >( "ErrorBarStyle" , uno::Any( css::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType ) @@ -650,7 +650,7 @@ public: virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const override; - explicit WrappedErrorBarRangePositiveProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedErrorBarRangePositiveProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); private: @@ -658,7 +658,7 @@ private: }; WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< OUString >( "ErrorBarRangePositive" , uno::Any( OUString() ), spChart2ModelContact, ePropertyType ) @@ -713,7 +713,7 @@ public: virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const override; - explicit WrappedErrorBarRangeNegativeProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedErrorBarRangeNegativeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); private: @@ -721,7 +721,7 @@ private: }; WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< OUString >( "ErrorBarRangeNegative" , uno::Any( OUString() ), spChart2ModelContact, ePropertyType ) @@ -776,12 +776,12 @@ public: virtual css::chart::ChartRegressionCurveType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartRegressionCurveType & aNewValue ) const override; - explicit WrappedRegressionCurvesProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + explicit WrappedRegressionCurvesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); }; WrappedRegressionCurvesProperty::WrappedRegressionCurvesProperty( - ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< css::chart::ChartRegressionCurveType >( "RegressionCurves" , lcl_getRegressionDefault(), spChart2ModelContact, ePropertyType ) @@ -835,7 +835,7 @@ public: }; explicit WrappedStatisticPropertySetProperty( - PropertySetType ePropertySetType, ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact, + PropertySetType ePropertySetType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); private: @@ -844,7 +844,7 @@ private: WrappedStatisticPropertySetProperty::WrappedStatisticPropertySetProperty( PropertySetType ePropertySetType - , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact + , std::shared_ptr< Chart2ModelContact > spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< Reference< beans::XPropertySet > >( (ePropertySetType == PROPERTY_SET_TYPE_REGRESSION) @@ -913,7 +913,7 @@ enum series */ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList - , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact + , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) { rList.push_back( new WrappedConstantErrorLowProperty( spChart2ModelContact, ePropertyType ) ); @@ -937,7 +937,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList }//anonymous namespace -void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOutProperties ) +void WrappedStatisticProperties::addProperties( std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "ConstantErrorLow", @@ -1030,13 +1030,13 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut } void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList - , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) + , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) { lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES ); } void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList - , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) + , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ) { lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx index 2baba22cbbbb..6133e41f0c03 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx @@ -33,11 +33,11 @@ namespace wrapper class WrappedStatisticProperties { public: - static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); + static void addProperties( std::vector< css::beans::Property > & rOutProperties ); static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList - , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); + , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList - , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); + , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); }; } //namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 852fd0986d50..831ff67bcccc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -126,7 +126,7 @@ css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() && xChartDoc.is() ) { - ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector( + std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); if( aSeriesVector.size() > 0 ) { @@ -191,7 +191,7 @@ css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() && xChartDoc.is() ) { - ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector( + std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); if( aSeriesVector.size() > 0 ) { @@ -241,7 +241,7 @@ enum }//anonymous namespace -void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProperties ) +void WrappedStockProperties::addProperties( std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "Volume", diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx index faa1ba5211e0..3879eb8245d0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedStockProperties { public: - static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); + static void addProperties( std::vector< css::beans::Property > & rOutProperties ); static void addWrappedProperties( std::vector< WrappedProperty* >& rList , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 830fbb692fd8..31b458abea71 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -162,7 +162,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList }//anonymous namespace -void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutProperties ) +void WrappedSymbolProperties::addProperties( std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "SymbolType", diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx index 44356dd348ad..c32249188ca6 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx @@ -33,7 +33,7 @@ namespace wrapper class WrappedSymbolProperties { public: - static void addProperties( ::std::vector< css::beans::Property > & rOutProperties ); + static void addProperties( std::vector< css::beans::Property > & rOutProperties ); static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index b2ae9b21b90d..0d9b6d983afb 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -403,7 +403,7 @@ namespace with focus is set at pIndex if pOutIndex is not 0. */ bool lcl_SeriesHeaderHasFocus( - const ::std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader, + const std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader, sal_Int32 * pOutIndex = nullptr ) { sal_Int32 nIndex = 0; @@ -420,7 +420,7 @@ bool lcl_SeriesHeaderHasFocus( } sal_Int32 lcl_getColumnInDataOrHeader( - sal_uInt16 nCol, const ::std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader ) + sal_uInt16 nCol, const std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader ) { sal_Int32 nColIdx = 0; bool bHeaderHasFocus( lcl_SeriesHeaderHasFocus( rSeriesHeader, &nColIdx )); @@ -590,8 +590,8 @@ void DataBrowser::RenewTable() } RowInserted( 1, nRowCountLocal ); - GoToRow( ::std::min( nOldRow, GetRowCount() - 1 )); - GoToColumnId( ::std::min( nOldColId, static_cast< sal_uInt16 >( ColCount() - 1 ))); + GoToRow( std::min( nOldRow, GetRowCount() - 1 )); + GoToColumnId( std::min( nOldColId, static_cast< sal_uInt16 >( ColCount() - 1 ))); Dialog* pDialog = GetParentDialog(); vcl::Window* pWin = pDialog->get<VclContainer>("columns"); diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 4c4135535c17..8eb8fbac53af 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -147,7 +147,7 @@ private: css::uno::Reference< css::chart2::XChartDocument > m_xChartDoc; std::unique_ptr< DataBrowserModel > m_apDataBrowserModel; - typedef ::std::vector< std::shared_ptr< impl::SeriesHeader > > tSeriesHeaderContainer; + typedef std::vector< std::shared_ptr< impl::SeriesHeader > > tSeriesHeaderContainer; tSeriesHeaderContainer m_aSeriesHeaders; std::shared_ptr< NumberFormatterWrapper > m_spNumberFormatterWrapper; diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 55bbefecbeb4..91a332394cf0 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -125,7 +125,7 @@ bool lcl_SequenceOfSeriesIsShared( return bResult; } -typedef ::std::vector< Reference< chart2::data::XLabeledDataSequence > > lcl_tSharedSeqVec; +typedef std::vector< Reference< chart2::data::XLabeledDataSequence > > lcl_tSharedSeqVec; lcl_tSharedSeqVec lcl_getSharedSequences( const Sequence< Reference< chart2::XDataSeries > > & rSeries ) { @@ -171,7 +171,7 @@ sal_Int32 lcl_getValuesRepresentationIndex( return nResult; } -struct lcl_RepresentationsOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > +struct lcl_RepresentationsOfLSeqMatch : public std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { explicit lcl_RepresentationsOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) : m_aValuesRep( xLSeq.is() ? @@ -189,7 +189,7 @@ private: OUString m_aValuesRep; }; -struct lcl_RolesOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > +struct lcl_RolesOfLSeqMatch : public std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { explicit lcl_RolesOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) : m_aRole(DataSeriesHelper::getRole(xLSeq)) {} @@ -234,7 +234,7 @@ struct DataBrowserModel::tDataColumn {} }; -struct DataBrowserModel::implColumnLess : public ::std::binary_function< +struct DataBrowserModel::implColumnLess : public std::binary_function< DataBrowserModel::tDataColumn, DataBrowserModel::tDataColumn, bool > { bool operator() ( const first_argument_type & rLeft, const second_argument_type & rRight ) @@ -262,7 +262,7 @@ DataBrowserModel::~DataBrowserModel() namespace { -struct lcl_DataSeriesOfHeaderMatches : public ::std::unary_function< ::chart::DataBrowserModel::tDataHeader, bool > +struct lcl_DataSeriesOfHeaderMatches : public std::unary_function< ::chart::DataBrowserModel::tDataHeader, bool > { explicit lcl_DataSeriesOfHeaderMatches( const Reference< chart2::XDataSeries > & xSeriesToCompareWith ) : @@ -307,7 +307,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) // Find the corresponding header and determine the last column of this // data series. tDataHeaderVector::const_iterator aIt( - ::std::find_if( m_aHeaders.begin(), m_aHeaders.end(), + std::find_if( m_aHeaders.begin(), m_aHeaders.end(), lcl_DataSeriesOfHeaderMatches( xSeries ))); if( aIt != m_aHeaders.end()) nStartCol = aIt->m_nEndColumn; @@ -350,7 +350,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) for (sal_Int32 nIndex = nStartCol; nSeqIdx < nSeqSize; ++nSeqIdx) { lcl_tSharedSeqVec::const_iterator aSharedIt( - ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(), + std::find_if( aSharedSequences.begin(), aSharedSequences.end(), lcl_RolesOfLSeqMatch( aLSequences[nSeqIdx] ))); if( aSharedIt != aSharedSequences.end()) @@ -486,7 +486,7 @@ void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu for (sal_Int32 i = 0; i < aSequencesOfDeleted.getLength(); ++i) { std::vector<Reference<chart2::data::XLabeledDataSequence> >::const_iterator aHitIt( - ::std::find_if( aAllDataSeqs.begin(), aAllDataSeqs.end(), + std::find_if( aAllDataSeqs.begin(), aAllDataSeqs.end(), lcl_RepresentationsOfLSeqMatch( aSequencesOfDeleted[i] ))); // if not used by the remaining series this sequence can be deleted if( aHitIt == aAllDataSeqs.end() ) @@ -496,8 +496,8 @@ void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu // delete unnecessary sequences of the internal data // iterate using greatest index first, so that deletion does not // shift other sequences that will be deleted later - ::std::sort( aSequenceIndexesToDelete.begin(), aSequenceIndexesToDelete.end()); - for( ::std::vector< sal_Int32 >::reverse_iterator aIt( + std::sort( aSequenceIndexesToDelete.begin(), aSequenceIndexesToDelete.end()); + for( std::vector< sal_Int32 >::reverse_iterator aIt( aSequenceIndexesToDelete.rbegin()); aIt != aSequenceIndexesToDelete.rend(); ++aIt ) { if( *aIt != -1 ) @@ -878,7 +878,7 @@ void DataBrowserModel::updateFromModel() else if( aRole == "values-x" ) nSequenceNumberFormatKey = nXAxisNumberFormat; - if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(), + if( std::find_if( aSharedSequences.begin(), aSharedSequences.end(), lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end()) { // no shared sequence @@ -921,7 +921,7 @@ void DataBrowserModel::updateFromModel() nHeaderStart = nHeaderEnd; - ::std::sort( m_aColumns.begin() + nStartColIndex, m_aColumns.end(), implColumnLess() ); + std::sort( m_aColumns.begin() + nStartColIndex, m_aColumns.end(), implColumnLess() ); } } } @@ -937,7 +937,7 @@ void DataBrowserModel::addErrorBarRanges( { try { - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aSequences; + std::vector< Reference< chart2::data::XLabeledDataSequence > > aSequences; Reference< chart2::data::XDataSource > xErrorSource( StatisticsHelper::getErrorBars( xDataSeries, bYError ), uno::UNO_QUERY ); diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index f191a607faee..589fe79086b9 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -122,7 +122,7 @@ public: {} }; - typedef ::std::vector< tDataHeader > tDataHeaderVector; + typedef std::vector< tDataHeader > tDataHeaderVector; const tDataHeaderVector& getDataHeaders() const { return m_aHeaders;} @@ -151,7 +151,7 @@ private: struct tDataColumn; struct implColumnLess; - typedef ::std::vector< tDataColumn > tDataColumnVector; + typedef std::vector< tDataColumn > tDataColumnVector; tDataColumnVector m_aColumns; tDataHeaderVector m_aHeaders; diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index e6cdc9220170..e4e74416667a 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -59,7 +59,7 @@ namespace { const OUString lcl_aLabelRole( "label" ); -struct lcl_ChartTypeToSeriesCnt : ::std::unary_function< +struct lcl_ChartTypeToSeriesCnt : std::unary_function< Reference< XChartType >, Reference< XDataSeriesContainer > > { Reference< XDataSeriesContainer > operator() ( @@ -73,7 +73,7 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) { OUString aResult( rRoleString ); - typedef ::std::map< OUString, OUString > tTranslationMap; + typedef std::map< OUString, OUString > tTranslationMap; static tTranslationMap aTranslationMap; if( aTranslationMap.empty() ) @@ -108,7 +108,7 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) else { tTranslationMap::const_iterator aIt( - ::std::find_if( aTranslationMap.begin(), aTranslationMap.end(), + std::find_if( aTranslationMap.begin(), aTranslationMap.end(), [&rRoleString] ( const tTranslationMap::value_type& cp ) { return rRoleString == cp.second; } ) @@ -121,7 +121,7 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) return aResult; } -typedef ::std::map< OUString, sal_Int32 > lcl_tRoleIndexMap; +typedef std::map< OUString, sal_Int32 > lcl_tRoleIndexMap; void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap ) { @@ -146,9 +146,9 @@ void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap ) } struct lcl_DataSeriesContainerAppend : public - ::std::iterator< ::std::output_iterator_tag, Reference< XDataSeriesContainer > > + std::iterator< std::output_iterator_tag, Reference< XDataSeriesContainer > > { - typedef ::std::vector< ::chart::DialogModel::tSeriesWithChartTypeByName > tContainerType; + typedef std::vector< ::chart::DialogModel::tSeriesWithChartTypeByName > tContainerType; explicit lcl_DataSeriesContainerAppend( tContainerType * rCnt ) : m_rDestCnt( rCnt ) @@ -170,7 +170,7 @@ struct lcl_DataSeriesContainerAppend : public m_rDestCnt->push_back( ::chart::DialogModel::tSeriesWithChartTypeByName( ::chart::DataSeriesHelper::getDataSeriesLabel( aSeq[nI], aRole ), - ::std::make_pair( aSeq[nI], xCT ))); + std::make_pair( aSeq[nI], xCT ))); } } } @@ -194,7 +194,7 @@ private: }; struct lcl_RolesWithRangeAppend : public - ::std::iterator< ::std::output_iterator_tag, Reference< data::XLabeledDataSequence > > + std::iterator< std::output_iterator_tag, Reference< data::XLabeledDataSequence > > { typedef ::chart::DialogModel::tRolesWithRanges tContainerType; @@ -310,7 +310,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( Reference< data::XDataSink > xSink( xResult, uno::UNO_QUERY ); if( xChartType.is() && xSink.is()) { - ::std::vector< Reference< data::XLabeledDataSequence > > aNewSequences; + std::vector< Reference< data::XLabeledDataSequence > > aNewSequences; const OUString aRoleOfSeqForSeriesLabel = xChartType->getRoleOfSequenceForSeriesLabel(); const OUString aLabel(::chart::SchResId(STR_DATA_UNNAMED_SERIES).toString()); const Sequence< OUString > aRoles( xChartType->getSupportedMandatoryRoles()); @@ -350,7 +350,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( return xResult; } -struct lcl_addSeriesNumber : public ::std::binary_function< +struct lcl_addSeriesNumber : public std::binary_function< sal_Int32, Reference< XDataSeriesContainer >, sal_Int32 > { sal_Int32 operator() ( sal_Int32 nCurrentNumber, const Reference< XDataSeriesContainer > & xCnt ) const @@ -396,7 +396,7 @@ void DialogModel::setTemplate( m_xTemplate = xTemplate; } -::std::shared_ptr< RangeSelectionHelper > const & +std::shared_ptr< RangeSelectionHelper > const & DialogModel::getRangeSelectionHelper() const { if( ! m_spRangeSelectionHelper.get()) @@ -420,10 +420,10 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const return xResult; } -::std::vector< Reference< XDataSeriesContainer > > +std::vector< Reference< XDataSeriesContainer > > DialogModel::getAllDataSeriesContainers() const { - ::std::vector< Reference< XDataSeriesContainer > > aResult; + std::vector< Reference< XDataSeriesContainer > > aResult; try { @@ -440,9 +440,9 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const { Reference< XChartTypeContainer > xCTCnt( aCooSysSeq[i], uno::UNO_QUERY_THROW ); Sequence< Reference< XChartType > > aChartTypeSeq( xCTCnt->getChartTypes()); - ::std::transform( + std::transform( aChartTypeSeq.getConstArray(), aChartTypeSeq.getConstArray() + aChartTypeSeq.getLength(), - ::std::back_inserter( aResult ), + std::back_inserter( aResult ), lcl_ChartTypeToSeriesCnt() ); } } @@ -455,14 +455,14 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const return aResult; } -::std::vector< DialogModel::tSeriesWithChartTypeByName > +std::vector< DialogModel::tSeriesWithChartTypeByName > DialogModel::getAllDataSeriesWithLabel() const { - ::std::vector< tSeriesWithChartTypeByName > aResult; - ::std::vector< Reference< XDataSeriesContainer > > aContainers( + std::vector< tSeriesWithChartTypeByName > aResult; + std::vector< Reference< XDataSeriesContainer > > aContainers( getAllDataSeriesContainers()); - ::std::copy( aContainers.begin(), aContainers.end(), + std::copy( aContainers.begin(), aContainers.end(), lcl_DataSeriesContainerAppend( &aResult )); return aResult; } @@ -521,7 +521,7 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges( { Reference< data::XDataSource > xSource( xSeries, uno::UNO_QUERY_THROW ); const Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSource->getDataSequences()); - ::std::copy( aSeq.begin(), aSeq.end(), + std::copy( aSeq.begin(), aSeq.end(), lcl_RolesWithRangeAppend( &aResult, aRoleOfSequenceForLabel )); if( xChartType.is()) { @@ -730,7 +730,7 @@ void DialogModel::setData( Reference< chart2::XDiagram > xDiagram( m_xChartDocument->getFirstDiagram() ); ThreeDLookScheme e3DScheme = ThreeDHelper::detectScheme( xDiagram ); - ::std::vector< Reference< XDataSeries > > aSeriesToReUse( + std::vector< Reference< XDataSeries > > aSeriesToReUse( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); applyInterpretedData( xInterpreter->interpretDataSource( @@ -782,7 +782,7 @@ sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleStr void DialogModel::applyInterpretedData( const InterpretedData & rNewData, - const ::std::vector< Reference< XDataSeries > > & rSeriesToReUse ) + const std::vector< Reference< XDataSeries > > & rSeriesToReUse ) { if( ! m_xChartDocument.is()) return; @@ -805,7 +805,7 @@ void DialogModel::applyInterpretedData( const sal_Int32 nSeriesInGroup = aSeries.getLength(); for( sal_Int32 nSeries=0; nSeries<nSeriesInGroup; ++nSeries, ++nSeriesCounter ) { - if( ::std::find( rSeriesToReUse.begin(), rSeriesToReUse.end(), aSeries[nSeries] ) + if( std::find( rSeriesToReUse.begin(), rSeriesToReUse.end(), aSeries[nSeries] ) == rSeriesToReUse.end()) { Reference< beans::XPropertySet > xSeriesProp( aSeries[nSeries], uno::UNO_QUERY ); @@ -825,14 +825,14 @@ void DialogModel::applyInterpretedData( } // data series - ::std::vector< Reference< XDataSeriesContainer > > aSeriesCnt( getAllDataSeriesContainers()); - ::std::vector< Sequence< Reference< XDataSeries > > > aNewSeries( + std::vector< Reference< XDataSeriesContainer > > aSeriesCnt( getAllDataSeriesContainers()); + std::vector< Sequence< Reference< XDataSeries > > > aNewSeries( ContainerHelper::SequenceToVector( rNewData.Series )); OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size()); - ::std::vector< Sequence< Reference< XDataSeries > > >::const_iterator aSrcIt( aNewSeries.begin()); - ::std::vector< Reference< XDataSeriesContainer > >::iterator aDestIt( aSeriesCnt.begin()); + std::vector< Sequence< Reference< XDataSeries > > >::const_iterator aSrcIt( aNewSeries.begin()); + std::vector< Reference< XDataSeriesContainer > >::iterator aDestIt( aSeriesCnt.begin()); for(; aSrcIt != aNewSeries.end() && aDestIt != aSeriesCnt.end(); ++aSrcIt, ++aDestIt ) { @@ -853,8 +853,8 @@ void DialogModel::applyInterpretedData( sal_Int32 DialogModel::countSeries() const { - ::std::vector< Reference< XDataSeriesContainer > > aCnt( getAllDataSeriesContainers()); - return ::std::accumulate( aCnt.begin(), aCnt.end(), 0, lcl_addSeriesNumber()); + std::vector< Reference< XDataSeriesContainer > > aCnt( getAllDataSeriesContainers()); + return std::accumulate( aCnt.begin(), aCnt.end(), 0, lcl_addSeriesNumber()); } ChartModel& DialogModel::getModel() const diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index 73fe00a44efb..55251b1ad775 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -64,13 +64,13 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext ); ~DialogModel(); - typedef ::std::pair< + typedef std::pair< OUString, - ::std::pair< css::uno::Reference< css::chart2::XDataSeries >, + std::pair< css::uno::Reference< css::chart2::XDataSeries >, css::uno::Reference< css::chart2::XChartType > > > tSeriesWithChartTypeByName; - typedef ::std::map< OUString, OUString > + typedef std::map< OUString, OUString > tRolesWithRanges; void setTemplate( @@ -85,10 +85,10 @@ public: css::uno::Reference< css::chart2::data::XDataProvider > getDataProvider() const; - ::std::vector< css::uno::Reference< css::chart2::XDataSeriesContainer > > + std::vector< css::uno::Reference< css::chart2::XDataSeriesContainer > > getAllDataSeriesContainers() const; - ::std::vector< tSeriesWithChartTypeByName > + std::vector< tSeriesWithChartTypeByName > getAllDataSeriesWithLabel() const; static tRolesWithRanges getRolesWithRanges( @@ -164,7 +164,7 @@ private: private: void applyInterpretedData( const css::chart2::InterpretedData & rNewData, - const ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > & rSeriesToReUse ); + const std::vector< css::uno::Reference< css::chart2::XDataSeries > > & rSeriesToReUse ); sal_Int32 countSeries() const; diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 157ca9106d3c..574de211aff5 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -513,7 +513,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( + std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); sal_Int32 nSeriesIndex = -1; for( nSeriesIndex=aSeriesVector.size();nSeriesIndex--;) @@ -735,7 +735,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, // replace data series index { - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( + std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); sal_Int32 nSeriesIndex = -1; for( nSeriesIndex=aSeriesVector.size();nSeriesIndex--;) diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index c4c00cd1fcf5..909760b3e932 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -122,7 +122,7 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !aTypeList.getLength() ) { - ::std::vector< uno::Type > aTypes; + std::vector< uno::Type > aTypes; aTypes.push_back( cppu::UnoType<lang::XComponent>::get() ); aTypes.push_back( cppu::UnoType<lang::XTypeProvider>::get() ); aTypes.push_back( cppu::UnoType<uno::XAggregation>::get() ); diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index d1fda13149ca..a132ddf27e40 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -298,7 +298,7 @@ bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const OUString aSep = our_aLBEntryMap[m_pLB_Separator->GetSelectEntryPos()]; rOutAttrs->Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) ); - ::std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) ); + std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) ); if(aIt!=m_aListBoxToPlacementMap.end()) { sal_Int32 nValue = aIt->second; @@ -344,7 +344,7 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs) if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, true, &pPoolItem) == SfxItemState::SET ) { sal_Int32 nPlacement = static_cast<const SfxInt32Item*>(pPoolItem)->GetValue(); - ::std::map< sal_Int32, sal_uInt16 >::const_iterator aIt( m_aPlacementToListBoxMap.find(nPlacement) ); + std::map< sal_Int32, sal_uInt16 >::const_iterator aIt( m_aPlacementToListBoxMap.find(nPlacement) ); if(aIt!=m_aPlacementToListBoxMap.end()) { sal_uInt16 nPos = aIt->second; diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index 4b86489a9fab..aefde02a7fec 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -66,8 +66,8 @@ private: VclPtr<VclHBox> m_pBxTextDirection; VclPtr<TextDirectionListBox> m_pLB_TextDirection; - ::std::map< sal_Int32, sal_uInt16 > m_aPlacementToListBoxMap; - ::std::map< sal_uInt16, sal_Int32 > m_aListBoxToPlacementMap; + std::map< sal_Int32, sal_uInt16 > m_aPlacementToListBoxMap; + std::map< sal_uInt16, sal_Int32 > m_aListBoxToPlacementMap; SvNumberFormatter* m_pNumberFormatter; bool m_bNumberFormatMixedState; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 5f36658e05c2..3e561045fc7d 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -742,8 +742,8 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent if ( aOpts.IsExperimentalMode() ) m_aChartTypeDialogControllerList.push_back(new GL3DBarChartDialogController()); - ::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin(); - const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); + std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin(); + const std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); for( ; aIter != aEnd; ++aIter ) { m_pMainTypeList->InsertEntry( (*aIter)->getName(), (*aIter)->getImage() ); @@ -766,8 +766,8 @@ ChartTypeTabPage::~ChartTypeTabPage() void ChartTypeTabPage::dispose() { //delete all dialog controller - ::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin(); - const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); + std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin(); + const std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); for( ; aIter != aEnd; ++aIter ) { delete *aIter; @@ -850,7 +850,7 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ ) ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() { ChartTypeDialogController* pTypeController = nullptr; - ::std::vector< ChartTypeDialogController* >::size_type nM = static_cast< ::std::vector< ChartTypeDialogController* >::size_type >( + std::vector< ChartTypeDialogController* >::size_type nM = static_cast< std::vector< ChartTypeDialogController* >::size_type >( m_pMainTypeList->GetSelectEntryPos() ); if( nM<m_aChartTypeDialogControllerList.size() ) pTypeController = m_aChartTypeDialogControllerList[nM]; @@ -962,8 +962,8 @@ void ChartTypeTabPage::initializePage() bool bFound = false; - ::std::vector< ChartTypeDialogController* >::iterator aIter = m_aChartTypeDialogControllerList.begin(); - const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); + std::vector< ChartTypeDialogController* >::iterator aIter = m_aChartTypeDialogControllerList.begin(); + const std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); for( sal_uInt16 nM=0; aIter != aEnd; ++aIter, ++nM ) { if( (*aIter)->isSubType(aServiceName) ) diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index a8eb3a31b53f..f330c208c81f 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -87,7 +87,7 @@ protected: css::uno::Reference< css::chart2::XChartDocument > m_xChartModel; - ::std::vector< ChartTypeDialogController* > m_aChartTypeDialogControllerList; + std::vector< ChartTypeDialogController* > m_aChartTypeDialogControllerList; ChartTypeDialogController* m_pCurrentMainType; sal_Int32 m_nChangingCalls; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 183073ca4fc4..65a97b3d554f 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -403,11 +403,11 @@ void DataSourceTabPage::fillSeriesListBox() SvTreeListEntry * pSelectedEntry = nullptr; m_pLB_SERIES->Clear(); - ::std::vector< DialogModel::tSeriesWithChartTypeByName > aSeries( + std::vector< DialogModel::tSeriesWithChartTypeByName > aSeries( m_rDialogModel.getAllDataSeriesWithLabel() ); sal_Int32 nUnnamedSeriesIndex = 1; - for( ::std::vector< DialogModel::tSeriesWithChartTypeByName >::const_iterator aIt = aSeries.begin(); + for( std::vector< DialogModel::tSeriesWithChartTypeByName >::const_iterator aIt = aSeries.begin(); aIt != aSeries.end(); ++aIt ) { OUString aLabel( (*aIt).first ); @@ -635,7 +635,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl, Button*, void) } else { - ::std::vector< Reference< XDataSeriesContainer > > aCntVec( + std::vector< Reference< XDataSeriesContainer > > aCntVec( m_rDialogModel.getAllDataSeriesContainers()); if( ! aCntVec.empty()) xChartTypeForNewSeries.set( aCntVec.front(), uno::UNO_QUERY ); diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index c866eb6d07d2..50808b5825da 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -198,7 +198,7 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const if( pScene ) { // prepare result vector and call helper - ::std::vector< const E3dCompoundObject* > aHitList; + std::vector< const E3dCompoundObject* > aHitList; const basegfx::B2DPoint aHitPoint(rPnt.X(), rPnt.Y()); getAllHit3DObjectsSortedFrontToBack(aHitPoint, *pScene, aHitList); diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index f20c14d3f71e..21da0b93180c 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -292,11 +292,11 @@ private: private: /** type of the vector containing the accessible children */ - typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > ChildListVectorType; + typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > ChildListVectorType; /** type of the hash containing a vector index for every AccessibleUniqueId of the object in the child list */ - typedef ::std::map< ObjectIdentifier, css::uno::Reference< css::accessibility::XAccessible > > ChildOIDMap; + typedef std::map< ObjectIdentifier, css::uno::Reference< css::accessibility::XAccessible > > ChildOIDMap; bool m_bIsDisposed; const bool m_bMayHaveChildren; diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index 24a7e412ab87..0c1603a9eeca 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -56,7 +56,7 @@ protected: virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: - ::std::vector< ItemConverter * > m_aConverters; + std::vector< ItemConverter * > m_aConverters; css::uno::Reference< css::chart2::XAxis > m_xAxis; diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx b/chart2/source/controller/inc/CommandDispatchContainer.hxx index 41adb4f19c7c..dfae2e41018a 100644 --- a/chart2/source/controller/inc/CommandDispatchContainer.hxx +++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx @@ -81,7 +81,7 @@ public: */ void setChartDispatch( const css::uno::Reference< css::frame::XDispatch >& rChartDispatch, - const ::std::set< OUString > & rChartCommands ); + const std::set< OUString > & rChartCommands ); /** Returns the dispatch that is able to do the command given in rURL, if implemented here. If the URL is not implemented here, it should be @@ -110,12 +110,12 @@ public: private: typedef - ::std::map< OUString, + std::map< OUString, css::uno::Reference< css::frame::XDispatch > > tDispatchMap; typedef - ::std::vector< css::uno::Reference< css::frame::XDispatch > > tDisposeVector; + std::vector< css::uno::Reference< css::frame::XDispatch > > tDisposeVector; mutable tDispatchMap m_aCachedDispatches; mutable tDisposeVector m_aToBeDisposedDispatches; @@ -124,7 +124,7 @@ private: css::uno::WeakReference< css::frame::XModel > m_xModel; css::uno::Reference< css::frame::XDispatch > m_xChartDispatcher; - ::std::set< OUString > m_aChartCommands; + std::set< OUString > m_aChartCommands; ChartController* m_pChartController; DrawCommandDispatch* m_pDrawCommandDispatch; diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index 030a42f65dde..0a96b3e47d6a 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -67,7 +67,7 @@ protected: virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: - ::std::vector< ItemConverter * > m_aConverters; + std::vector< ItemConverter * > m_aConverters; bool m_bDataSeries; bool m_bOverwriteLabelsForAttributedDataPointsAlso; bool m_bUseSpecialFillColor; diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index fc92f9d050ad..fa5828f5110c 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -84,7 +84,7 @@ public: private: mutable MarkHandleProvider* m_pMarkHandleProvider; - ::std::unique_ptr< SdrOutliner > m_apOutliner; + std::unique_ptr< SdrOutliner > m_apOutliner; // #i79965# scroll back view when ending text edit bool m_bRestoreMapMode; diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 2ddbab146bc2..53ddfb1c4aa9 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -81,7 +81,7 @@ public: typedef OUString tPropertyNameType; typedef sal_uInt8 tMemberIdType; - typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId; + typedef std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId; /** applies all properties that can be mapped to items into the given item set. diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx index 2e940bee41bd..5577df790bd7 100644 --- a/chart2/source/controller/inc/ItemPropertyMap.hxx +++ b/chart2/source/controller/inc/ItemPropertyMap.hxx @@ -25,7 +25,7 @@ namespace chart { namespace wrapper { -typedef ::std::map< ItemConverter::tWhichIdType, ::std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > > +typedef std::map< ItemConverter::tWhichIdType, std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > > ItemPropertyMapType; }} diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index 794fd1733cd8..8d24a15718aa 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -55,7 +55,7 @@ protected: virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: - ::std::vector< ItemConverter * > m_aConverters; + std::vector< ItemConverter * > m_aConverters; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx index f16235129b35..9e05c4eef383 100644 --- a/chart2/source/controller/inc/MultipleItemConverter.hxx +++ b/chart2/source/controller/inc/MultipleItemConverter.hxx @@ -43,7 +43,7 @@ public: protected: MultipleItemConverter( SfxItemPool& rItemPool ); - ::std::vector< ItemConverter * > m_aConverters; + std::vector< ItemConverter * > m_aConverters; }; }} diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index 017b7269544c..01d1a8bc2cda 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -41,7 +41,7 @@ class ImplObjectHierarchy; class ObjectHierarchy { public: - typedef ::std::vector< ObjectIdentifier > tChildContainer; + typedef std::vector< ObjectIdentifier > tChildContainer; /** @param bFlattenDiagram If <TRUE/>, the content of the diagram (data series, wall, floor, @@ -72,7 +72,7 @@ public: private: - ::std::unique_ptr< impl::ImplObjectHierarchy > m_apImpl; + std::unique_ptr< impl::ImplObjectHierarchy > m_apImpl; }; class ObjectKeyNavigation diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 03eaadd967b9..22c49be4d6ec 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -55,7 +55,7 @@ protected: virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: - ::std::vector< ItemConverter * > m_aConverters; + std::vector< ItemConverter * > m_aConverters; }; }} diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index fde086ec12c9..8f2b9c746c47 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -51,7 +51,7 @@ protected: virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: - ::std::vector< ItemConverter * > m_aConverters; + std::vector< ItemConverter * > m_aConverters; }; }} diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index c0ce414d21fb..c3be2086e7e4 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -58,8 +58,8 @@ public: virtual void setValidPage( TabPage * pTabPage ) override; protected: - ::std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider; - ::std::unique_ptr< DialogModel > m_apDialogModel; + std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider; + std::unique_ptr< DialogModel > m_apDialogModel; private: VclPtr<DataSourceTabControl> m_pTabControl; diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 192fd3dec453..c7f328e6c991 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -108,7 +108,7 @@ AxisItemConverter::~AxisItemConverter() delete m_pExplicitScale; delete m_pExplicitIncrement; - ::std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); + std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); } void AxisItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 4d1575a7fa81..d252b7debdd7 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -237,7 +237,7 @@ DataPointItemConverter::DataPointItemConverter( DataPointItemConverter::~DataPointItemConverter() { - ::std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); + std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); } void DataPointItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index b3267044ad5e..c800a8c42bdd 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -59,7 +59,7 @@ LegendItemConverter::LegendItemConverter( LegendItemConverter::~LegendItemConverter() { - ::std::for_each( m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); + std::for_each( m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); } void LegendItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index 02481f3b977e..bb122879ca2a 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -104,10 +104,10 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ) : MultipleItemConverter( rItemPool ) { - ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( + std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( ::chart::ChartModelHelper::getDataSeries( xChartModel )); - ::std::vector< uno::Reference< chart2::XDataSeries > >::const_iterator aIt; + std::vector< uno::Reference< chart2::XDataSeries > >::const_iterator aIt; for( aIt = aSeriesList.begin(); aIt != aSeriesList.end(); ++aIt ) { uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY); @@ -169,10 +169,10 @@ AllSeriesStatisticsConverter::AllSeriesStatisticsConverter( SfxItemPool& rItemPool ) : MultipleItemConverter( rItemPool ) { - ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( + std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( ::chart::ChartModelHelper::getDataSeries( xChartModel )); - ::std::vector< uno::Reference< chart2::XDataSeries > >::const_iterator aIt; + std::vector< uno::Reference< chart2::XDataSeries > >::const_iterator aIt; for( aIt = aSeriesList.begin(); aIt != aSeriesList.end(); ++aIt ) { uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY); diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx index 3570366d0936..9befc3810665 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx @@ -33,13 +33,13 @@ MultipleItemConverter::MultipleItemConverter( SfxItemPool& rItemPool ) } MultipleItemConverter::~MultipleItemConverter() { - ::std::for_each( m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); + std::for_each( m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); } void MultipleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const { - ::std::vector< ItemConverter* >::const_iterator aIter = m_aConverters.begin(); - const ::std::vector< ItemConverter* >::const_iterator aEnd = m_aConverters.end(); + std::vector< ItemConverter* >::const_iterator aIter = m_aConverters.begin(); + const std::vector< ItemConverter* >::const_iterator aEnd = m_aConverters.end(); if( aIter != aEnd ) { (*aIter)->FillItemSet( rOutItemSet ); diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 1ba39b2ea907..0f62797e1eeb 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -67,7 +67,7 @@ RegressionEquationItemConverter::RegressionEquationItemConverter( RegressionEquationItemConverter::~RegressionEquationItemConverter() { - ::std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); + std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); } void RegressionEquationItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index e8d964dd8611..7a3c8f0c9c85 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -118,7 +118,7 @@ TitleItemConverter::TitleItemConverter( TitleItemConverter::~TitleItemConverter() { - ::std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); + std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>()); } void TitleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 06751063e540..0322808af53a 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1496,9 +1496,9 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn } } -const ::std::set< OUString >& ChartController::impl_getAvailableCommands() +const std::set< OUString >& ChartController::impl_getAvailableCommands() { - static ::std::set< OUString > s_AvailableCommands { + static std::set< OUString > s_AvailableCommands { // commands for container forward "AddDirect", "NewDoc", "Open", "Save", "SaveAs", "SendMail", diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 20b8f010a777..1fb09719d940 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -328,7 +328,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues() } else { - ::std::vector< uno::Reference< chart2::XDataSeries > > aSeries( + std::vector< uno::Reference< chart2::XDataSeries > > aSeries( DiagramHelper::getDataSeriesFromDiagram( ChartModelHelper::findDiagram( getModel() ))); for( const auto& xSrs : aSeries ) diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 7733e549f83c..bc62696dd2fa 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -214,7 +214,7 @@ void ChartController::executeDispatch_NewArrangement() } // regression curve equations - ::std::vector< Reference< chart2::XRegressionCurve > > aRegressionCurves( + std::vector< Reference< chart2::XRegressionCurve > > aRegressionCurves( RegressionCurveHelper::getAllRegressionCurvesNotMeanValueLine( xDiagram )); // reset equation position diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index ad0248e0cc73..5aa588971400 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -999,8 +999,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) { if( bIsPoint ) { - ::std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) ); - ::std::vector< sal_Int32 >::iterator aIt = ::std::find( aIndices.begin(), aIndices.end(), nPointIndex ); + std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) ); + std::vector< sal_Int32 >::iterator aIt = std::find( aIndices.begin(), aIndices.end(), nPointIndex ); if( aIt != aIndices.end()) bSelectedPointIsFormatted = true; else diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 097929533608..deb3c2db2b04 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -36,10 +36,10 @@ using ::com::sun::star::uno::Sequence; namespace { -::std::vector< OUString > lcl_getStringsFromByteSequence( +std::vector< OUString > lcl_getStringsFromByteSequence( const Sequence< sal_Int8 > & aByteSequence ) { - ::std::vector< OUString > aResult; + std::vector< OUString > aResult; const sal_Int32 nLength = aByteSequence.getLength(); const sal_Char * pBytes( reinterpret_cast< const sal_Char* >( aByteSequence.getConstArray())); sal_Int32 nStartPos = 0; @@ -106,7 +106,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt ) Sequence<sal_Int8> aBytes = aDataHelper.GetSequence(SotClipboardFormatId::LINK, OUString()); if (aBytes.getLength()) { - ::std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes )); + std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes )); if( aStrings.size() >= 3 && aStrings[0] == "soffice" ) { OUString aRangeString( aStrings[2] ); diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 18235c3f8862..a9a76a1ab587 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -123,7 +123,7 @@ protected: css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; private: - typedef ::std::map< OUString, ::comphelper::OInterfaceContainerHelper2* > + typedef std::map< OUString, ::comphelper::OInterfaceContainerHelper2* > tListenerMap; tListenerMap m_aListeners; diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index e8b659895623..a03083a31342 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -57,7 +57,7 @@ void CommandDispatchContainer::setModel( void CommandDispatchContainer::setChartDispatch( const Reference< frame::XDispatch >& rChartDispatch, - const ::std::set< OUString > & rChartCommands ) + const std::set< OUString > & rChartCommands ) { OSL_ENSURE(rChartDispatch.is(),"Invalid fall back dispatcher!"); m_xChartDispatcher.set( rChartDispatch ); diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index b32c5de1d01b..35fa134db732 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -503,7 +503,7 @@ void ControllerCommandDispatch::fireStatusEventForURLImpl( const OUString & rURL, const Reference< frame::XStatusListener > & xSingleListener ) { - ::std::map< OUString, uno::Any >::const_iterator aArgIt( m_aCommandArguments.find( rURL )); + std::map< OUString, uno::Any >::const_iterator aArgIt( m_aCommandArguments.find( rURL )); if( aArgIt != m_aCommandArguments.end()) fireStatusEventForURL( rURL, aArgIt->second, commandAvailable( rURL ), xSingleListener ); else @@ -690,7 +690,7 @@ void ControllerCommandDispatch::updateCommandAvailability() bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand ) { - ::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.find( rCommand )); + std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.find( rCommand )); if( aIt != m_aCommandAvailability.end()) return aIt->second; OSL_FAIL( "commandAvailable: command not in availability map" ); @@ -726,7 +726,7 @@ void ControllerCommandDispatch::fireStatusEvent( } if( rURL.isEmpty() ) - for( ::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.begin()); + for( std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.begin()); aIt != m_aCommandAvailability.end(); ++aIt ) fireStatusEventForURLImpl( aIt->first, xSingleListener ); else if( !bIsChartSelectorURL ) diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 38d6a8c1e0ed..e338fdbacb92 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -105,11 +105,11 @@ private: css::uno::Reference< css::view::XSelectionSupplier > m_xSelectionSupplier; css::uno::Reference< css::frame::XDispatch > m_xDispatch; - ::std::unique_ptr< impl::ModelState > m_apModelState; - ::std::unique_ptr< impl::ControllerState > m_apControllerState; + std::unique_ptr< impl::ModelState > m_apModelState; + std::unique_ptr< impl::ControllerState > m_apControllerState; - mutable ::std::map< OUString, bool > m_aCommandAvailability; - mutable ::std::map< OUString, css::uno::Any > m_aCommandArguments; + mutable std::map< OUString, bool > m_aCommandAvailability; + mutable std::map< OUString, css::uno::Any > m_aCommandArguments; CommandDispatchContainer* m_pDispatchContainer; }; diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 6fe052ea3db0..9072f31c99e4 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -55,7 +55,7 @@ namespace { // comparing two PropertyValue instances - struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool > + struct PropertyValueCompare : public std::binary_function< beans::PropertyValue, OUString, bool > { bool operator() ( const beans::PropertyValue& rPropValue, const OUString& rName ) const { @@ -119,7 +119,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj ) bool bAttributesAppliedFromGallery = false; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - ::std::vector< OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { for ( size_t i = 0; i < aObjList.size(); ++i ) @@ -372,8 +372,8 @@ void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< bea const OUString sKeyModifier( "KeyModifier" ); const beans::PropertyValue* pIter = rArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + rArgs.getLength(); - const beans::PropertyValue* pKeyModifier = ::std::find_if( - pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), std::cref( sKeyModifier ) ) ); + const beans::PropertyValue* pKeyModifier = std::find_if( + pIter, pEnd, std::bind2nd( PropertyValueCompare(), std::cref( sKeyModifier ) ) ); sal_Int16 nKeyModifier = 0; if ( pKeyModifier != pEnd && pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) { diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 928b360bc84a..597ac2483f53 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -58,7 +58,7 @@ class SelectorListBox : public ListBox private: css::uno::WeakReference< css::frame::XController > m_xChartController; - ::std::vector< ListBoxEntryData > m_aEntries; + std::vector< ListBoxEntryData > m_aEntries; bool m_bReleaseFocus; }; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 8dca9c202dca..12db19ccdc75 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -33,7 +33,7 @@ struct ControllerFeature: public css::frame::DispatchInformation sal_uInt16 nFeatureId; }; -typedef ::std::map< OUString, +typedef std::map< OUString, ControllerFeature > SupportedFeatures; struct FeatureState diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index a8a29ceca11b..23db1d2d403e 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence; namespace { -struct lcl_ObjectToOID : public ::std::unary_function< Reference< uno::XInterface >, ::chart::ObjectIdentifier > +struct lcl_ObjectToOID : public std::unary_function< Reference< uno::XInterface >, ::chart::ObjectIdentifier > { explicit lcl_ObjectToOID( const Reference< chart2::XChartDocument > & xChartDoc ) : m_xModel( xChartDoc, uno::UNO_QUERY ) @@ -159,7 +159,7 @@ private: const ObjectIdentifier& rParentOID, const ObjectIdentifier& rOID ); - typedef ::std::map< ObjectIdentifier, ObjectHierarchy::tChildContainer > + typedef std::map< ObjectIdentifier, ObjectHierarchy::tChildContainer > tChildMap; tChildMap m_aChildMap; ExplicitValueProvider* m_pExplicitValueProvider; @@ -308,8 +308,8 @@ void ImplObjectHierarchy::createAxesTree( { Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxesOfDiagram( xDiagram, /* bOnlyVisible = */ true ) ); if( !m_bOrderingForElementSelector ) - ::std::transform( aAxes.getConstArray(), aAxes.getConstArray() + aAxes.getLength(), - ::std::back_inserter( rContainer ), + std::transform( aAxes.getConstArray(), aAxes.getConstArray() + aAxes.getLength(), + std::back_inserter( rContainer ), lcl_ObjectToOID( xChartDoc )); // get all axes, also invisible ones @@ -578,7 +578,7 @@ ObjectHierarchy::tChildContainer ImplObjectHierarchy::getSiblings( const ObjectI aIt != m_aChildMap.end(); ++aIt ) { ObjectHierarchy::tChildContainer::const_iterator aElemIt( - ::std::find( aIt->second.begin(), aIt->second.end(), rNode )); + std::find( aIt->second.begin(), aIt->second.end(), rNode )); if( aElemIt != aIt->second.end()) return aIt->second; } @@ -593,7 +593,7 @@ ObjectIdentifier ImplObjectHierarchy::getParentImpl( // search children ObjectHierarchy::tChildContainer aChildren( getChildren( rParentOID )); ObjectHierarchy::tChildContainer::const_iterator aIt( - ::std::find( aChildren.begin(), aChildren.end(), rOID )); + std::find( aChildren.begin(), aChildren.end(), rOID )); // recursion end if( aIt != aChildren.end()) return rParentOID; @@ -777,7 +777,7 @@ bool ObjectKeyNavigation::next() if( bResult ) { ObjectHierarchy::tChildContainer::const_iterator aIt( - ::std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection())); + std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection())); OSL_ASSERT( aIt != aSiblings.end()); if( ++aIt == aSiblings.end()) aIt = aSiblings.begin(); @@ -797,7 +797,7 @@ bool ObjectKeyNavigation::previous() if( bResult ) { ObjectHierarchy::tChildContainer::const_iterator aIt( - ::std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection())); + std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection())); OSL_ASSERT( aIt != aSiblings.end()); if( aIt == aSiblings.begin()) aIt = aSiblings.end(); diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index 5435afe6dca7..f3cba60f723b 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -121,7 +121,7 @@ namespace CharacterProperties }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< css::beans::Property > & rOutProperties ); + std::vector< css::beans::Property > & rOutProperties ); OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 3ddf4720027c..7dcce430fad4 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -62,12 +62,12 @@ public: static css::uno::Reference< css::chart2::XCoordinateSystem > getFirstCoordinateSystem( const css::uno::Reference< css::frame::XModel >& xModel ); - SAL_DLLPRIVATE static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > + SAL_DLLPRIVATE static std::vector< css::uno::Reference< css::chart2::XDataSeries > > getDataSeries( ChartModel& rModel ); - SAL_DLLPRIVATE static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > + SAL_DLLPRIVATE static std::vector< css::uno::Reference< css::chart2::XDataSeries > > getDataSeries( const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc ); - static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > + static std::vector< css::uno::Reference< css::chart2::XDataSeries > > getDataSeries( const css::uno::Reference< css::frame::XModel > & xModel ); static css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx index dfe58235191f..ee625666ab9d 100644 --- a/chart2/source/inc/CloneHelper.hxx +++ b/chart2/source/inc/CloneHelper.hxx @@ -33,7 +33,7 @@ namespace CloneHelper /// functor that clones a UNO-Reference template< class Interface > - struct CreateRefClone : public ::std::unary_function< Interface, Interface > + struct CreateRefClone : public std::unary_function< Interface, Interface > { css::uno::Reference<Interface> operator() ( const css::uno::Reference<Interface> & xOther ) { @@ -50,11 +50,11 @@ template< class Interface > /// clones a vector of UNO-References template< class Interface > void CloneRefVector( - const ::std::vector< css::uno::Reference< Interface > > & rSource, - ::std::vector< css::uno::Reference< Interface > > & rDestination ) + const std::vector< css::uno::Reference< Interface > > & rSource, + std::vector< css::uno::Reference< Interface > > & rDestination ) { - ::std::transform( rSource.begin(), rSource.end(), - ::std::back_inserter( rDestination ), + std::transform( rSource.begin(), rSource.end(), + std::back_inserter( rDestination ), CreateRefClone< Interface >()); } @@ -65,7 +65,7 @@ template< class Interface > css::uno::Sequence< css::uno::Reference<Interface> > & rDestination ) { rDestination.realloc( rSource.getLength()); - ::std::transform( rSource.getConstArray(), rSource.getConstArray() + rSource.getLength(), + std::transform( rSource.getConstArray(), rSource.getConstArray() + rSource.getLength(), rDestination.getArray(), CreateRefClone< Interface >()); } diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index 789906e25f36..389c1ff553e0 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -200,16 +200,16 @@ css::uno::Sequence< T > } template< typename T > - ::std::vector< T > - FlattenVector( const ::std::vector< ::std::vector< T > > & rVecVec ) + std::vector< T > + FlattenVector( const std::vector< std::vector< T > > & rVecVec ) { - typedef ::std::vector< T > tFlatVec; - typedef ::std::vector< tFlatVec > tVecVec; + typedef std::vector< T > tFlatVec; + typedef std::vector< tFlatVec > tVecVec; tFlatVec aResult; typename tVecVec::const_iterator aOuterEnd( rVecVec.end()); for( typename tVecVec::const_iterator aOuterIt( rVecVec.begin()); aOuterIt != aOuterEnd; ++aOuterIt ) - ::std::copy( aOuterIt->begin(), aOuterIt->end(), back_inserter( aResult )); + std::copy( aOuterIt->begin(), aOuterIt->end(), back_inserter( aResult )); return aResult; } diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index bbdc27a851c1..4e0eeb680631 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -38,7 +38,7 @@ namespace CommonFunctors (via mem_fun_ptr)</p> */ template< typename T > - struct makeAny : public ::std::unary_function< T, css::uno::Any > + struct makeAny : public std::unary_function< T, css::uno::Any > { css::uno::Any operator() ( const T & aVal ) { @@ -51,7 +51,7 @@ template< typename T > <p>In case no number can be generated from the Any, NaN (see rtl::math::SetNAN()) is returned.</p> */ -struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< css::uno::Any, double > +struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public std::unary_function< css::uno::Any, double > { double operator() ( const css::uno::Any & rAny ) { @@ -65,7 +65,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< css: /** unary function to convert css::uno::Any into an OUString. */ -struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< css::uno::Any, OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public std::unary_function< css::uno::Any, OUString > { OUString operator() ( const css::uno::Any & rAny ) { @@ -94,7 +94,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< css: <p>For conversion rtl::math::StringToDouble is used.</p> */ -struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< OUString, double > +struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public std::unary_function< OUString, double > { double operator() ( const OUString & rStr ) { @@ -112,7 +112,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< <p>For conversion rtl::math::DoubleToOUString is used.</p> */ -struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public std::unary_function< double, OUString > { OUString operator() ( double fNumber ) { diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 7fd695242bd4..1e6da809232f 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -65,7 +65,7 @@ private: // member variables css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::std::unique_ptr< impl::ChartConfigItem > m_apChartConfigItem; + std::unique_ptr< impl::ChartConfigItem > m_apChartConfigItem; mutable css::uno::Sequence< sal_Int64 > m_aColorSequence; mutable sal_Int32 m_nNumberOfColors; bool m_bNeedsUpdate; diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index 531e3bd00ae8..b2c0b448c30c 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -42,15 +42,15 @@ namespace ContainerHelper example: Sequence< sal_Int32 > aSequence; - ::std::vector< sal_Int32 > aVector( - ContainerToSequence::SequenceToSTLSequenceContainer< ::std::vector< sal_Int32 > >( aSequence ); + std::vector< sal_Int32 > aVector( + ContainerToSequence::SequenceToSTLSequenceContainer< std::vector< sal_Int32 > >( aSequence ); */ template< class Container > Container SequenceToSTLSequenceContainer( const css::uno::Sequence< typename Container::value_type > & rSeq ) { Container aResult( rSeq.getLength()); - ::std::copy( rSeq.begin(), rSeq.end(), aResult.begin() ); + std::copy( rSeq.begin(), rSeq.end(), aResult.begin() ); return aResult; } @@ -61,13 +61,13 @@ template< class Container > example: Sequence< sal_Int32 > aSequence; - ::std::vector< sal_Int32 > aVector( ContainerHelper::SequenceToVector( aSequence )); + std::vector< sal_Int32 > aVector( ContainerHelper::SequenceToVector( aSequence )); */ template< typename T > - ::std::vector< T > + std::vector< T > SequenceToVector( const css::uno::Sequence< T > & rSeq ) { - return SequenceToSTLSequenceContainer< ::std::vector< T > >( rSeq ); + return SequenceToSTLSequenceContainer< std::vector< T > >( rSeq ); } } // namespace ContainerHelper diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 0566db7cec49..b031d4a54ae8 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -65,7 +65,7 @@ OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XLabeledDataSeq @param aRole The role that is to be filtered out. */ -OOO_DLLPUBLIC_CHARTTOOLS ::std::vector< +OOO_DLLPUBLIC_CHARTTOOLS std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > getAllDataSequencesByRole( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & aDataSequences, const OUString& aRole, diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 29cc79d4af91..8555472ed85f 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -51,7 +51,7 @@ enum DiagramPositioningMode class OOO_DLLPUBLIC_CHARTTOOLS DiagramHelper { public: - typedef ::std::pair< + typedef std::pair< css::uno::Reference< css::chart2::XChartTypeTemplate >, OUString > tTemplateWithServiceName; @@ -159,7 +159,7 @@ public: const css::uno::Reference< css::chart2::XDiagram >& xDiagram, const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); - static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > + static std::vector< css::uno::Reference< css::chart2::XDataSeries > > getDataSeriesFromDiagram( const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 1436d436dd5f..93d3128fd2cd 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -131,7 +131,7 @@ protected: virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override; private: - typedef ::std::vector< css::uno::Reference< + typedef std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer; tDataSequenceContainer m_aDataSequences; diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index 07de4ca91c43..7e951a3df3ab 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -36,7 +36,7 @@ namespace impl { template< class InterfaceRef > -struct addListenerFunctor : public ::std::unary_function< InterfaceRef, void > +struct addListenerFunctor : public std::unary_function< InterfaceRef, void > { explicit addListenerFunctor( const css::uno::Reference< css::lang::XEventListener > & xListener ) : m_xListener( xListener ) @@ -54,7 +54,7 @@ private: }; template< class InterfaceRef > -struct removeListenerFunctor : public ::std::unary_function< InterfaceRef, void > +struct removeListenerFunctor : public std::unary_function< InterfaceRef, void > { explicit removeListenerFunctor( const css::uno::Reference< css::lang::XEventListener > & xListener ) : m_xListener( xListener ) @@ -91,7 +91,7 @@ void addListenerToAllElements( const css::uno::Reference< css::lang::XEventListener > & xListener ) { if( xListener.is()) - ::std::for_each( rContainer.begin(), rContainer.end(), + std::for_each( rContainer.begin(), rContainer.end(), impl::addListenerFunctor< typename Container::value_type >( xListener )); } @@ -113,7 +113,7 @@ void removeListenerFromAllElements( const css::uno::Reference< css::lang::XEventListener > & xListener ) { if( xListener.is()) - ::std::for_each( rContainer.begin(), rContainer.end(), + std::for_each( rContainer.begin(), rContainer.end(), impl::removeListenerFunctor< typename Container::value_type >( xListener )); } diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 7a39bf60ea5d..0195d24a31fd 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -91,7 +91,7 @@ private: //member bool m_bIsExplicitCategoriesInited; css::uno::Sequence< OUString > m_aExplicitCategories; - ::std::vector< ::std::vector< ComplexCategory > > m_aComplexCats; + std::vector< std::vector< ComplexCategory > > m_aComplexCats; css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList; diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index f33d7207bb12..aba79c5fbd11 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -64,7 +64,7 @@ namespace FillProperties }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< css::beans::Property > & rOutProperties ); + std::vector< css::beans::Property > & rOutProperties ); OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); } diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx index 9a7eb3587045..25ed60606d74 100644 --- a/chart2/source/inc/InternalData.hxx +++ b/chart2/source/inc/InternalData.hxx @@ -40,14 +40,14 @@ public: css::uno::Sequence< double > getColumnValues( sal_Int32 nColumnIndex ) const; css::uno::Sequence< double > getRowValues( sal_Int32 nRowIndex ) const; - void setColumnValues( sal_Int32 nColumnIndex, const ::std::vector< double > & rNewData ); - void setRowValues( sal_Int32 nRowIndex, const ::std::vector< double > & rNewData ); + void setColumnValues( sal_Int32 nColumnIndex, const std::vector< double > & rNewData ); + void setRowValues( sal_Int32 nRowIndex, const std::vector< double > & rNewData ); - void setComplexColumnLabel( sal_Int32 nColumnIndex, const ::std::vector< css::uno::Any >& rComplexLabel ); - void setComplexRowLabel( sal_Int32 nRowIndex, const ::std::vector< css::uno::Any >& rComplexLabel ); + void setComplexColumnLabel( sal_Int32 nColumnIndex, const std::vector< css::uno::Any >& rComplexLabel ); + void setComplexRowLabel( sal_Int32 nRowIndex, const std::vector< css::uno::Any >& rComplexLabel ); - ::std::vector< css::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const; - ::std::vector< css::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const; + std::vector< css::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const; + std::vector< css::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const; void swapRowWithNext( sal_Int32 nRowIndex ); void swapColumnWithNext( sal_Int32 nColumnIndex ); @@ -65,7 +65,7 @@ public: sal_Int32 getRowCount() const; sal_Int32 getColumnCount() const; - typedef ::std::vector< ::std::vector< css::uno::Any > > tVecVecAny; //inner index is hierarchical level + typedef std::vector< std::vector< css::uno::Any > > tVecVecAny; //inner index is hierarchical level void setComplexRowLabels( const tVecVecAny& rNewRowLabels ); const tVecVecAny& getComplexRowLabels() const; @@ -86,7 +86,7 @@ private: sal_Int32 m_nColumnCount; sal_Int32 m_nRowCount; - typedef ::std::valarray< double > tDataType; + typedef std::valarray< double > tDataType; tDataType m_aData; tVecVecAny m_aRowLabels;//outer index is row index, inner index is category level tVecVecAny m_aColumnLabels;//outer index is column index diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 183228250df4..d68e17f18ba8 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -197,11 +197,11 @@ private: void increaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd ); void decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd ); - typedef ::std::multimap< OUString, + typedef std::multimap< OUString, css::uno::WeakReference< css::chart2::data::XDataSequence > > tSequenceMap; - typedef ::std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange; - typedef ::std::pair< tSequenceMap::const_iterator, tSequenceMap::const_iterator > tConstSequenceMapRange; + typedef std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange; + typedef std::pair< tSequenceMap::const_iterator, tSequenceMap::const_iterator > tConstSequenceMapRange; /** cache for all sequences that have been returned. diff --git a/chart2/source/inc/LinePropertiesHelper.hxx b/chart2/source/inc/LinePropertiesHelper.hxx index 45b086810346..81a5e5a1272f 100644 --- a/chart2/source/inc/LinePropertiesHelper.hxx +++ b/chart2/source/inc/LinePropertiesHelper.hxx @@ -46,7 +46,7 @@ namespace LinePropertiesHelper }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< css::beans::Property > & rOutProperties ); + std::vector< css::beans::Property > & rOutProperties ); OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index d26bb258839c..4fe9e178ff9e 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -90,8 +90,8 @@ private: // ::osl::Mutex & m_rMutex; ::cppu::OBroadcastHelper m_aModifyListeners; - typedef ::std::list< - ::std::pair< + typedef std::list< + std::pair< css::uno::WeakReference< css::util::XModifyListener >, css::uno::Reference< css::util::XModifyListener > > > tListenerMap; @@ -103,7 +103,7 @@ namespace impl { template< class InterfaceRef > -struct addListenerFunctor : public ::std::unary_function< InterfaceRef, void > +struct addListenerFunctor : public std::unary_function< InterfaceRef, void > { explicit addListenerFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) : m_xListener( xListener ) @@ -121,7 +121,7 @@ private: }; template< class InterfaceRef > -struct removeListenerFunctor : public ::std::unary_function< InterfaceRef, void > +struct removeListenerFunctor : public std::unary_function< InterfaceRef, void > { explicit removeListenerFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) : m_xListener( xListener ) @@ -139,7 +139,7 @@ private: }; template< class Pair > -struct addListenerToMappedElementFunctor : public ::std::unary_function< Pair, void > +struct addListenerToMappedElementFunctor : public std::unary_function< Pair, void > { explicit addListenerToMappedElementFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) : m_xListener( xListener ) @@ -157,7 +157,7 @@ private: }; template< class Pair > -struct removeListenerFromMappedElementFunctor : public ::std::unary_function< Pair, void > +struct removeListenerFromMappedElementFunctor : public std::unary_function< Pair, void > { explicit removeListenerFromMappedElementFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) : m_xListener( xListener ) @@ -194,7 +194,7 @@ void addListenerToAllElements( const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) - ::std::for_each( rContainer.begin(), rContainer.end(), + std::for_each( rContainer.begin(), rContainer.end(), impl::addListenerFunctor< typename Container::value_type >( xListener )); } @@ -204,7 +204,7 @@ void addListenerToAllMapElements( const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) - ::std::for_each( rContainer.begin(), rContainer.end(), + std::for_each( rContainer.begin(), rContainer.end(), impl::addListenerToMappedElementFunctor< typename Container::value_type >( xListener )); } @@ -214,7 +214,7 @@ void addListenerToAllSequenceElements( const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) - ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(), + std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(), impl::addListenerFunctor< T >( xListener )); } @@ -236,7 +236,7 @@ void removeListenerFromAllElements( const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) - ::std::for_each( rContainer.begin(), rContainer.end(), + std::for_each( rContainer.begin(), rContainer.end(), impl::removeListenerFunctor< typename Container::value_type >( xListener )); } @@ -246,7 +246,7 @@ void removeListenerFromAllMapElements( const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) - ::std::for_each( rContainer.begin(), rContainer.end(), + std::for_each( rContainer.begin(), rContainer.end(), impl::removeListenerFromMappedElementFunctor< typename Container::value_type >( xListener )); } @@ -256,7 +256,7 @@ void removeListenerFromAllSequenceElements( const css::uno::Reference< css::util::XModifyListener > & xListener ) { if( xListener.is()) - ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(), + std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(), impl::removeListenerFunctor< T >( xListener )); } diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 268255bfc7c0..33392a9c3903 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -81,7 +81,7 @@ private: //member const OUString m_aServicename; const OUString m_aImplementationName; - typedef ::std::map< OUString, css::uno::Any > tContentMap; + typedef std::map< OUString, css::uno::Any > tContentMap; tContentMap m_aMap; }; diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx index 87dd524d3f17..e4b94818bfb5 100644 --- a/chart2/source/inc/RegressionCalculationHelper.hxx +++ b/chart2/source/inc/RegressionCalculationHelper.hxx @@ -31,7 +31,7 @@ namespace chart namespace RegressionCalculationHelper { -typedef ::std::pair< ::std::vector< double >, ::std::vector< double > > tDoubleVectorPair; +typedef std::pair< std::vector< double >, std::vector< double > > tDoubleVectorPair; /** takes the given x- and y-values and copies them into the resulting pair, which contains x-values in the first element and the y-values in the second @@ -47,7 +47,7 @@ tDoubleVectorPair Pred aPred ) { tDoubleVectorPair aResult; - sal_Int32 nSize = ::std::min( rXValues.getLength(), rYValues.getLength()); + sal_Int32 nSize = std::min( rXValues.getLength(), rYValues.getLength()); for( sal_Int32 i=0; i<nSize; ++i ) { if( aPred( rXValues[i], rYValues[i] )) @@ -60,7 +60,7 @@ tDoubleVectorPair return aResult; } -class isValid : public ::std::binary_function< double, double, bool > +class isValid : public std::binary_function< double, double, bool > { public: inline bool operator()( double x, double y ) @@ -71,7 +71,7 @@ public: } }; -class isValidAndXPositive : public ::std::binary_function< double, double, bool > +class isValidAndXPositive : public std::binary_function< double, double, bool > { public: inline bool operator()( double x, double y ) @@ -83,7 +83,7 @@ public: } }; -class isValidAndYPositive : public ::std::binary_function< double, double, bool > +class isValidAndYPositive : public std::binary_function< double, double, bool > { public: inline bool operator()( double x, double y ) @@ -95,7 +95,7 @@ public: } }; -class isValidAndYNegative : public ::std::binary_function< double, double, bool > +class isValidAndYNegative : public std::binary_function< double, double, bool > { public: inline bool operator()( double x, double y ) @@ -107,7 +107,7 @@ public: } }; -class isValidAndBothPositive : public ::std::binary_function< double, double, bool > +class isValidAndBothPositive : public std::binary_function< double, double, bool > { public: inline bool operator()( double x, double y ) @@ -120,7 +120,7 @@ public: } }; -class isValidAndXPositiveAndYNegative : public ::std::binary_function< double, double, bool > +class isValidAndXPositiveAndYNegative : public std::binary_function< double, double, bool > { public: inline bool operator()( double x, double y ) diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index e1176720364a..bb2cc8b02001 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -72,7 +72,7 @@ namespace SceneProperties }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< css::beans::Property > & rOutProperties ); + std::vector< css::beans::Property > & rOutProperties ); OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); } diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index cb671de2be9c..471126e32df5 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -47,7 +47,7 @@ namespace UserDefinedProperties }; OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( - ::std::vector< css::beans::Property > & rOutProperties ); + std::vector< css::beans::Property > & rOutProperties ); } } // namespace chart diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index d28b83e7c8a2..cae7f323652e 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -74,7 +74,7 @@ protected: OUString m_aInnerName; }; -typedef ::std::map< sal_Int32, const WrappedProperty* > tWrappedPropertyMap; +typedef std::map< sal_Int32, const WrappedProperty* > tWrappedPropertyMap; } //namespace chart diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx index 9cf0e28dfd3d..14f474253644 100644 --- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx +++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx @@ -144,7 +144,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData positions of subsequent tickmarks in relation to their parent tickmarks given by the preceding SubIncrement.</p> */ - ::std::vector< ExplicitSubIncrement > SubIncrements; + std::vector< ExplicitSubIncrement > SubIncrements; }; } //namespace chart 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 ); diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 6c7215269bd3..d3da454af5e2 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -197,7 +197,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( Reference< data::XDataSource > xSource( DataSourceHelper::getUsedData( xChartDoc ) ); if( xSource.is() ) { - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues( + std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues( DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), "values-x", true ) ); if( aXValues.empty() ) { @@ -232,7 +232,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( if( !bFormatSet ) { - typedef ::std::map< sal_Int32, sal_Int32 > tNumberformatFrequency; + typedef std::map< sal_Int32, sal_Int32 > tNumberformatFrequency; tNumberformatFrequency aKeyMap; bool bNumberFormatKeyFoundViaAttachedData = false; @@ -512,8 +512,8 @@ void AxisHelper::hideAxisIfNoDataIsAttached( const Reference< XAxis >& xAxis, co { //axis is hidden if no data is attached anymore but data is available bool bOtherSeriesAttachedToThisAxis = false; - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); - ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin(); + std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); + std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin(); for( ; aIt != aSeriesVector.end(); ++aIt) { uno::Reference< chart2::XAxis > xCurrentAxis( DiagramHelper::getAttachedAxis( *aIt, xDiagram ), uno::UNO_QUERY ); @@ -1057,8 +1057,8 @@ Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemOfAxis( xCooSys = aCooSysList[nCooSysIndex]; std::vector< Reference< XAxis > > aAllAxis( AxisHelper::getAllAxesOfCoordinateSystem( xCooSys ) ); - ::std::vector< Reference< XAxis > >::iterator aFound = - ::std::find( aAllAxis.begin(), aAllAxis.end(), xAxis ); + std::vector< Reference< XAxis > >::iterator aFound = + std::find( aAllAxis.begin(), aAllAxis.end(), xAxis ); if( aFound != aAllAxis.end()) { xRet.set( xCooSys ); @@ -1155,8 +1155,8 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys Reference< XChartType > AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisIndex( const Reference< chart2::XDiagram >& xDiagram, const sal_Int32 nAttachedAxisIndex ) { Reference< XChartType > xChartType; - ::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 ); diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index c702a1ab2489..1426a9803fdd 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -144,7 +144,7 @@ Sequence< double > CachedDataSequence::Impl_getNumericalData() const if( m_eCurrentDataType == TEXTUAL ) { const OUString * pTextArray = m_aTextualSequence.getConstArray(); - ::std::transform( pTextArray, pTextArray + nSize, + std::transform( pTextArray, pTextArray + nSize, pResultArray, CommonFunctors::OUStringToDouble() ); } @@ -152,7 +152,7 @@ Sequence< double > CachedDataSequence::Impl_getNumericalData() const { OSL_ASSERT( m_eCurrentDataType == MIXED ); const Any * pMixedArray = m_aMixedSequence.getConstArray(); - ::std::transform( pMixedArray, pMixedArray + nSize, + std::transform( pMixedArray, pMixedArray + nSize, pResultArray, CommonFunctors::AnyToDouble() ); } @@ -174,7 +174,7 @@ Sequence< OUString > CachedDataSequence::Impl_getTextualData() const if( m_eCurrentDataType == NUMERICAL ) { const double * pTextArray = m_aNumericalSequence.getConstArray(); - ::std::transform( pTextArray, pTextArray + nSize, + std::transform( pTextArray, pTextArray + nSize, pResultArray, CommonFunctors::DoubleToOUString() ); } @@ -182,7 +182,7 @@ Sequence< OUString > CachedDataSequence::Impl_getTextualData() const { OSL_ASSERT( m_eCurrentDataType == MIXED ); const Any * pMixedArray = m_aMixedSequence.getConstArray(); - ::std::transform( pMixedArray, pMixedArray + nSize, + std::transform( pMixedArray, pMixedArray + nSize, pResultArray, CommonFunctors::AnyToString() ); } @@ -205,7 +205,7 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const if( m_eCurrentDataType == NUMERICAL ) { const double * pTextArray = m_aNumericalSequence.getConstArray(); - ::std::transform( pTextArray, pTextArray + nSize, + std::transform( pTextArray, pTextArray + nSize, pResultArray, CommonFunctors::makeAny< double >() ); } @@ -213,7 +213,7 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const { OSL_ASSERT( m_eCurrentDataType == TEXTUAL ); const OUString * pMixedArray = m_aTextualSequence.getConstArray(); - ::std::transform( pMixedArray, pMixedArray + nSize, + std::transform( pMixedArray, pMixedArray + nSize, pResultArray, CommonFunctors::makeAny< OUString >() ); } diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index f0a953550e40..663f3b9c96a2 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -51,7 +51,7 @@ namespace chart { void CharacterProperties::AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { // CharacterProperties rOutProperties.push_back( diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index a8314b62d801..9928f41e5d75 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -130,10 +130,10 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem( return XCooSys; } -::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries( +std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries( ChartModel& rModel ) { - ::std::vector< uno::Reference< XDataSeries > > aResult; + std::vector< uno::Reference< XDataSeries > > aResult; uno::Reference< XDiagram > xDiagram = rModel.getFirstDiagram(); if( xDiagram.is()) @@ -142,10 +142,10 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem( return aResult; } -::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries( +std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries( const uno::Reference< XChartDocument > & xChartDoc ) { - ::std::vector< uno::Reference< XDataSeries > > aResult; + std::vector< uno::Reference< XDataSeries > > aResult; uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xChartDoc ); if( xDiagram.is()) @@ -154,7 +154,7 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem( return aResult; } -::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries( +std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries( const uno::Reference< frame::XModel > & xModel ) { return getDataSeries( uno::Reference< chart2::XChartDocument >( xModel, uno::UNO_QUERY )); diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index 985f46035cbe..257c31b8a32b 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -67,7 +67,7 @@ bool ColorPerPointHelper::hasPointOwnProperties( { const sal_Int32 * pBegIt = aIndexList.getConstArray(); const sal_Int32 * pEndIt = pBegIt + aIndexList.getLength(); - return ( ::std::find( pBegIt, pEndIt, nPointIndex ) != pEndIt ); + return ( std::find( pBegIt, pEndIt, nPointIndex ) != pEndIt ); } } diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 2926cc0eabf2..e4792d415ecf 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -64,7 +64,7 @@ protected: private: ConfigColorScheme & m_rListener; - ::std::set< OUString > m_aPropertiesToNotify; + std::set< OUString > m_aPropertiesToNotify; }; ChartConfigItem::ChartConfigItem( ConfigColorScheme & rListener ) : diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index c3b2da5d64aa..2ca3a1d823b1 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence; namespace { -class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > +class lcl_MatchesRole : public std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { public: explicit lcl_MatchesRole( const OUString & aRole, bool bMatchPrefix ) : @@ -218,7 +218,7 @@ Reference< chart2::data::XLabeledDataSequence > const Reference< chart2::data::XLabeledDataSequence > * pBegin = aLabeledSeq.getConstArray(); const Reference< chart2::data::XLabeledDataSequence > * pEnd = pBegin + aLabeledSeq.getLength(); const Reference< chart2::data::XLabeledDataSequence > * pMatch = - ::std::find_if( pBegin, pEnd, lcl_MatchesRole( aRole, bMatchPrefix )); + std::find_if( pBegin, pEnd, lcl_MatchesRole( aRole, bMatchPrefix )); if( pMatch != pEnd ) return *pMatch; @@ -226,21 +226,21 @@ Reference< chart2::data::XLabeledDataSequence > return aNoResult; } -::std::vector< Reference< chart2::data::XLabeledDataSequence > > +std::vector< Reference< chart2::data::XLabeledDataSequence > > getAllDataSequencesByRole( const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aDataSequences, const OUString& aRole, bool bMatchPrefix /* = false */ ) { - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVec; - ::std::remove_copy_if( aDataSequences.getConstArray(), aDataSequences.getConstArray() + aDataSequences.getLength(), - ::std::back_inserter( aResultVec ), - ::std::not1( lcl_MatchesRole( aRole, bMatchPrefix ))); + std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVec; + std::remove_copy_if( aDataSequences.getConstArray(), aDataSequences.getConstArray() + aDataSequences.getLength(), + std::back_inserter( aResultVec ), + std::not1( lcl_MatchesRole( aRole, bMatchPrefix ))); return aResultVec; } std::vector<Reference<css::chart2::data::XLabeledDataSequence> > getAllDataSequences( const uno::Sequence<uno::Reference<chart2::XDataSeries> >& aSeries ) { - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aSeqVec; + std::vector< Reference< chart2::data::XLabeledDataSequence > > aSeqVec; for( sal_Int32 i = 0; i < aSeries.getLength(); ++i ) { @@ -248,8 +248,8 @@ getAllDataSequences( const uno::Sequence<uno::Reference<chart2::XDataSeries> >& if( xSource.is()) { Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeq( xSource->getDataSequences()); - ::std::copy( aSeq.begin(), aSeq.end(), - ::std::back_inserter( aSeqVec )); + std::copy( aSeq.begin(), aSeq.end(), + std::back_inserter( aSeqVec )); } } @@ -427,7 +427,7 @@ void setStackModeAtSeries( aAxisIndexSet.insert(0); } - for( ::std::set< sal_Int32 >::const_iterator aIt = aAxisIndexSet.begin(); + for( std::set< sal_Int32 >::const_iterator aIt = aAxisIndexSet.begin(); aIt != aAxisIndexSet.end(); ++aIt ) { sal_Int32 nAxisIndex = *aIt; @@ -522,10 +522,10 @@ void deleteSeries( try { Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY_THROW ); - ::std::vector< Reference< chart2::XDataSeries > > aSeries( + std::vector< Reference< chart2::XDataSeries > > aSeries( ContainerHelper::SequenceToVector( xSeriesCnt->getDataSeries())); - ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt = - ::std::find( aSeries.begin(), aSeries.end(), xSeries ); + std::vector< Reference< chart2::XDataSeries > >::iterator aIt = + std::find( aSeries.begin(), aSeries.end(), xSeries ); if( aIt != aSeries.end()) { aSeries.erase( aIt ); @@ -737,8 +737,8 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenIndicesSeq; if( aHiddenIndicesSeq.getLength() ) { - ::std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) ); - ::std::sort( aHiddenIndices.begin(), aHiddenIndices.end() ); + std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) ); + std::sort( aHiddenIndices.begin(), aHiddenIndices.end() ); sal_Int32 nHiddenCount = static_cast<sal_Int32>(aHiddenIndices.size()); for( sal_Int32 nN = 0; nN < nHiddenCount; ++nN) @@ -822,8 +822,8 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { - ::std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) ); - ::std::vector< sal_Int32 >::iterator aIt = ::std::find( aIndices.begin(), aIndices.end(), nPointIndex ); + std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) ); + std::vector< sal_Int32 >::iterator aIt = std::find( aIndices.begin(), aIndices.end(), nPointIndex ); if( aIt != aIndices.end()) xProp = xSeries->getDataPointByIndex(nPointIndex); else diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 7ddfd660ec9b..7eff294e22ed 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -47,7 +47,7 @@ using ::com::sun::star::uno::Sequence; namespace { -void lcl_addRanges( ::std::vector< OUString > & rOutResult, +void lcl_addRanges( std::vector< OUString > & rOutResult, const uno::Reference< data::XLabeledDataSequence > & xLabeledSeq ) { if( ! xLabeledSeq.is()) @@ -61,7 +61,7 @@ void lcl_addRanges( ::std::vector< OUString > & rOutResult, } void lcl_addDataSourceRanges( - ::std::vector< OUString > & rOutResult, + std::vector< OUString > & rOutResult, const uno::Reference< data::XDataSource > & xDataSource ) { if( xDataSource.is() ) @@ -73,7 +73,7 @@ void lcl_addDataSourceRanges( } void lcl_addErrorBarRanges( - ::std::vector< OUString > & rOutResult, + std::vector< OUString > & rOutResult, const uno::Reference< XDataSeries > & xDataSeries ) { uno::Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY ); @@ -229,7 +229,7 @@ void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoRectangularFormat( const uno::Reference< chart2::XChartDocument >& xChartDoc ) { - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVector; + std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVector; //categories are always the first sequence Reference< chart2::XDiagram > xDiagram( xChartDoc->getFirstDiagram()); @@ -238,7 +238,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR if( xCategories.is() ) aResultVector.push_back( xCategories ); - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); + std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); uno::Reference< chart2::data::XDataSource > xSeriesSource( DataSeriesHelper::getDataSource( comphelper::containerToSequence(aSeriesVector) ) ); Sequence< Reference< chart2::data::XLabeledDataSequence > > aDataSeqences( xSeriesSource->getDataSequences() ); @@ -263,7 +263,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< chart2::XDiagram > & xDiagram ) { - ::std::vector< OUString > aResult; + std::vector< OUString > aResult; if( xDiagram.is()) { @@ -271,8 +271,8 @@ uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( if( xCategories.is() ) lcl_addRanges( aResult, xCategories ); - ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); - for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() ) + std::vector< uno::Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); + for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() ) ; aSeriesIt != aSeriesVector.end(); ++aSeriesIt ) { uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY ); @@ -299,23 +299,23 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData( uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData( const uno::Reference< frame::XModel >& xChartModel ) { - ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult; + std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult; uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); uno::Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) ); if( xCategories.is() ) aResult.push_back( xCategories ); - ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartModel ) ); - for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() ) + std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartModel ) ); + for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() ) ; aSeriesIt != aSeriesVector.end(); ++aSeriesIt ) { uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY ); if( !xDataSource.is() ) continue; uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() ); - ::std::copy( aDataSequences.begin(), aDataSequences.end(), - ::std::back_inserter( aResult )); + std::copy( aDataSequences.begin(), aDataSequences.end(), + std::back_inserter( aResult )); } return uno::Reference< chart2::data::XDataSource >( @@ -325,23 +325,23 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData( uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData( ChartModel& rModel ) { - ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult; + std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult; uno::Reference< XDiagram > xDiagram( rModel.getFirstDiagram() ); uno::Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) ); if( xCategories.is() ) aResult.push_back( xCategories ); - ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( rModel ) ); - for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() ) + std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( rModel ) ); + for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() ) ; aSeriesIt != aSeriesVector.end(); ++aSeriesIt ) { uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY ); if( !xDataSource.is() ) continue; uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() ); - ::std::copy( aDataSequences.begin(), aDataSequences.end(), - ::std::back_inserter( aResult )); + std::copy( aDataSequences.begin(), aDataSequences.end(), + std::back_inserter( aResult )); } return uno::Reference< chart2::data::XDataSource >( @@ -516,7 +516,7 @@ OUString DataSourceHelper::getRangeFromValues( Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference< data::XDataSource > & xSource ) { - ::std::vector< OUString > aResult; + std::vector< OUString > aResult; if( xSource.is()) { Sequence< Reference< data::XLabeledDataSequence > > aLSeqSeq( xSource->getDataSequences()); diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 54e1b52ecf93..c70f7e19c6f4 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -673,11 +673,11 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries( return nullptr; } -::std::vector< Reference< XDataSeries > > +std::vector< Reference< XDataSeries > > DiagramHelper::getDataSeriesFromDiagram( const Reference< XDiagram > & xDiagram ) { - ::std::vector< Reference< XDataSeries > > aResult; + std::vector< Reference< XDataSeries > > aResult; try { @@ -693,8 +693,8 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries( { Reference< XDataSeriesContainer > xDSCnt( aChartTypeSeq[j], uno::UNO_QUERY_THROW ); Sequence< Reference< XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries() ); - ::std::copy( aSeriesSeq.begin(), aSeriesSeq.end(), - ::std::back_inserter( aResult )); + std::copy( aSeriesSeq.begin(), aSeriesSeq.end(), + std::back_inserter( aResult )); } } } @@ -1221,7 +1221,7 @@ Sequence< Reference< XChartType > > DiagramHelper::getChartTypesFromDiagram( const Reference< XDiagram > & xDiagram ) { - ::std::vector< Reference< XChartType > > aResult; + std::vector< Reference< XChartType > > aResult; if(xDiagram.is()) { @@ -1235,8 +1235,8 @@ Sequence< Reference< XChartType > > { Reference< XChartTypeContainer > xCTCnt( aCooSysSeq[i], uno::UNO_QUERY_THROW ); Sequence< Reference< XChartType > > aChartTypeSeq( xCTCnt->getChartTypes()); - ::std::copy( aChartTypeSeq.begin(), aChartTypeSeq.end(), - ::std::back_inserter( aResult )); + std::copy( aChartTypeSeq.begin(), aChartTypeSeq.end(), + std::back_inserter( aResult )); } } catch( const uno::Exception & ex ) @@ -1254,10 +1254,10 @@ bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartTy if( !xFirstType.is() || !xSecondType.is() ) return false; - ::std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) ); - ::std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) ); - ::std::sort( aFirstRoles.begin(), aFirstRoles.end() ); - ::std::sort( aSecondRoles.begin(), aSecondRoles.end() ); + std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) ); + std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) ); + std::sort( aFirstRoles.begin(), aFirstRoles.end() ); + std::sort( aSecondRoles.begin(), aSecondRoles.end() ); return ( aFirstRoles == aSecondRoles ); } @@ -1508,13 +1508,13 @@ sal_Int32 DiagramHelper::getGeometry3D( rbFound = false; rbAmbiguous = false; - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( + std::vector< Reference< chart2::XDataSeries > > aSeriesVec( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); if( aSeriesVec.empty()) rbAmbiguous = true; - 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 @@ -1550,10 +1550,10 @@ void DiagramHelper::setGeometry3D( const Reference< chart2::XDiagram > & xDiagram, sal_Int32 nNewGeometry ) { - ::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 ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 2a7ae2d24f70..6b2c4edb00ca 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::std::vector; +using std::vector; ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2::XCoordinateSystem >& xCooSysModel , ChartModel& rModel ) @@ -98,7 +98,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2: //->split them in the direction of the first series //detect whether the first series is a row or a column bool bSeriesUsesColumns = true; - ::std::vector< Reference< XDataSeries > > aSeries( ChartModelHelper::getDataSeries( mrModel ) ); + std::vector< Reference< XDataSeries > > aSeries( ChartModelHelper::getDataSeries( mrModel ) ); if( !aSeries.empty() ) { uno::Reference< data::XDataSource > xSeriesSource( aSeries.front(), uno::UNO_QUERY ); @@ -266,7 +266,7 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( for( sal_Int32 nN=0; nN<nMaxCount; nN++ ) { const OUString& aCurrent = rStrings[nN]; - if( bCreateSingleCategories || ::std::find( rLimitingBorders.begin(), rLimitingBorders.end(), nN ) != rLimitingBorders.end() ) + if( bCreateSingleCategories || std::find( rLimitingBorders.begin(), rLimitingBorders.end(), nN ) != rLimitingBorders.end() ) { aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) ); nCurrentCount=1; @@ -306,7 +306,7 @@ sal_Int32 lcl_getCategoryCount( std::vector< ComplexCategory >& rComplexCategori Sequence< OUString > lcl_getExplicitSimpleCategories( const SplitCategoriesProvider& rSplitCategoriesProvider, - ::std::vector< ::std::vector< ComplexCategory > >& rComplexCats ) + std::vector< std::vector< ComplexCategory > >& rComplexCats ) { Sequence< OUString > aRet; @@ -466,7 +466,7 @@ bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataS rDateCategories.push_back( aDate ); } } - ::std::sort( rDateCategories.begin(), rDateCategories.end() ); + std::sort( rDateCategories.begin(), rDateCategories.end() ); } return bAnyDataFound && bOnlyDatesFound; diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index 064136093a9a..27ba6b63d314 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -34,7 +34,7 @@ namespace chart namespace { -void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties ) +void lcl_AddPropertiesToVector_without_BitmapProperties( std::vector< css::beans::Property > & rOutProperties ) { rOutProperties.push_back( Property( "FillStyle", @@ -99,7 +99,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< css::bea | beans::PropertyAttribute::MAYBEDEFAULT )); } -void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties ) +void lcl_AddPropertiesToVector_only_BitmapProperties( std::vector< css::beans::Property > & rOutProperties ) { rOutProperties.push_back( Property( "FillBitmapName", @@ -200,7 +200,7 @@ void lcl_AddDefaultsToMap_only_BitmapProperties( }//end anonymous namespace void FillProperties::AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { // Fill Properties see service drawing::FillProperties lcl_AddPropertiesToVector_without_BitmapProperties( rOutProperties ); diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index 52c2c971ef5c..0c58e659cdaa 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -35,7 +35,7 @@ namespace { struct lcl_getPropertyStateByHandle : - public ::std::unary_function< sal_Int32, beans::PropertyState > + public std::unary_function< sal_Int32, beans::PropertyState > { explicit lcl_getPropertyStateByHandle( const ::property::impl::ImplOPropertySet::tPropertyMap & rMap ) @@ -55,9 +55,9 @@ private: template< typename K, typename V > struct lcl_eraseMapEntry : - public ::std::unary_function< K, void > + public std::unary_function< K, void > { - explicit lcl_eraseMapEntry( ::std::map< K, V > & rMap ) + explicit lcl_eraseMapEntry( std::map< K, V > & rMap ) : m_rMap( rMap ) {} @@ -67,11 +67,11 @@ struct lcl_eraseMapEntry : } private: - ::std::map< K, V > m_rMap; + std::map< K, V > m_rMap; }; struct lcl_replaceInterfacePropertiesByClones : - public ::std::unary_function< ::property::impl::ImplOPropertySet::tPropertyMap::value_type, void > + public std::unary_function< ::property::impl::ImplOPropertySet::tPropertyMap::value_type, void > { inline void operator() ( ::property::impl::ImplOPropertySet::tPropertyMap::value_type & rProp ) { @@ -97,11 +97,11 @@ ImplOPropertySet::ImplOPropertySet() ImplOPropertySet::ImplOPropertySet( const ImplOPropertySet & rOther ) { - ::std::copy( rOther.m_aProperties.begin(), rOther.m_aProperties.end(), - ::std::inserter( m_aProperties, m_aProperties.begin() )); + std::copy( rOther.m_aProperties.begin(), rOther.m_aProperties.end(), + std::inserter( m_aProperties, m_aProperties.begin() )); // clone interface properties - ::std::for_each( m_aProperties.begin(), m_aProperties.end(), + std::for_each( m_aProperties.begin(), m_aProperties.end(), lcl_replaceInterfacePropertiesByClones()); m_xStyle.set( ::chart::CloneHelper::CreateRefClone< style::XStyle >()( rOther.m_xStyle )); @@ -113,11 +113,11 @@ beans::PropertyState ImplOPropertySet::GetPropertyStateByHandle( sal_Int32 nHand } Sequence< beans::PropertyState > ImplOPropertySet::GetPropertyStatesByHandle( - const ::std::vector< sal_Int32 > & aHandles ) const + const std::vector< sal_Int32 > & aHandles ) const { Sequence< beans::PropertyState > aResult( aHandles.size()); - ::std::transform( aHandles.begin(), aHandles.end(), + std::transform( aHandles.begin(), aHandles.end(), aResult.getArray(), lcl_getPropertyStateByHandle( m_aProperties )); @@ -135,9 +135,9 @@ void ImplOPropertySet::SetPropertyToDefault( sal_Int32 nHandle ) } void ImplOPropertySet::SetPropertiesToDefault( - const ::std::vector< sal_Int32 > & aHandles ) + const std::vector< sal_Int32 > & aHandles ) { - ::std::for_each( aHandles.begin(), aHandles.end(), + std::for_each( aHandles.begin(), aHandles.end(), lcl_eraseMapEntry< sal_Int32, Any >( m_aProperties ) ); } diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx index 0881c89e4ac4..7b4f440c69fb 100644 --- a/chart2/source/tools/ImplOPropertySet.hxx +++ b/chart2/source/tools/ImplOPropertySet.hxx @@ -43,10 +43,10 @@ public: GetPropertyStateByHandle( sal_Int32 nHandle ) const; css::uno::Sequence< css::beans::PropertyState > - GetPropertyStatesByHandle( const ::std::vector< sal_Int32 > & aHandles ) const; + GetPropertyStatesByHandle( const std::vector< sal_Int32 > & aHandles ) const; void SetPropertyToDefault( sal_Int32 nHandle ); - void SetPropertiesToDefault( const ::std::vector< sal_Int32 > & aHandles ); + void SetPropertiesToDefault( const std::vector< sal_Int32 > & aHandles ); void SetAllPropertiesToDefault(); /** @param rValue is set to the value for the property given in nHandle. If @@ -69,7 +69,7 @@ public: GetStyle() const { return m_xStyle;} typedef - ::std::map< sal_Int32, css::uno::Any > + std::map< sal_Int32, css::uno::Any > tPropertyMap; private: diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index da87d33a430f..e24695621824 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -66,7 +66,7 @@ private: }; template< typename T > - Sequence< T > lcl_ValarrayToSequence( const ::std::valarray< T > & rValarray ) + Sequence< T > lcl_ValarrayToSequence( const std::valarray< T > & rValarray ) { // is there a more elegant way of conversion? Sequence< T > aResult( rValarray.size()); @@ -137,7 +137,7 @@ void InternalData::setData( const Sequence< Sequence< double > >& rDataInRows ) for( sal_Int32 nRow=0; nRow<m_nRowCount; ++nRow ) { int nDataIdx = nRow*m_nColumnCount; - const sal_Int32 nMax = ::std::min( rDataInRows[nRow].getLength(), m_nColumnCount ); + const sal_Int32 nMax = std::min( rDataInRows[nRow].getLength(), m_nColumnCount ); for( sal_Int32 nCol=0; nCol < nMax; ++nCol ) { m_aData[nDataIdx] = rDataInRows[nRow][nCol]; @@ -152,7 +152,7 @@ Sequence< Sequence< double > > InternalData::getData() const for( sal_Int32 i=0; i<m_nRowCount; ++i ) aResult[i] = lcl_ValarrayToSequence< tDataType::value_type >( - m_aData[ ::std::slice( i*m_nColumnCount, m_nColumnCount, 1 ) ] ); + m_aData[ std::slice( i*m_nColumnCount, m_nColumnCount, 1 ) ] ); return aResult; } @@ -161,14 +161,14 @@ Sequence< double > InternalData::getColumnValues( sal_Int32 nColumnIndex ) const { if( nColumnIndex >= 0 && nColumnIndex < m_nColumnCount ) return lcl_ValarrayToSequence< tDataType::value_type >( - m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] ); + m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] ); return Sequence< double >(); } Sequence< double > InternalData::getRowValues( sal_Int32 nRowIndex ) const { if( nRowIndex >= 0 && nRowIndex < m_nRowCount ) return lcl_ValarrayToSequence< tDataType::value_type >( - m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ] ); + m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ] ); return Sequence< double >(); } @@ -178,10 +178,10 @@ void InternalData::setColumnValues( sal_Int32 nColumnIndex, const vector< double return; enlargeData( nColumnIndex + 1, rNewData.size() ); - tDataType aSlice = m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ]; + tDataType aSlice = m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ]; for( vector< double >::size_type i = 0; i < rNewData.size(); ++i ) aSlice[i] = rNewData[i]; - m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] = aSlice; + m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] = aSlice; } void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > & rNewData ) @@ -190,10 +190,10 @@ void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > & r return; enlargeData( rNewData.size(), nRowIndex+1 ); - tDataType aSlice = m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]; + tDataType aSlice = m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]; for( vector< double >::size_type i = 0; i < rNewData.size(); ++i ) aSlice[i] = rNewData[i]; - m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]= aSlice; + m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]= aSlice; } void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, const vector< uno::Any >& rComplexLabel ) @@ -279,8 +279,8 @@ void InternalData::swapColumnWithNext( sal_Int32 nColumnIndex ) bool InternalData::enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount ) { - sal_Int32 nNewColumnCount( ::std::max<sal_Int32>( m_nColumnCount, nColumnCount ) ); - sal_Int32 nNewRowCount( ::std::max<sal_Int32>( m_nRowCount, nRowCount ) ); + sal_Int32 nNewColumnCount( std::max<sal_Int32>( m_nColumnCount, nColumnCount ) ); + sal_Int32 nNewRowCount( std::max<sal_Int32>( m_nRowCount, nRowCount ) ); sal_Int32 nNewSize( nNewColumnCount*nNewRowCount ); bool bGrow = (nNewSize > m_nColumnCount*m_nRowCount); @@ -293,8 +293,8 @@ bool InternalData::enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount ) // copy old data for( int nCol=0; nCol<m_nColumnCount; ++nCol ) static_cast< tDataType >( - aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] ) = - m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ]; + aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] ) = + m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ]; m_aData.resize( nNewSize ); m_aData = aNewData; @@ -320,13 +320,13 @@ void InternalData::insertColumn( sal_Int32 nAfterIndex ) // copy old data int nCol=0; for( ; nCol<=nAfterIndex; ++nCol ) - aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] = + aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] = static_cast< tDataType >( - m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ] ); + m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ] ); for( ++nCol; nCol<nNewColumnCount; ++nCol ) - aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] = + aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] = static_cast< tDataType >( - m_aData[ ::std::slice( nCol - 1, m_nRowCount, m_nColumnCount ) ] ); + m_aData[ std::slice( nCol - 1, m_nRowCount, m_nColumnCount ) ] ); m_nColumnCount = nNewColumnCount; m_aData.resize( nNewSize ); @@ -376,16 +376,16 @@ void InternalData::insertRow( sal_Int32 nAfterIndex ) // copy old data sal_Int32 nIndex = nAfterIndex + 1; - aNewData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] = + aNewData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] = static_cast< tDataType >( - m_aData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] ); + m_aData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] ); if( nIndex < m_nRowCount ) { sal_Int32 nRemainingCount = m_nColumnCount * (m_nRowCount - nIndex); - aNewData[ ::std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] = + aNewData[ std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] = static_cast< tDataType >( - m_aData[ ::std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] ); + m_aData[ std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] ); } m_nRowCount = nNewRowCount; @@ -414,13 +414,13 @@ void InternalData::deleteColumn( sal_Int32 nAtIndex ) // copy old data int nCol=0; for( ; nCol<nAtIndex; ++nCol ) - aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] = + aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] = static_cast< tDataType >( - m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ] ); + m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ] ); for( ; nCol<nNewColumnCount; ++nCol ) - aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] = + aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] = static_cast< tDataType >( - m_aData[ ::std::slice( nCol + 1, m_nRowCount, m_nColumnCount ) ] ); + m_aData[ std::slice( nCol + 1, m_nRowCount, m_nColumnCount ) ] ); m_nColumnCount = nNewColumnCount; m_aData.resize( nNewSize ); @@ -448,16 +448,16 @@ void InternalData::deleteRow( sal_Int32 nAtIndex ) // copy old data sal_Int32 nIndex = nAtIndex; if( nIndex ) - aNewData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] = + aNewData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] = static_cast< tDataType >( - m_aData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] ); + m_aData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] ); if( nIndex < nNewRowCount ) { sal_Int32 nRemainingCount = m_nColumnCount * (nNewRowCount - nIndex); - aNewData[ ::std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] = + aNewData[ std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] = static_cast< tDataType >( - m_aData[ ::std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] ); + m_aData[ std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] ); } m_nRowCount = nNewRowCount; @@ -539,7 +539,7 @@ void InternalData::dump() const for (sal_Int32 nRow = 0; nRow < m_nRowCount; ++nRow) { - tDataType aSlice( m_aData[ ::std::slice( nRow*m_nColumnCount, m_nColumnCount, 1 ) ] ); + tDataType aSlice( m_aData[ std::slice( nRow*m_nColumnCount, m_nColumnCount, 1 ) ] ); for (sal_Int32 nCol = 0; nCol < m_nColumnCount; ++nCol) aPrinter.set(nRow, nCol, OUString::number(aSlice[nCol])); } diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 0101867ddbe3..7d3ff92bb828 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -66,7 +66,7 @@ static const char lcl_aCategoriesRoleName[] = "categories"; static const char lcl_aLabelRangePrefix[] = "label "; static const char lcl_aCompleteRange[] = "all"; -typedef ::std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > > +typedef std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > > lcl_tSequenceMap; std::vector< OUString > lcl_AnyToStringSequence( const std::vector< uno::Any >& aAnySeq ) @@ -89,7 +89,7 @@ std::vector< uno::Any > lcl_StringToAnyVector( const css::uno::Sequence< OUStrin return aResult; } -struct lcl_setModified : public ::std::unary_function< lcl_tSequenceMap, void > +struct lcl_setModified : public std::unary_function< lcl_tSequenceMap, void > { void operator() ( const lcl_tSequenceMap::value_type & rMapEntry ) { @@ -104,7 +104,7 @@ struct lcl_setModified : public ::std::unary_function< lcl_tSequenceMap, void > } }; -struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2::XDataSeries >, void > +struct lcl_internalizeSeries : public std::unary_function< Reference< chart2::XDataSeries >, void > { lcl_internalizeSeries( InternalData & rInternalData, InternalDataProvider & rProvider, @@ -133,7 +133,7 @@ struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2:: if( xValues.is() ) { - ::std::vector< double > aValues( ContainerHelper::SequenceToVector( xValues->getNumericalData())); + std::vector< double > aValues( ContainerHelper::SequenceToVector( xValues->getNumericalData())); if( m_bDataInColumns ) m_rInternalData.setColumnValues( nNewIndex, aValues ); else @@ -181,7 +181,7 @@ private: bool m_bDataInColumns; }; -struct lcl_copyFromLevel : public ::std::unary_function< vector< uno::Any >, uno::Any > +struct lcl_copyFromLevel : public std::unary_function< vector< uno::Any >, uno::Any > { public: @@ -200,7 +200,7 @@ private: sal_Int32 m_nLevel; }; -struct lcl_getStringFromLevelVector : public ::std::unary_function< vector< uno::Any >, OUString > +struct lcl_getStringFromLevelVector : public std::unary_function< vector< uno::Any >, OUString > { public: @@ -219,7 +219,7 @@ private: sal_Int32 m_nLevel; }; -struct lcl_setAnyAtLevel : public ::std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > > +struct lcl_setAnyAtLevel : public std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > > { public: @@ -239,7 +239,7 @@ private: sal_Int32 m_nLevel; }; -struct lcl_setAnyAtLevelFromStringSequence : public ::std::binary_function< vector< uno::Any >, OUString, vector< uno::Any > > +struct lcl_setAnyAtLevelFromStringSequence : public std::binary_function< vector< uno::Any >, OUString, vector< uno::Any > > { public: @@ -259,7 +259,7 @@ private: sal_Int32 m_nLevel; }; -struct lcl_insertAnyAtLevel : public ::std::unary_function< vector< uno::Any >, void > +struct lcl_insertAnyAtLevel : public std::unary_function< vector< uno::Any >, void > { public: @@ -282,7 +282,7 @@ private: sal_Int32 m_nLevel; }; -struct lcl_removeAnyAtLevel : public ::std::unary_function< vector< uno::Any >, void > +struct lcl_removeAnyAtLevel : public std::unary_function< vector< uno::Any >, void > { public: @@ -388,7 +388,7 @@ InternalDataProvider::InternalDataProvider( } // data series - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartDoc )); + std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartDoc )); lcl_internalizeSeries ftor( m_aInternalData, *this, bConnectToModel, m_bDataInColumns ); for( const auto& rxScreen : aSeriesVector ) ftor( rxScreen ); @@ -459,8 +459,8 @@ void InternalDataProvider::adaptMapReferences( // erase map values for old index m_aSequenceMap.erase( aRange.first, aRange.second ); // add new entries for values with new index - ::std::copy( aNewElements.begin(), aNewElements.end(), - ::std::inserter( m_aSequenceMap, + std::copy( aNewElements.begin(), aNewElements.end(), + std::inserter( m_aSequenceMap, m_aSequenceMap.upper_bound( rNewRangeRepresentation ))); } @@ -688,7 +688,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData if( aRangeRepresentation == lcl_aCategoriesRangeName ) { //return split complex categories if we have any: - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aComplexCategories; + std::vector< Reference< chart2::data::XLabeledDataSequence > > aComplexCategories; vector< vector< uno::Any > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels()); if( bUseColumns==m_bDataInColumns ) { @@ -714,7 +714,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData OSL_ASSERT( aRangeRepresentation == lcl_aCompleteRange ); - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec; + std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec; // categories if( bHasCategories ) @@ -722,7 +722,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData new LabeledDataSequence( createDataSequenceAndAddToMap( lcl_aCategoriesRangeName, lcl_aCategoriesRoleName ) ) ); // data with labels - ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aDataVec; + std::vector< Reference< chart2::data::XLabeledDataSequence > > aDataVec; const sal_Int32 nCount = (bUseColumns ? m_aInternalData.getColumnCount() : m_aInternalData.getRowCount()); for( sal_Int32 nIdx=0; nIdx<nCount; ++nIdx ) { @@ -753,8 +753,8 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData } //add left over data sequences to result - ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::iterator aIt(aDataVec.begin()); - const ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::const_iterator aEndIt(aDataVec.end()); + std::vector< Reference< chart2::data::XLabeledDataSequence > >::iterator aIt(aDataVec.begin()); + const std::vector< Reference< chart2::data::XLabeledDataSequence > >::const_iterator aEndIt(aDataVec.end()); for( ;aIt!=aEndIt; ++aIt) { if( aIt->is() ) @@ -1045,14 +1045,14 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel if( nLevel>0 ) { vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels(); - ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertAnyAtLevel(nLevel) ); + std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertAnyAtLevel(nLevel) ); if( m_bDataInColumns ) m_aInternalData.setComplexRowLabels( aComplexCategories ); else m_aInternalData.setComplexColumnLabels( aComplexCategories ); tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName )); - ::std::for_each( aRange.first, aRange.second, lcl_setModified()); + std::for_each( aRange.first, aRange.second, lcl_setModified()); } } void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel ) @@ -1061,14 +1061,14 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel if( nLevel>0 ) { vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels(); - ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeAnyAtLevel(nLevel) ); + std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeAnyAtLevel(nLevel) ); if( m_bDataInColumns ) m_aInternalData.setComplexRowLabels( aComplexCategories ); else m_aInternalData.setComplexColumnLabels( aComplexCategories ); tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName )); - ::std::for_each( aRange.first, aRange.second, lcl_setModified()); + std::for_each( aRange.first, aRange.second, lcl_setModified()); } } @@ -1089,10 +1089,10 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 // notify change to all affected ranges tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); - ::std::for_each( aBegin, aEnd, lcl_setModified()); + std::for_each( aBegin, aEnd, lcl_setModified()); tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName )); - ::std::for_each( aRange.first, aRange.second, lcl_setModified()); + std::for_each( aRange.first, aRange.second, lcl_setModified()); } void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) @@ -1112,10 +1112,10 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 // notify change to all affected ranges tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); - ::std::for_each( aBegin, aEnd, lcl_setModified()); + std::for_each( aBegin, aEnd, lcl_setModified()); tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName )); - ::std::for_each( aRange.first, aRange.second, lcl_setModified()); + std::for_each( aRange.first, aRange.second, lcl_setModified()); } void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) @@ -1131,10 +1131,10 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s // notify change to all affected ranges tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); - ::std::for_each( aBegin, aEnd, lcl_setModified()); + std::for_each( aBegin, aEnd, lcl_setModified()); tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName )); - ::std::for_each( aRange.first, aRange.second, lcl_setModified()); + std::for_each( aRange.first, aRange.second, lcl_setModified()); } void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq ) @@ -1317,7 +1317,7 @@ class SplitCategoriesProvider_ForComplexDescriptions : public SplitCategoriesPro { public: - explicit SplitCategoriesProvider_ForComplexDescriptions( const ::std::vector< ::std::vector< uno::Any > >& rComplexDescriptions ) + explicit SplitCategoriesProvider_ForComplexDescriptions( const std::vector< std::vector< uno::Any > >& rComplexDescriptions ) : m_rComplexDescriptions( rComplexDescriptions ) {} @@ -1325,7 +1325,7 @@ public: virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const override; private: - const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions; + const std::vector< std::vector< uno::Any > >& m_rComplexDescriptions; }; sal_Int32 SplitCategoriesProvider_ForComplexDescriptions::getLevelCount() const diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx index 6f53e7ead77d..e857d2d9a6ae 100644 --- a/chart2/source/tools/LinePropertiesHelper.cxx +++ b/chart2/source/tools/LinePropertiesHelper.cxx @@ -32,7 +32,7 @@ namespace chart { void LinePropertiesHelper::AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { // Line Properties see service drawing::LineProperties rOutProperties.push_back( diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 44fd89e248e8..2aa55ef38d73 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -59,8 +59,8 @@ void lcl_fireModifyEvent( } } -struct lcl_weakReferenceToSame : public ::std::unary_function< - ::std::pair< +struct lcl_weakReferenceToSame : public std::unary_function< + std::pair< css::uno::WeakReference< css::util::XModifyListener >, css::uno::Reference< css::util::XModifyListener > >, bool > @@ -131,7 +131,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene // look up fitting helper class that has been added Reference< util::XModifyListener > xListenerToRemove( aListener ); tListenerMap::iterator aIt( - ::std::find_if( m_aListenerMap.begin(), m_aListenerMap.end(), lcl_weakReferenceToSame( aListener ))); + std::find_if( m_aListenerMap.begin(), m_aListenerMap.end(), lcl_weakReferenceToSame( aListener ))); if( aIt != m_aListenerMap.end()) { xListenerToRemove.set( (*aIt).second ); diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index dbf192bd6690..5acadad16bee 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -122,7 +122,7 @@ Sequence< beans::PropertyState > SAL_CALL std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ aPropertyName.getLength() ]); rPH.fillHandles( pHandles.get(), aPropertyName ); - ::std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyName.getLength()); + std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyName.getLength()); pHandles.reset(); return m_pImplProperties->GetPropertyStatesByHandle( aHandles ); @@ -165,7 +165,7 @@ void SAL_CALL std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ aPropertyNames.getLength() ]); rPH.fillHandles( pHandles.get(), aPropertyNames ); - ::std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyNames.getLength()); + std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyNames.getLength()); pHandles.reset(); m_pImplProperties->SetPropertiesToDefault( aHandles ); diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 1887477fd418..8741037b6014 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -36,7 +36,7 @@ using ::com::sun::star::uno::Reference; namespace { -struct lcl_EqualsElement : public ::std::unary_function< OUString, bool > +struct lcl_EqualsElement : public std::unary_function< OUString, bool > { explicit lcl_EqualsElement( const Any & rValue, const Reference< container::XNameAccess > & xAccess ) : m_aValue( rValue ), m_xAccess( xAccess ) @@ -62,7 +62,7 @@ private: Reference< container::XNameAccess > m_xAccess; }; -struct lcl_StringMatches : public ::std::unary_function< OUString ,bool > +struct lcl_StringMatches : public std::unary_function< OUString ,bool > { explicit lcl_StringMatches( const OUString & rCmpStr ) : m_aCmpStr( rCmpStr ) @@ -77,7 +77,7 @@ private: OUString m_aCmpStr; }; -struct lcl_OUStringRestToInt32 : public ::std::unary_function< OUString, sal_Int32 > +struct lcl_OUStringRestToInt32 : public std::unary_function< OUString, sal_Int32 > { explicit lcl_OUStringRestToInt32( sal_Int32 nPrefixLength ) : m_nPrefixLength( nPrefixLength ) @@ -119,9 +119,9 @@ OUString lcl_addNamedPropertyUniqueNameToTable( try { Reference< container::XNameAccess > xNameAccess( xNameContainer, uno::UNO_QUERY_THROW ); - ::std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames())); - ::std::vector< OUString >::const_iterator aIt( - ::std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess ))); + std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames())); + std::vector< OUString >::const_iterator aIt( + std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess ))); // element not found in container if( aIt == aNames.end()) @@ -131,7 +131,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable( // check if preferred name is already used if( !rPreferredName.isEmpty()) { - aIt = ::std::find( aNames.begin(), aNames.end(), rPreferredName ); + aIt = std::find( aNames.begin(), aNames.end(), rPreferredName ); if( aIt == aNames.end()) aUniqueName = rPreferredName; } @@ -139,14 +139,14 @@ OUString lcl_addNamedPropertyUniqueNameToTable( if( aUniqueName.isEmpty()) { // create a unique id using the prefix plus a number - ::std::vector< sal_Int32 > aNumbers; - ::std::vector< OUString >::iterator aNonConstIt( - ::std::partition( aNames.begin(), aNames.end(), lcl_StringMatches( rPrefix ))); - ::std::transform( aNames.begin(), aNonConstIt, + std::vector< sal_Int32 > aNumbers; + std::vector< OUString >::iterator aNonConstIt( + std::partition( aNames.begin(), aNames.end(), lcl_StringMatches( rPrefix ))); + std::transform( aNames.begin(), aNonConstIt, back_inserter( aNumbers ), lcl_OUStringRestToInt32( rPrefix.getLength() )); - ::std::vector< sal_Int32 >::const_iterator aMaxIt( - ::std::max_element( aNumbers.begin(), aNumbers.end())); + std::vector< sal_Int32 >::const_iterator aMaxIt( + std::max_element( aNumbers.begin(), aNumbers.end())); sal_Int32 nIndex = 1; if( aMaxIt != aNumbers.end()) diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 13c107a6d2b2..6c7a5d5ae156 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -268,7 +268,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface if( xSource.is() ) { sal_Int32 nPreferredColor = defaultPreferredColor; - ::std::vector< chart2::data::HighlightedRange > aHilightedRanges; + std::vector< chart2::data::HighlightedRange > aHilightedRanges; Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeqSeq( xSource->getDataSequences()); for( sal_Int32 i=0; i<aLSeqSeq.getLength(); ++i ) { diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 036699648163..0510f278762a 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -95,10 +95,10 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries() Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartDoc )); // DataSeries/Points - ::std::vector< Reference< XDataSeries > > aSeries( + std::vector< Reference< XDataSeries > > aSeries( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); - for( ::std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin()); + for( std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin()); aIt != aSeries.end(); ++aIt ) { Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY ); @@ -266,10 +266,10 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState } // DataSeries/Points - ::std::vector< Reference< XDataSeries > > aSeries( + std::vector< Reference< XDataSeries > > aSeries( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); - for( ::std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin()); + for( std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin()); aIt != aSeries.end(); ++aIt ) { Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY ); diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 96b55ec76063..10c6edf7e35f 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -407,7 +407,7 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine( { uno::Sequence< uno::Reference< chart2::XRegressionCurve > > aCurves( xRegCnt->getRegressionCurves()); - ::std::vector< uno::Reference< chart2::XRegressionCurve > > aCurvesToDelete; + std::vector< uno::Reference< chart2::XRegressionCurve > > aCurvesToDelete; for( sal_Int32 i = 0; i < aCurves.getLength(); ++i ) { if( ! isMeanValueLine( aCurves[i] )) @@ -416,7 +416,7 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine( } } - for( ::std::vector< uno::Reference< chart2::XRegressionCurve > >::const_iterator aIt = aCurvesToDelete.begin(); + for( std::vector< uno::Reference< chart2::XRegressionCurve > >::const_iterator aIt = aCurvesToDelete.begin(); aIt != aCurvesToDelete.end(); ++aIt ) { xRegCnt->removeRegressionCurve( *aIt ); diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 136c687e8174..e90296fc4227 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -66,7 +66,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "PolynomialDegree", @@ -142,11 +142,11 @@ struct StaticRegressionCurveInfoHelper_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 ); - ::std::sort( aProperties.begin(), aProperties.end(), + std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); return comphelper::containerToSequence( aProperties ); diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index ab13afc027a1..d72298fee60e 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -58,7 +58,7 @@ enum }; void lcl_AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "ShowEquation", @@ -157,14 +157,14 @@ struct StaticRegressionEquationInfoHelper_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 ); ::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/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index a654b8dc01ea..dfe44a0bbc69 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -36,7 +36,7 @@ namespace chart { void SceneProperties::AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { // transformation matrix rOutProperties.push_back( diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index e9e7c45e7702..b7c448eb7124 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -1310,7 +1310,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( drawing::LineStyle aLineStyle( drawing::LineStyle_SOLID ); - ::std::vector< uno::Reference< XDataSeries > > aSeriesList( + std::vector< uno::Reference< XDataSeries > > aSeriesList( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() ); @@ -1410,7 +1410,7 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines( uno::Any aALineStyle( aLineStyle); uno::Any aARoundedEdges( static_cast< sal_Int16 >( nRoundedEdges )); - ::std::vector< uno::Reference< XDataSeries > > aSeriesList( + std::vector< uno::Reference< XDataSeries > > aSeriesList( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() ); for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS ) diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 3ec0ff23343e..e942b6eaeb5b 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -174,7 +174,7 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() { Sequence< uno::Any > aValues( m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation )); aResult.realloc( aValues.getLength()); - ::std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), + std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), aResult.getArray(), CommonFunctors::AnyToDouble()); } return aResult; @@ -189,7 +189,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() { Sequence< uno::Any > aValues( m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation )); aResult.realloc( aValues.getLength()); - ::std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), + std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), aResult.getArray(), CommonFunctors::AnyToString()); } return aResult; diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index 37ce9727e4a6..730b4fc46298 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -30,7 +30,7 @@ namespace chart { void UserDefinedProperties::AddPropertiesToVector( - ::std::vector< Property > & rOutProperties ) + std::vector< Property > & rOutProperties ) { rOutProperties.push_back( Property( "ChartUserDefinedAttributes", diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 84195460e1a0..f90bc4f248ae 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -88,7 +88,7 @@ void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedPrope addIgnoreFillProperties_only_BitmapProperties( rList ); } -void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( ::std::vector< WrappedProperty* >& rList ) +void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( std::vector< WrappedProperty* >& rList ) { rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::Any( sal_Int32(-1) ) ) ); @@ -102,7 +102,7 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::Any( false ) ) ); } -void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList ) +void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( std::vector< WrappedProperty* >& rList ) { // rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::Any( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::Any( uno::Reference< awt::XBitmap > (0) ) ) ); diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index 3fade3573ece..e537054abd64 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -31,7 +31,7 @@ namespace array (which you can get from an OUString with getStr()) and puts the result into the OUStringBuffer given in the CTOR */ -class lcl_Escape : public ::std::unary_function< sal_Unicode, void > +class lcl_Escape : public std::unary_function< sal_Unicode, void > { public: explicit lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} @@ -54,7 +54,7 @@ private: you can get from an OUString with getStr()) and puts the result into the OUStringBuffer given in the CTOR */ -class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void > +class lcl_UnEscape : public std::unary_function< sal_Unicode, void > { public: explicit lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} @@ -186,7 +186,7 @@ bool lcl_getCellAddressFromXMLString( const sal_Unicode * pTableName = rXMLString.getStr(); // remove escapes from table name - ::std::for_each( pTableName + nStartPos, + std::for_each( pTableName + nStartPos, pTableName + nDelimiterPos, lcl_UnEscape( aTableNameBuffer )); @@ -367,7 +367,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange ) const sal_Unicode * pTableNameBeg = rRange.aTableName.getStr(); // append the quoted string at the buffer - ::std::for_each( pTableNameBeg, + std::for_each( pTableNameBeg, pTableNameBeg + rRange.aTableName.getLength(), lcl_Escape( aBuffer ) ); } 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 ) { |