diff options
Diffstat (limited to 'chart2/source/controller')
73 files changed, 248 insertions, 248 deletions
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(); |