summaryrefslogtreecommitdiff
path: root/chart2/source/tools
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-02-15 23:55:18 +0200
committerTor Lillqvist <tml@collabora.com>2017-02-15 23:01:23 +0000
commit6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 (patch)
tree3f669db44367a2a072b899a1a1b87eb25ee607af /chart2/source/tools
parent3e1e49561bb734475d2b7d1db1beef0d3e9b53cd (diff)
Drop :: prefix from std in c*/
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155 Reviewed-on: https://gerrit.libreoffice.org/34324 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'chart2/source/tools')
-rw-r--r--chart2/source/tools/AxisHelper.cxx16
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx12
-rw-r--r--chart2/source/tools/CharacterProperties.cxx2
-rw-r--r--chart2/source/tools/ChartModelHelper.cxx10
-rw-r--r--chart2/source/tools/ColorPerPointHelper.cxx2
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx2
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx36
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx38
-rw-r--r--chart2/source/tools/DiagramHelper.cxx30
-rw-r--r--chart2/source/tools/ExplicitCategoriesProvider.cxx10
-rw-r--r--chart2/source/tools/FillProperties.cxx6
-rw-r--r--chart2/source/tools/ImplOPropertySet.cxx24
-rw-r--r--chart2/source/tools/ImplOPropertySet.hxx6
-rw-r--r--chart2/source/tools/InternalData.cxx60
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx60
-rw-r--r--chart2/source/tools/LinePropertiesHelper.cxx2
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx6
-rw-r--r--chart2/source/tools/OPropertySet.cxx4
-rw-r--r--chart2/source/tools/PropertyHelper.cxx26
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx2
-rw-r--r--chart2/source/tools/ReferenceSizeProvider.cxx8
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx4
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx6
-rw-r--r--chart2/source/tools/RegressionEquation.cxx6
-rw-r--r--chart2/source/tools/SceneProperties.cxx2
-rw-r--r--chart2/source/tools/ThreeDHelper.cxx4
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx4
-rw-r--r--chart2/source/tools/UserDefinedProperties.cxx2
-rw-r--r--chart2/source/tools/WrappedIgnoreProperty.cxx4
-rw-r--r--chart2/source/tools/XMLRangeHelper.cxx8
30 files changed, 201 insertions, 201 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 6c7215269bd3..d3da454af5e2 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -197,7 +197,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
Reference< data::XDataSource > xSource( DataSourceHelper::getUsedData( xChartDoc ) );
if( xSource.is() )
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues(
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues(
DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), "values-x", true ) );
if( aXValues.empty() )
{
@@ -232,7 +232,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
if( !bFormatSet )
{
- typedef ::std::map< sal_Int32, sal_Int32 > tNumberformatFrequency;
+ typedef std::map< sal_Int32, sal_Int32 > tNumberformatFrequency;
tNumberformatFrequency aKeyMap;
bool bNumberFormatKeyFoundViaAttachedData = false;
@@ -512,8 +512,8 @@ void AxisHelper::hideAxisIfNoDataIsAttached( const Reference< XAxis >& xAxis, co
{
//axis is hidden if no data is attached anymore but data is available
bool bOtherSeriesAttachedToThisAxis = false;
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
- ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin();
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin();
for( ; aIt != aSeriesVector.end(); ++aIt)
{
uno::Reference< chart2::XAxis > xCurrentAxis( DiagramHelper::getAttachedAxis( *aIt, xDiagram ), uno::UNO_QUERY );
@@ -1057,8 +1057,8 @@ Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemOfAxis(
xCooSys = aCooSysList[nCooSysIndex];
std::vector< Reference< XAxis > > aAllAxis( AxisHelper::getAllAxesOfCoordinateSystem( xCooSys ) );
- ::std::vector< Reference< XAxis > >::iterator aFound =
- ::std::find( aAllAxis.begin(), aAllAxis.end(), xAxis );
+ std::vector< Reference< XAxis > >::iterator aFound =
+ std::find( aAllAxis.begin(), aAllAxis.end(), xAxis );
if( aFound != aAllAxis.end())
{
xRet.set( xCooSys );
@@ -1155,8 +1155,8 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys
Reference< XChartType > AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisIndex( const Reference< chart2::XDiagram >& xDiagram, const sal_Int32 nAttachedAxisIndex )
{
Reference< XChartType > xChartType;
- ::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
- ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
+ std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
for( ; aIter != aSeriesVector.end(); ++aIter )
{
sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index c702a1ab2489..1426a9803fdd 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -144,7 +144,7 @@ Sequence< double > CachedDataSequence::Impl_getNumericalData() const
if( m_eCurrentDataType == TEXTUAL )
{
const OUString * pTextArray = m_aTextualSequence.getConstArray();
- ::std::transform( pTextArray, pTextArray + nSize,
+ std::transform( pTextArray, pTextArray + nSize,
pResultArray,
CommonFunctors::OUStringToDouble() );
}
@@ -152,7 +152,7 @@ Sequence< double > CachedDataSequence::Impl_getNumericalData() const
{
OSL_ASSERT( m_eCurrentDataType == MIXED );
const Any * pMixedArray = m_aMixedSequence.getConstArray();
- ::std::transform( pMixedArray, pMixedArray + nSize,
+ std::transform( pMixedArray, pMixedArray + nSize,
pResultArray,
CommonFunctors::AnyToDouble() );
}
@@ -174,7 +174,7 @@ Sequence< OUString > CachedDataSequence::Impl_getTextualData() const
if( m_eCurrentDataType == NUMERICAL )
{
const double * pTextArray = m_aNumericalSequence.getConstArray();
- ::std::transform( pTextArray, pTextArray + nSize,
+ std::transform( pTextArray, pTextArray + nSize,
pResultArray,
CommonFunctors::DoubleToOUString() );
}
@@ -182,7 +182,7 @@ Sequence< OUString > CachedDataSequence::Impl_getTextualData() const
{
OSL_ASSERT( m_eCurrentDataType == MIXED );
const Any * pMixedArray = m_aMixedSequence.getConstArray();
- ::std::transform( pMixedArray, pMixedArray + nSize,
+ std::transform( pMixedArray, pMixedArray + nSize,
pResultArray,
CommonFunctors::AnyToString() );
}
@@ -205,7 +205,7 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const
if( m_eCurrentDataType == NUMERICAL )
{
const double * pTextArray = m_aNumericalSequence.getConstArray();
- ::std::transform( pTextArray, pTextArray + nSize,
+ std::transform( pTextArray, pTextArray + nSize,
pResultArray,
CommonFunctors::makeAny< double >() );
}
@@ -213,7 +213,7 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const
{
OSL_ASSERT( m_eCurrentDataType == TEXTUAL );
const OUString * pMixedArray = m_aTextualSequence.getConstArray();
- ::std::transform( pMixedArray, pMixedArray + nSize,
+ std::transform( pMixedArray, pMixedArray + nSize,
pResultArray,
CommonFunctors::makeAny< OUString >() );
}
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index f0a953550e40..663f3b9c96a2 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -51,7 +51,7 @@ namespace chart
{
void CharacterProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// CharacterProperties
rOutProperties.push_back(
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index a8314b62d801..9928f41e5d75 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -130,10 +130,10 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
return XCooSys;
}
-::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
+std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
ChartModel& rModel )
{
- ::std::vector< uno::Reference< XDataSeries > > aResult;
+ std::vector< uno::Reference< XDataSeries > > aResult;
uno::Reference< XDiagram > xDiagram = rModel.getFirstDiagram();
if( xDiagram.is())
@@ -142,10 +142,10 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
return aResult;
}
-::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
+std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
const uno::Reference< XChartDocument > & xChartDoc )
{
- ::std::vector< uno::Reference< XDataSeries > > aResult;
+ std::vector< uno::Reference< XDataSeries > > aResult;
uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xChartDoc );
if( xDiagram.is())
@@ -154,7 +154,7 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
return aResult;
}
-::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
+std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
const uno::Reference< frame::XModel > & xModel )
{
return getDataSeries( uno::Reference< chart2::XChartDocument >( xModel, uno::UNO_QUERY ));
diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx
index 985f46035cbe..257c31b8a32b 100644
--- a/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/chart2/source/tools/ColorPerPointHelper.cxx
@@ -67,7 +67,7 @@ bool ColorPerPointHelper::hasPointOwnProperties(
{
const sal_Int32 * pBegIt = aIndexList.getConstArray();
const sal_Int32 * pEndIt = pBegIt + aIndexList.getLength();
- return ( ::std::find( pBegIt, pEndIt, nPointIndex ) != pEndIt );
+ return ( std::find( pBegIt, pEndIt, nPointIndex ) != pEndIt );
}
}
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 2926cc0eabf2..e4792d415ecf 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -64,7 +64,7 @@ protected:
private:
ConfigColorScheme & m_rListener;
- ::std::set< OUString > m_aPropertiesToNotify;
+ std::set< OUString > m_aPropertiesToNotify;
};
ChartConfigItem::ChartConfigItem( ConfigColorScheme & rListener ) :
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index c3b2da5d64aa..2ca3a1d823b1 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
+class lcl_MatchesRole : public std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
{
public:
explicit lcl_MatchesRole( const OUString & aRole, bool bMatchPrefix ) :
@@ -218,7 +218,7 @@ Reference< chart2::data::XLabeledDataSequence >
const Reference< chart2::data::XLabeledDataSequence > * pBegin = aLabeledSeq.getConstArray();
const Reference< chart2::data::XLabeledDataSequence > * pEnd = pBegin + aLabeledSeq.getLength();
const Reference< chart2::data::XLabeledDataSequence > * pMatch =
- ::std::find_if( pBegin, pEnd, lcl_MatchesRole( aRole, bMatchPrefix ));
+ std::find_if( pBegin, pEnd, lcl_MatchesRole( aRole, bMatchPrefix ));
if( pMatch != pEnd )
return *pMatch;
@@ -226,21 +226,21 @@ Reference< chart2::data::XLabeledDataSequence >
return aNoResult;
}
-::std::vector< Reference< chart2::data::XLabeledDataSequence > >
+std::vector< Reference< chart2::data::XLabeledDataSequence > >
getAllDataSequencesByRole( const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aDataSequences,
const OUString& aRole, bool bMatchPrefix /* = false */ )
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVec;
- ::std::remove_copy_if( aDataSequences.getConstArray(), aDataSequences.getConstArray() + aDataSequences.getLength(),
- ::std::back_inserter( aResultVec ),
- ::std::not1( lcl_MatchesRole( aRole, bMatchPrefix )));
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVec;
+ std::remove_copy_if( aDataSequences.getConstArray(), aDataSequences.getConstArray() + aDataSequences.getLength(),
+ std::back_inserter( aResultVec ),
+ std::not1( lcl_MatchesRole( aRole, bMatchPrefix )));
return aResultVec;
}
std::vector<Reference<css::chart2::data::XLabeledDataSequence> >
getAllDataSequences( const uno::Sequence<uno::Reference<chart2::XDataSeries> >& aSeries )
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aSeqVec;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aSeqVec;
for( sal_Int32 i = 0; i < aSeries.getLength(); ++i )
{
@@ -248,8 +248,8 @@ getAllDataSequences( const uno::Sequence<uno::Reference<chart2::XDataSeries> >&
if( xSource.is())
{
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeq( xSource->getDataSequences());
- ::std::copy( aSeq.begin(), aSeq.end(),
- ::std::back_inserter( aSeqVec ));
+ std::copy( aSeq.begin(), aSeq.end(),
+ std::back_inserter( aSeqVec ));
}
}
@@ -427,7 +427,7 @@ void setStackModeAtSeries(
aAxisIndexSet.insert(0);
}
- for( ::std::set< sal_Int32 >::const_iterator aIt = aAxisIndexSet.begin();
+ for( std::set< sal_Int32 >::const_iterator aIt = aAxisIndexSet.begin();
aIt != aAxisIndexSet.end(); ++aIt )
{
sal_Int32 nAxisIndex = *aIt;
@@ -522,10 +522,10 @@ void deleteSeries(
try
{
Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY_THROW );
- ::std::vector< Reference< chart2::XDataSeries > > aSeries(
+ std::vector< Reference< chart2::XDataSeries > > aSeries(
ContainerHelper::SequenceToVector( xSeriesCnt->getDataSeries()));
- ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt =
- ::std::find( aSeries.begin(), aSeries.end(), xSeries );
+ std::vector< Reference< chart2::XDataSeries > >::iterator aIt =
+ std::find( aSeries.begin(), aSeries.end(), xSeries );
if( aIt != aSeries.end())
{
aSeries.erase( aIt );
@@ -737,8 +737,8 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere
xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenIndicesSeq;
if( aHiddenIndicesSeq.getLength() )
{
- ::std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) );
- ::std::sort( aHiddenIndices.begin(), aHiddenIndices.end() );
+ std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) );
+ std::sort( aHiddenIndices.begin(), aHiddenIndices.end() );
sal_Int32 nHiddenCount = static_cast<sal_Int32>(aHiddenIndices.size());
for( sal_Int32 nN = 0; nN < nHiddenCount; ++nN)
@@ -822,8 +822,8 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I
uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList )
{
- ::std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
- ::std::vector< sal_Int32 >::iterator aIt = ::std::find( aIndices.begin(), aIndices.end(), nPointIndex );
+ std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
+ std::vector< sal_Int32 >::iterator aIt = std::find( aIndices.begin(), aIndices.end(), nPointIndex );
if( aIt != aIndices.end())
xProp = xSeries->getDataPointByIndex(nPointIndex);
else
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 7ddfd660ec9b..7eff294e22ed 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -47,7 +47,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-void lcl_addRanges( ::std::vector< OUString > & rOutResult,
+void lcl_addRanges( std::vector< OUString > & rOutResult,
const uno::Reference< data::XLabeledDataSequence > & xLabeledSeq )
{
if( ! xLabeledSeq.is())
@@ -61,7 +61,7 @@ void lcl_addRanges( ::std::vector< OUString > & rOutResult,
}
void lcl_addDataSourceRanges(
- ::std::vector< OUString > & rOutResult,
+ std::vector< OUString > & rOutResult,
const uno::Reference< data::XDataSource > & xDataSource )
{
if( xDataSource.is() )
@@ -73,7 +73,7 @@ void lcl_addDataSourceRanges(
}
void lcl_addErrorBarRanges(
- ::std::vector< OUString > & rOutResult,
+ std::vector< OUString > & rOutResult,
const uno::Reference< XDataSeries > & xDataSeries )
{
uno::Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY );
@@ -229,7 +229,7 @@ void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue
uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoRectangularFormat(
const uno::Reference< chart2::XChartDocument >& xChartDoc )
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVector;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVector;
//categories are always the first sequence
Reference< chart2::XDiagram > xDiagram( xChartDoc->getFirstDiagram());
@@ -238,7 +238,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
if( xCategories.is() )
aResultVector.push_back( xCategories );
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
uno::Reference< chart2::data::XDataSource > xSeriesSource(
DataSeriesHelper::getDataSource( comphelper::containerToSequence(aSeriesVector) ) );
Sequence< Reference< chart2::data::XLabeledDataSequence > > aDataSeqences( xSeriesSource->getDataSequences() );
@@ -263,7 +263,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
const uno::Reference< chart2::XDiagram > & xDiagram )
{
- ::std::vector< OUString > aResult;
+ std::vector< OUString > aResult;
if( xDiagram.is())
{
@@ -271,8 +271,8 @@ uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
if( xCategories.is() )
lcl_addRanges( aResult, xCategories );
- ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
- for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
+ std::vector< uno::Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
{
uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
@@ -299,23 +299,23 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
const uno::Reference< frame::XModel >& xChartModel )
{
- ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
uno::Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) );
if( xCategories.is() )
aResult.push_back( xCategories );
- ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartModel ) );
- for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
+ std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartModel ) );
+ for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
{
uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
if( !xDataSource.is() )
continue;
uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
- ::std::copy( aDataSequences.begin(), aDataSequences.end(),
- ::std::back_inserter( aResult ));
+ std::copy( aDataSequences.begin(), aDataSequences.end(),
+ std::back_inserter( aResult ));
}
return uno::Reference< chart2::data::XDataSource >(
@@ -325,23 +325,23 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
ChartModel& rModel )
{
- ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
uno::Reference< XDiagram > xDiagram( rModel.getFirstDiagram() );
uno::Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) );
if( xCategories.is() )
aResult.push_back( xCategories );
- ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( rModel ) );
- for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
+ std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( rModel ) );
+ for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
{
uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
if( !xDataSource.is() )
continue;
uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
- ::std::copy( aDataSequences.begin(), aDataSequences.end(),
- ::std::back_inserter( aResult ));
+ std::copy( aDataSequences.begin(), aDataSequences.end(),
+ std::back_inserter( aResult ));
}
return uno::Reference< chart2::data::XDataSource >(
@@ -516,7 +516,7 @@ OUString DataSourceHelper::getRangeFromValues(
Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference< data::XDataSource > & xSource )
{
- ::std::vector< OUString > aResult;
+ std::vector< OUString > aResult;
if( xSource.is())
{
Sequence< Reference< data::XLabeledDataSequence > > aLSeqSeq( xSource->getDataSequences());
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 54e1b52ecf93..c70f7e19c6f4 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -673,11 +673,11 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
return nullptr;
}
-::std::vector< Reference< XDataSeries > >
+std::vector< Reference< XDataSeries > >
DiagramHelper::getDataSeriesFromDiagram(
const Reference< XDiagram > & xDiagram )
{
- ::std::vector< Reference< XDataSeries > > aResult;
+ std::vector< Reference< XDataSeries > > aResult;
try
{
@@ -693,8 +693,8 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
{
Reference< XDataSeriesContainer > xDSCnt( aChartTypeSeq[j], uno::UNO_QUERY_THROW );
Sequence< Reference< XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries() );
- ::std::copy( aSeriesSeq.begin(), aSeriesSeq.end(),
- ::std::back_inserter( aResult ));
+ std::copy( aSeriesSeq.begin(), aSeriesSeq.end(),
+ std::back_inserter( aResult ));
}
}
}
@@ -1221,7 +1221,7 @@ Sequence< Reference< XChartType > >
DiagramHelper::getChartTypesFromDiagram(
const Reference< XDiagram > & xDiagram )
{
- ::std::vector< Reference< XChartType > > aResult;
+ std::vector< Reference< XChartType > > aResult;
if(xDiagram.is())
{
@@ -1235,8 +1235,8 @@ Sequence< Reference< XChartType > >
{
Reference< XChartTypeContainer > xCTCnt( aCooSysSeq[i], uno::UNO_QUERY_THROW );
Sequence< Reference< XChartType > > aChartTypeSeq( xCTCnt->getChartTypes());
- ::std::copy( aChartTypeSeq.begin(), aChartTypeSeq.end(),
- ::std::back_inserter( aResult ));
+ std::copy( aChartTypeSeq.begin(), aChartTypeSeq.end(),
+ std::back_inserter( aResult ));
}
}
catch( const uno::Exception & ex )
@@ -1254,10 +1254,10 @@ bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartTy
if( !xFirstType.is() || !xSecondType.is() )
return false;
- ::std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
- ::std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
- ::std::sort( aFirstRoles.begin(), aFirstRoles.end() );
- ::std::sort( aSecondRoles.begin(), aSecondRoles.end() );
+ std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
+ std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
+ std::sort( aFirstRoles.begin(), aFirstRoles.end() );
+ std::sort( aSecondRoles.begin(), aSecondRoles.end() );
return ( aFirstRoles == aSecondRoles );
}
@@ -1508,13 +1508,13 @@ sal_Int32 DiagramHelper::getGeometry3D(
rbFound = false;
rbAmbiguous = false;
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
if( aSeriesVec.empty())
rbAmbiguous = true;
- for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
{
try
@@ -1550,10 +1550,10 @@ void DiagramHelper::setGeometry3D(
const Reference< chart2::XDiagram > & xDiagram,
sal_Int32 nNewGeometry )
{
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
{
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 2a7ae2d24f70..6b2c4edb00ca 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::std::vector;
+using std::vector;
ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2::XCoordinateSystem >& xCooSysModel
, ChartModel& rModel )
@@ -98,7 +98,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
//->split them in the direction of the first series
//detect whether the first series is a row or a column
bool bSeriesUsesColumns = true;
- ::std::vector< Reference< XDataSeries > > aSeries( ChartModelHelper::getDataSeries( mrModel ) );
+ std::vector< Reference< XDataSeries > > aSeries( ChartModelHelper::getDataSeries( mrModel ) );
if( !aSeries.empty() )
{
uno::Reference< data::XDataSource > xSeriesSource( aSeries.front(), uno::UNO_QUERY );
@@ -266,7 +266,7 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector(
for( sal_Int32 nN=0; nN<nMaxCount; nN++ )
{
const OUString& aCurrent = rStrings[nN];
- if( bCreateSingleCategories || ::std::find( rLimitingBorders.begin(), rLimitingBorders.end(), nN ) != rLimitingBorders.end() )
+ if( bCreateSingleCategories || std::find( rLimitingBorders.begin(), rLimitingBorders.end(), nN ) != rLimitingBorders.end() )
{
aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) );
nCurrentCount=1;
@@ -306,7 +306,7 @@ sal_Int32 lcl_getCategoryCount( std::vector< ComplexCategory >& rComplexCategori
Sequence< OUString > lcl_getExplicitSimpleCategories(
const SplitCategoriesProvider& rSplitCategoriesProvider,
- ::std::vector< ::std::vector< ComplexCategory > >& rComplexCats )
+ std::vector< std::vector< ComplexCategory > >& rComplexCats )
{
Sequence< OUString > aRet;
@@ -466,7 +466,7 @@ bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataS
rDateCategories.push_back( aDate );
}
}
- ::std::sort( rDateCategories.begin(), rDateCategories.end() );
+ std::sort( rDateCategories.begin(), rDateCategories.end() );
}
return bAnyDataFound && bOnlyDatesFound;
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 064136093a9a..27ba6b63d314 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -34,7 +34,7 @@ namespace chart
namespace
{
-void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties )
+void lcl_AddPropertiesToVector_without_BitmapProperties( std::vector< css::beans::Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "FillStyle",
@@ -99,7 +99,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< css::bea
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
-void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties )
+void lcl_AddPropertiesToVector_only_BitmapProperties( std::vector< css::beans::Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "FillBitmapName",
@@ -200,7 +200,7 @@ void lcl_AddDefaultsToMap_only_BitmapProperties(
}//end anonymous namespace
void FillProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// Fill Properties see service drawing::FillProperties
lcl_AddPropertiesToVector_without_BitmapProperties( rOutProperties );
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index 52c2c971ef5c..0c58e659cdaa 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -35,7 +35,7 @@ namespace
{
struct lcl_getPropertyStateByHandle :
- public ::std::unary_function< sal_Int32, beans::PropertyState >
+ public std::unary_function< sal_Int32, beans::PropertyState >
{
explicit lcl_getPropertyStateByHandle(
const ::property::impl::ImplOPropertySet::tPropertyMap & rMap )
@@ -55,9 +55,9 @@ private:
template< typename K, typename V >
struct lcl_eraseMapEntry :
- public ::std::unary_function< K, void >
+ public std::unary_function< K, void >
{
- explicit lcl_eraseMapEntry( ::std::map< K, V > & rMap )
+ explicit lcl_eraseMapEntry( std::map< K, V > & rMap )
: m_rMap( rMap )
{}
@@ -67,11 +67,11 @@ struct lcl_eraseMapEntry :
}
private:
- ::std::map< K, V > m_rMap;
+ std::map< K, V > m_rMap;
};
struct lcl_replaceInterfacePropertiesByClones :
- public ::std::unary_function< ::property::impl::ImplOPropertySet::tPropertyMap::value_type, void >
+ public std::unary_function< ::property::impl::ImplOPropertySet::tPropertyMap::value_type, void >
{
inline void operator() ( ::property::impl::ImplOPropertySet::tPropertyMap::value_type & rProp )
{
@@ -97,11 +97,11 @@ ImplOPropertySet::ImplOPropertySet()
ImplOPropertySet::ImplOPropertySet( const ImplOPropertySet & rOther )
{
- ::std::copy( rOther.m_aProperties.begin(), rOther.m_aProperties.end(),
- ::std::inserter( m_aProperties, m_aProperties.begin() ));
+ std::copy( rOther.m_aProperties.begin(), rOther.m_aProperties.end(),
+ std::inserter( m_aProperties, m_aProperties.begin() ));
// clone interface properties
- ::std::for_each( m_aProperties.begin(), m_aProperties.end(),
+ std::for_each( m_aProperties.begin(), m_aProperties.end(),
lcl_replaceInterfacePropertiesByClones());
m_xStyle.set( ::chart::CloneHelper::CreateRefClone< style::XStyle >()( rOther.m_xStyle ));
@@ -113,11 +113,11 @@ beans::PropertyState ImplOPropertySet::GetPropertyStateByHandle( sal_Int32 nHand
}
Sequence< beans::PropertyState > ImplOPropertySet::GetPropertyStatesByHandle(
- const ::std::vector< sal_Int32 > & aHandles ) const
+ const std::vector< sal_Int32 > & aHandles ) const
{
Sequence< beans::PropertyState > aResult( aHandles.size());
- ::std::transform( aHandles.begin(), aHandles.end(),
+ std::transform( aHandles.begin(), aHandles.end(),
aResult.getArray(),
lcl_getPropertyStateByHandle( m_aProperties ));
@@ -135,9 +135,9 @@ void ImplOPropertySet::SetPropertyToDefault( sal_Int32 nHandle )
}
void ImplOPropertySet::SetPropertiesToDefault(
- const ::std::vector< sal_Int32 > & aHandles )
+ const std::vector< sal_Int32 > & aHandles )
{
- ::std::for_each( aHandles.begin(), aHandles.end(),
+ std::for_each( aHandles.begin(), aHandles.end(),
lcl_eraseMapEntry< sal_Int32, Any >( m_aProperties ) );
}
diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx
index 0881c89e4ac4..7b4f440c69fb 100644
--- a/chart2/source/tools/ImplOPropertySet.hxx
+++ b/chart2/source/tools/ImplOPropertySet.hxx
@@ -43,10 +43,10 @@ public:
GetPropertyStateByHandle( sal_Int32 nHandle ) const;
css::uno::Sequence< css::beans::PropertyState >
- GetPropertyStatesByHandle( const ::std::vector< sal_Int32 > & aHandles ) const;
+ GetPropertyStatesByHandle( const std::vector< sal_Int32 > & aHandles ) const;
void SetPropertyToDefault( sal_Int32 nHandle );
- void SetPropertiesToDefault( const ::std::vector< sal_Int32 > & aHandles );
+ void SetPropertiesToDefault( const std::vector< sal_Int32 > & aHandles );
void SetAllPropertiesToDefault();
/** @param rValue is set to the value for the property given in nHandle. If
@@ -69,7 +69,7 @@ public:
GetStyle() const { return m_xStyle;}
typedef
- ::std::map< sal_Int32, css::uno::Any >
+ std::map< sal_Int32, css::uno::Any >
tPropertyMap;
private:
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index da87d33a430f..e24695621824 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -66,7 +66,7 @@ private:
};
template< typename T >
- Sequence< T > lcl_ValarrayToSequence( const ::std::valarray< T > & rValarray )
+ Sequence< T > lcl_ValarrayToSequence( const std::valarray< T > & rValarray )
{
// is there a more elegant way of conversion?
Sequence< T > aResult( rValarray.size());
@@ -137,7 +137,7 @@ void InternalData::setData( const Sequence< Sequence< double > >& rDataInRows )
for( sal_Int32 nRow=0; nRow<m_nRowCount; ++nRow )
{
int nDataIdx = nRow*m_nColumnCount;
- const sal_Int32 nMax = ::std::min( rDataInRows[nRow].getLength(), m_nColumnCount );
+ const sal_Int32 nMax = std::min( rDataInRows[nRow].getLength(), m_nColumnCount );
for( sal_Int32 nCol=0; nCol < nMax; ++nCol )
{
m_aData[nDataIdx] = rDataInRows[nRow][nCol];
@@ -152,7 +152,7 @@ Sequence< Sequence< double > > InternalData::getData() const
for( sal_Int32 i=0; i<m_nRowCount; ++i )
aResult[i] = lcl_ValarrayToSequence< tDataType::value_type >(
- m_aData[ ::std::slice( i*m_nColumnCount, m_nColumnCount, 1 ) ] );
+ m_aData[ std::slice( i*m_nColumnCount, m_nColumnCount, 1 ) ] );
return aResult;
}
@@ -161,14 +161,14 @@ Sequence< double > InternalData::getColumnValues( sal_Int32 nColumnIndex ) const
{
if( nColumnIndex >= 0 && nColumnIndex < m_nColumnCount )
return lcl_ValarrayToSequence< tDataType::value_type >(
- m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] );
return Sequence< double >();
}
Sequence< double > InternalData::getRowValues( sal_Int32 nRowIndex ) const
{
if( nRowIndex >= 0 && nRowIndex < m_nRowCount )
return lcl_ValarrayToSequence< tDataType::value_type >(
- m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ] );
+ m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ] );
return Sequence< double >();
}
@@ -178,10 +178,10 @@ void InternalData::setColumnValues( sal_Int32 nColumnIndex, const vector< double
return;
enlargeData( nColumnIndex + 1, rNewData.size() );
- tDataType aSlice = m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ];
+ tDataType aSlice = m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ];
for( vector< double >::size_type i = 0; i < rNewData.size(); ++i )
aSlice[i] = rNewData[i];
- m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] = aSlice;
+ m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] = aSlice;
}
void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > & rNewData )
@@ -190,10 +190,10 @@ void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > & r
return;
enlargeData( rNewData.size(), nRowIndex+1 );
- tDataType aSlice = m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ];
+ tDataType aSlice = m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ];
for( vector< double >::size_type i = 0; i < rNewData.size(); ++i )
aSlice[i] = rNewData[i];
- m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]= aSlice;
+ m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]= aSlice;
}
void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, const vector< uno::Any >& rComplexLabel )
@@ -279,8 +279,8 @@ void InternalData::swapColumnWithNext( sal_Int32 nColumnIndex )
bool InternalData::enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount )
{
- sal_Int32 nNewColumnCount( ::std::max<sal_Int32>( m_nColumnCount, nColumnCount ) );
- sal_Int32 nNewRowCount( ::std::max<sal_Int32>( m_nRowCount, nRowCount ) );
+ sal_Int32 nNewColumnCount( std::max<sal_Int32>( m_nColumnCount, nColumnCount ) );
+ sal_Int32 nNewRowCount( std::max<sal_Int32>( m_nRowCount, nRowCount ) );
sal_Int32 nNewSize( nNewColumnCount*nNewRowCount );
bool bGrow = (nNewSize > m_nColumnCount*m_nRowCount);
@@ -293,8 +293,8 @@ bool InternalData::enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount )
// copy old data
for( int nCol=0; nCol<m_nColumnCount; ++nCol )
static_cast< tDataType >(
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] ) =
- m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ];
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] ) =
+ m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ];
m_aData.resize( nNewSize );
m_aData = aNewData;
@@ -320,13 +320,13 @@ void InternalData::insertColumn( sal_Int32 nAfterIndex )
// copy old data
int nCol=0;
for( ; nCol<=nAfterIndex; ++nCol )
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ] );
for( ++nCol; nCol<nNewColumnCount; ++nCol )
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nCol - 1, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nCol - 1, m_nRowCount, m_nColumnCount ) ] );
m_nColumnCount = nNewColumnCount;
m_aData.resize( nNewSize );
@@ -376,16 +376,16 @@ void InternalData::insertRow( sal_Int32 nAfterIndex )
// copy old data
sal_Int32 nIndex = nAfterIndex + 1;
- aNewData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] =
+ aNewData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] );
+ m_aData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] );
if( nIndex < m_nRowCount )
{
sal_Int32 nRemainingCount = m_nColumnCount * (m_nRowCount - nIndex);
- aNewData[ ::std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] =
+ aNewData[ std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] );
+ m_aData[ std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] );
}
m_nRowCount = nNewRowCount;
@@ -414,13 +414,13 @@ void InternalData::deleteColumn( sal_Int32 nAtIndex )
// copy old data
int nCol=0;
for( ; nCol<nAtIndex; ++nCol )
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ] );
for( ; nCol<nNewColumnCount; ++nCol )
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nCol + 1, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nCol + 1, m_nRowCount, m_nColumnCount ) ] );
m_nColumnCount = nNewColumnCount;
m_aData.resize( nNewSize );
@@ -448,16 +448,16 @@ void InternalData::deleteRow( sal_Int32 nAtIndex )
// copy old data
sal_Int32 nIndex = nAtIndex;
if( nIndex )
- aNewData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] =
+ aNewData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] );
+ m_aData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] );
if( nIndex < nNewRowCount )
{
sal_Int32 nRemainingCount = m_nColumnCount * (nNewRowCount - nIndex);
- aNewData[ ::std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] =
+ aNewData[ std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] );
+ m_aData[ std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] );
}
m_nRowCount = nNewRowCount;
@@ -539,7 +539,7 @@ void InternalData::dump() const
for (sal_Int32 nRow = 0; nRow < m_nRowCount; ++nRow)
{
- tDataType aSlice( m_aData[ ::std::slice( nRow*m_nColumnCount, m_nColumnCount, 1 ) ] );
+ tDataType aSlice( m_aData[ std::slice( nRow*m_nColumnCount, m_nColumnCount, 1 ) ] );
for (sal_Int32 nCol = 0; nCol < m_nColumnCount; ++nCol)
aPrinter.set(nRow, nCol, OUString::number(aSlice[nCol]));
}
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 0101867ddbe3..7d3ff92bb828 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -66,7 +66,7 @@ static const char lcl_aCategoriesRoleName[] = "categories";
static const char lcl_aLabelRangePrefix[] = "label ";
static const char lcl_aCompleteRange[] = "all";
-typedef ::std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > >
+typedef std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > >
lcl_tSequenceMap;
std::vector< OUString > lcl_AnyToStringSequence( const std::vector< uno::Any >& aAnySeq )
@@ -89,7 +89,7 @@ std::vector< uno::Any > lcl_StringToAnyVector( const css::uno::Sequence< OUStrin
return aResult;
}
-struct lcl_setModified : public ::std::unary_function< lcl_tSequenceMap, void >
+struct lcl_setModified : public std::unary_function< lcl_tSequenceMap, void >
{
void operator() ( const lcl_tSequenceMap::value_type & rMapEntry )
{
@@ -104,7 +104,7 @@ struct lcl_setModified : public ::std::unary_function< lcl_tSequenceMap, void >
}
};
-struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2::XDataSeries >, void >
+struct lcl_internalizeSeries : public std::unary_function< Reference< chart2::XDataSeries >, void >
{
lcl_internalizeSeries( InternalData & rInternalData,
InternalDataProvider & rProvider,
@@ -133,7 +133,7 @@ struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2::
if( xValues.is() )
{
- ::std::vector< double > aValues( ContainerHelper::SequenceToVector( xValues->getNumericalData()));
+ std::vector< double > aValues( ContainerHelper::SequenceToVector( xValues->getNumericalData()));
if( m_bDataInColumns )
m_rInternalData.setColumnValues( nNewIndex, aValues );
else
@@ -181,7 +181,7 @@ private:
bool m_bDataInColumns;
};
-struct lcl_copyFromLevel : public ::std::unary_function< vector< uno::Any >, uno::Any >
+struct lcl_copyFromLevel : public std::unary_function< vector< uno::Any >, uno::Any >
{
public:
@@ -200,7 +200,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_getStringFromLevelVector : public ::std::unary_function< vector< uno::Any >, OUString >
+struct lcl_getStringFromLevelVector : public std::unary_function< vector< uno::Any >, OUString >
{
public:
@@ -219,7 +219,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_setAnyAtLevel : public ::std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > >
+struct lcl_setAnyAtLevel : public std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > >
{
public:
@@ -239,7 +239,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_setAnyAtLevelFromStringSequence : public ::std::binary_function< vector< uno::Any >, OUString, vector< uno::Any > >
+struct lcl_setAnyAtLevelFromStringSequence : public std::binary_function< vector< uno::Any >, OUString, vector< uno::Any > >
{
public:
@@ -259,7 +259,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_insertAnyAtLevel : public ::std::unary_function< vector< uno::Any >, void >
+struct lcl_insertAnyAtLevel : public std::unary_function< vector< uno::Any >, void >
{
public:
@@ -282,7 +282,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_removeAnyAtLevel : public ::std::unary_function< vector< uno::Any >, void >
+struct lcl_removeAnyAtLevel : public std::unary_function< vector< uno::Any >, void >
{
public:
@@ -388,7 +388,7 @@ InternalDataProvider::InternalDataProvider(
}
// data series
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartDoc ));
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartDoc ));
lcl_internalizeSeries ftor( m_aInternalData, *this, bConnectToModel, m_bDataInColumns );
for( const auto& rxScreen : aSeriesVector )
ftor( rxScreen );
@@ -459,8 +459,8 @@ void InternalDataProvider::adaptMapReferences(
// erase map values for old index
m_aSequenceMap.erase( aRange.first, aRange.second );
// add new entries for values with new index
- ::std::copy( aNewElements.begin(), aNewElements.end(),
- ::std::inserter( m_aSequenceMap,
+ std::copy( aNewElements.begin(), aNewElements.end(),
+ std::inserter( m_aSequenceMap,
m_aSequenceMap.upper_bound( rNewRangeRepresentation )));
}
@@ -688,7 +688,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
if( aRangeRepresentation == lcl_aCategoriesRangeName )
{
//return split complex categories if we have any:
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aComplexCategories;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aComplexCategories;
vector< vector< uno::Any > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
if( bUseColumns==m_bDataInColumns )
{
@@ -714,7 +714,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
OSL_ASSERT( aRangeRepresentation == lcl_aCompleteRange );
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec;
// categories
if( bHasCategories )
@@ -722,7 +722,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
new LabeledDataSequence( createDataSequenceAndAddToMap( lcl_aCategoriesRangeName, lcl_aCategoriesRoleName ) ) );
// data with labels
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aDataVec;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aDataVec;
const sal_Int32 nCount = (bUseColumns ? m_aInternalData.getColumnCount() : m_aInternalData.getRowCount());
for( sal_Int32 nIdx=0; nIdx<nCount; ++nIdx )
{
@@ -753,8 +753,8 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
}
//add left over data sequences to result
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::iterator aIt(aDataVec.begin());
- const ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::const_iterator aEndIt(aDataVec.end());
+ std::vector< Reference< chart2::data::XLabeledDataSequence > >::iterator aIt(aDataVec.begin());
+ const std::vector< Reference< chart2::data::XLabeledDataSequence > >::const_iterator aEndIt(aDataVec.end());
for( ;aIt!=aEndIt; ++aIt)
{
if( aIt->is() )
@@ -1045,14 +1045,14 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel
if( nLevel>0 )
{
vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
- ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertAnyAtLevel(nLevel) );
+ std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertAnyAtLevel(nLevel) );
if( m_bDataInColumns )
m_aInternalData.setComplexRowLabels( aComplexCategories );
else
m_aInternalData.setComplexColumnLabels( aComplexCategories );
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
}
void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel )
@@ -1061,14 +1061,14 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel
if( nLevel>0 )
{
vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
- ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeAnyAtLevel(nLevel) );
+ std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeAnyAtLevel(nLevel) );
if( m_bDataInColumns )
m_aInternalData.setComplexRowLabels( aComplexCategories );
else
m_aInternalData.setComplexColumnLabels( aComplexCategories );
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
}
@@ -1089,10 +1089,10 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
- ::std::for_each( aBegin, aEnd, lcl_setModified());
+ std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex )
@@ -1112,10 +1112,10 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
- ::std::for_each( aBegin, aEnd, lcl_setModified());
+ std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex )
@@ -1131,10 +1131,10 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
- ::std::for_each( aBegin, aEnd, lcl_setModified());
+ std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq )
@@ -1317,7 +1317,7 @@ class SplitCategoriesProvider_ForComplexDescriptions : public SplitCategoriesPro
{
public:
- explicit SplitCategoriesProvider_ForComplexDescriptions( const ::std::vector< ::std::vector< uno::Any > >& rComplexDescriptions )
+ explicit SplitCategoriesProvider_ForComplexDescriptions( const std::vector< std::vector< uno::Any > >& rComplexDescriptions )
: m_rComplexDescriptions( rComplexDescriptions )
{}
@@ -1325,7 +1325,7 @@ public:
virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const override;
private:
- const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions;
+ const std::vector< std::vector< uno::Any > >& m_rComplexDescriptions;
};
sal_Int32 SplitCategoriesProvider_ForComplexDescriptions::getLevelCount() const
diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx
index 6f53e7ead77d..e857d2d9a6ae 100644
--- a/chart2/source/tools/LinePropertiesHelper.cxx
+++ b/chart2/source/tools/LinePropertiesHelper.cxx
@@ -32,7 +32,7 @@ namespace chart
{
void LinePropertiesHelper::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// Line Properties see service drawing::LineProperties
rOutProperties.push_back(
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 44fd89e248e8..2aa55ef38d73 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -59,8 +59,8 @@ void lcl_fireModifyEvent(
}
}
-struct lcl_weakReferenceToSame : public ::std::unary_function<
- ::std::pair<
+struct lcl_weakReferenceToSame : public std::unary_function<
+ std::pair<
css::uno::WeakReference< css::util::XModifyListener >,
css::uno::Reference< css::util::XModifyListener > >,
bool >
@@ -131,7 +131,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene
// look up fitting helper class that has been added
Reference< util::XModifyListener > xListenerToRemove( aListener );
tListenerMap::iterator aIt(
- ::std::find_if( m_aListenerMap.begin(), m_aListenerMap.end(), lcl_weakReferenceToSame( aListener )));
+ std::find_if( m_aListenerMap.begin(), m_aListenerMap.end(), lcl_weakReferenceToSame( aListener )));
if( aIt != m_aListenerMap.end())
{
xListenerToRemove.set( (*aIt).second );
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index dbf192bd6690..5acadad16bee 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -122,7 +122,7 @@ Sequence< beans::PropertyState > SAL_CALL
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ aPropertyName.getLength() ]);
rPH.fillHandles( pHandles.get(), aPropertyName );
- ::std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyName.getLength());
+ std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyName.getLength());
pHandles.reset();
return m_pImplProperties->GetPropertyStatesByHandle( aHandles );
@@ -165,7 +165,7 @@ void SAL_CALL
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ aPropertyNames.getLength() ]);
rPH.fillHandles( pHandles.get(), aPropertyNames );
- ::std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyNames.getLength());
+ std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyNames.getLength());
pHandles.reset();
m_pImplProperties->SetPropertiesToDefault( aHandles );
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 1887477fd418..8741037b6014 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -36,7 +36,7 @@ using ::com::sun::star::uno::Reference;
namespace
{
-struct lcl_EqualsElement : public ::std::unary_function< OUString, bool >
+struct lcl_EqualsElement : public std::unary_function< OUString, bool >
{
explicit lcl_EqualsElement( const Any & rValue, const Reference< container::XNameAccess > & xAccess )
: m_aValue( rValue ), m_xAccess( xAccess )
@@ -62,7 +62,7 @@ private:
Reference< container::XNameAccess > m_xAccess;
};
-struct lcl_StringMatches : public ::std::unary_function< OUString ,bool >
+struct lcl_StringMatches : public std::unary_function< OUString ,bool >
{
explicit lcl_StringMatches( const OUString & rCmpStr ) :
m_aCmpStr( rCmpStr )
@@ -77,7 +77,7 @@ private:
OUString m_aCmpStr;
};
-struct lcl_OUStringRestToInt32 : public ::std::unary_function< OUString, sal_Int32 >
+struct lcl_OUStringRestToInt32 : public std::unary_function< OUString, sal_Int32 >
{
explicit lcl_OUStringRestToInt32( sal_Int32 nPrefixLength ) :
m_nPrefixLength( nPrefixLength )
@@ -119,9 +119,9 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
try
{
Reference< container::XNameAccess > xNameAccess( xNameContainer, uno::UNO_QUERY_THROW );
- ::std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames()));
- ::std::vector< OUString >::const_iterator aIt(
- ::std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess )));
+ std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames()));
+ std::vector< OUString >::const_iterator aIt(
+ std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess )));
// element not found in container
if( aIt == aNames.end())
@@ -131,7 +131,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
// check if preferred name is already used
if( !rPreferredName.isEmpty())
{
- aIt = ::std::find( aNames.begin(), aNames.end(), rPreferredName );
+ aIt = std::find( aNames.begin(), aNames.end(), rPreferredName );
if( aIt == aNames.end())
aUniqueName = rPreferredName;
}
@@ -139,14 +139,14 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
if( aUniqueName.isEmpty())
{
// create a unique id using the prefix plus a number
- ::std::vector< sal_Int32 > aNumbers;
- ::std::vector< OUString >::iterator aNonConstIt(
- ::std::partition( aNames.begin(), aNames.end(), lcl_StringMatches( rPrefix )));
- ::std::transform( aNames.begin(), aNonConstIt,
+ std::vector< sal_Int32 > aNumbers;
+ std::vector< OUString >::iterator aNonConstIt(
+ std::partition( aNames.begin(), aNames.end(), lcl_StringMatches( rPrefix )));
+ std::transform( aNames.begin(), aNonConstIt,
back_inserter( aNumbers ),
lcl_OUStringRestToInt32( rPrefix.getLength() ));
- ::std::vector< sal_Int32 >::const_iterator aMaxIt(
- ::std::max_element( aNumbers.begin(), aNumbers.end()));
+ std::vector< sal_Int32 >::const_iterator aMaxIt(
+ std::max_element( aNumbers.begin(), aNumbers.end()));
sal_Int32 nIndex = 1;
if( aMaxIt != aNumbers.end())
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 13c107a6d2b2..6c7a5d5ae156 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -268,7 +268,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface
if( xSource.is() )
{
sal_Int32 nPreferredColor = defaultPreferredColor;
- ::std::vector< chart2::data::HighlightedRange > aHilightedRanges;
+ std::vector< chart2::data::HighlightedRange > aHilightedRanges;
Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeqSeq( xSource->getDataSequences());
for( sal_Int32 i=0; i<aLSeqSeq.getLength(); ++i )
{
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 036699648163..0510f278762a 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -95,10 +95,10 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries()
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartDoc ));
// DataSeries/Points
- ::std::vector< Reference< XDataSeries > > aSeries(
+ std::vector< Reference< XDataSeries > > aSeries(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin());
+ for( std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin());
aIt != aSeries.end(); ++aIt )
{
Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY );
@@ -266,10 +266,10 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
}
// DataSeries/Points
- ::std::vector< Reference< XDataSeries > > aSeries(
+ std::vector< Reference< XDataSeries > > aSeries(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin());
+ for( std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin());
aIt != aSeries.end(); ++aIt )
{
Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY );
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 96b55ec76063..10c6edf7e35f 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -407,7 +407,7 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine(
{
uno::Sequence< uno::Reference< chart2::XRegressionCurve > > aCurves(
xRegCnt->getRegressionCurves());
- ::std::vector< uno::Reference< chart2::XRegressionCurve > > aCurvesToDelete;
+ std::vector< uno::Reference< chart2::XRegressionCurve > > aCurvesToDelete;
for( sal_Int32 i = 0; i < aCurves.getLength(); ++i )
{
if( ! isMeanValueLine( aCurves[i] ))
@@ -416,7 +416,7 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine(
}
}
- for( ::std::vector< uno::Reference< chart2::XRegressionCurve > >::const_iterator aIt = aCurvesToDelete.begin();
+ for( std::vector< uno::Reference< chart2::XRegressionCurve > >::const_iterator aIt = aCurvesToDelete.begin();
aIt != aCurvesToDelete.end(); ++aIt )
{
xRegCnt->removeRegressionCurve( *aIt );
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 136c687e8174..e90296fc4227 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -66,7 +66,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "PolynomialDegree",
@@ -142,11 +142,11 @@ struct StaticRegressionCurveInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index ab13afc027a1..d72298fee60e 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -58,7 +58,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "ShowEquation",
@@ -157,14 +157,14 @@ struct StaticRegressionEquationInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx
index a654b8dc01ea..dfe44a0bbc69 100644
--- a/chart2/source/tools/SceneProperties.cxx
+++ b/chart2/source/tools/SceneProperties.cxx
@@ -36,7 +36,7 @@ namespace chart
{
void SceneProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// transformation matrix
rOutProperties.push_back(
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index e9e7c45e7702..b7c448eb7124 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -1310,7 +1310,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
drawing::LineStyle aLineStyle( drawing::LineStyle_SOLID );
- ::std::vector< uno::Reference< XDataSeries > > aSeriesList(
+ std::vector< uno::Reference< XDataSeries > > aSeriesList(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() );
@@ -1410,7 +1410,7 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines(
uno::Any aALineStyle( aLineStyle);
uno::Any aARoundedEdges( static_cast< sal_Int16 >( nRoundedEdges ));
- ::std::vector< uno::Reference< XDataSeries > > aSeriesList(
+ std::vector< uno::Reference< XDataSeries > > aSeriesList(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() );
for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS )
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 3ec0ff23343e..e942b6eaeb5b 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -174,7 +174,7 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
{
Sequence< uno::Any > aValues( m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation ));
aResult.realloc( aValues.getLength());
- ::std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(),
+ std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(),
aResult.getArray(), CommonFunctors::AnyToDouble());
}
return aResult;
@@ -189,7 +189,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
{
Sequence< uno::Any > aValues( m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation ));
aResult.realloc( aValues.getLength());
- ::std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(),
+ std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(),
aResult.getArray(), CommonFunctors::AnyToString());
}
return aResult;
diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx
index 37ce9727e4a6..730b4fc46298 100644
--- a/chart2/source/tools/UserDefinedProperties.cxx
+++ b/chart2/source/tools/UserDefinedProperties.cxx
@@ -30,7 +30,7 @@ namespace chart
{
void UserDefinedProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "ChartUserDefinedAttributes",
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 84195460e1a0..f90bc4f248ae 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -88,7 +88,7 @@ void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedPrope
addIgnoreFillProperties_only_BitmapProperties( rList );
}
-void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
+void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( std::vector< WrappedProperty* >& rList )
{
rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) ) );
rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::Any( sal_Int32(-1) ) ) );
@@ -102,7 +102,7 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties(
rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::Any( false ) ) );
}
-void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
+void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( std::vector< WrappedProperty* >& rList )
{
// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::Any( OUString() ) ) );
// rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::Any( uno::Reference< awt::XBitmap > (0) ) ) );
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index 3fade3573ece..e537054abd64 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -31,7 +31,7 @@ namespace
array (which you can get from an OUString with getStr()) and puts the result
into the OUStringBuffer given in the CTOR
*/
-class lcl_Escape : public ::std::unary_function< sal_Unicode, void >
+class lcl_Escape : public std::unary_function< sal_Unicode, void >
{
public:
explicit lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
@@ -54,7 +54,7 @@ private:
you can get from an OUString with getStr()) and puts the result into the
OUStringBuffer given in the CTOR
*/
-class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void >
+class lcl_UnEscape : public std::unary_function< sal_Unicode, void >
{
public:
explicit lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
@@ -186,7 +186,7 @@ bool lcl_getCellAddressFromXMLString(
const sal_Unicode * pTableName = rXMLString.getStr();
// remove escapes from table name
- ::std::for_each( pTableName + nStartPos,
+ std::for_each( pTableName + nStartPos,
pTableName + nDelimiterPos,
lcl_UnEscape( aTableNameBuffer ));
@@ -367,7 +367,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
const sal_Unicode * pTableNameBeg = rRange.aTableName.getStr();
// append the quoted string at the buffer
- ::std::for_each( pTableNameBeg,
+ std::for_each( pTableNameBeg,
pTableNameBeg + rRange.aTableName.getLength(),
lcl_Escape( aBuffer ) );
}