basctl/source/basicide/unomodel.cxx | 1
chart2/source/model/template/BubbleDataInterpreter.cxx | 11 -
chart2/source/model/template/ColumnLineDataInterpreter.cxx | 1
chart2/source/model/template/DataInterpreter.cxx | 7 -
chart2/source/model/template/StockDataInterpreter.cxx | 1
chart2/source/model/template/XYDataInterpreter.cxx | 9 -
chart2/source/tools/DiagramHelper.cxx | 3
chart2/source/tools/InternalData.cxx | 31 ++--
chart2/source/tools/InternalDataProvider.cxx | 75 +++++------
chart2/source/tools/RelativeSizeHelper.cxx | 7 -
connectivity/source/drivers/firebird/Indexes.cxx | 3
connectivity/source/drivers/firebird/Statement.cxx | 1
connectivity/source/drivers/firebird/StatementCommonBase.cxx | 1
cppu/source/threadpool/threadident.cxx | 1
cppu/source/threadpool/threadpool.cxx | 5
15 files changed, 71 insertions(+), 86 deletions(-)
New commits:
commit c95597ac428f6515df232a07e82af75f4e0e242a
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Tue Feb 14 21:43:43 2023 +0100
Commit: Gabor Kelemen <kelem...@ubuntu.com>
CommitDate: Wed Feb 15 18:37:59 2023 +0000
Drop 'using namespace ::std' in dirs b* c*
Change-Id: I59392ee7aa71c219e475a09da67a868cfdd14b41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147074
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/basctl/source/basicide/unomodel.cxx
b/basctl/source/basicide/unomodel.cxx
index 4a9ee759f060..5d3946b426c6 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -33,7 +33,6 @@ namespace basctl
{
using namespace ::cppu;
-using namespace ::std;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx
b/chart2/source/model/template/BubbleDataInterpreter.cxx
index fdcc35667e41..bb468fd9723d 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -30,7 +30,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -58,8 +57,8 @@ InterpretedData BubbleDataInterpreter::interpretDataSource(
std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aData
= DataInterpreter::getDataSequences(xSource);
uno::Reference< chart2::data::XLabeledDataSequence > xValuesX;
- vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aYValuesVector;
- vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSizeValuesVector;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aYValuesVector;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSizeValuesVector;
uno::Reference< chart2::data::XLabeledDataSequence > xCategories;
bool bHasCategories = HasCategories( aArguments, aData );
@@ -119,7 +118,7 @@ InterpretedData BubbleDataInterpreter::interpretDataSource(
// create DataSeries
std::size_t nSeriesIndex = 0;
- vector< rtl::Reference< DataSeries > > aSeriesVec;
+ std::vector< rtl::Reference< DataSeries > > aSeriesVec;
aSeriesVec.reserve( aSizeValuesVector.size());
Reference< data::XLabeledDataSequence > xClonedXValues = xValuesX;
@@ -127,7 +126,7 @@ InterpretedData BubbleDataInterpreter::interpretDataSource(
for( size_t nN = 0; nN < aSizeValuesVector.size(); ++nN, ++nSeriesIndex )
{
- vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aNewData;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aNewData;
if( xValuesX.is() )
{
if( nN > 0 && xCloneableX.is() )
@@ -177,7 +176,7 @@ InterpretedData
BubbleDataInterpreter::reinterpretDataSeries(
! xValuesY.is() ||
! xValuesSize.is() )
{
- vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aValueSeqVec(
+ std::vector< uno::Reference<
chart2::data::XLabeledDataSequence > > aValueSeqVec(
DataSeriesHelper::getAllDataSequencesByRole(
aSeries[i]->getDataSequences2(), "values" ));
if( xValuesX.is())
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 15ce4adce6fc..5cce30cd97a0 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -25,7 +25,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/model/template/DataInterpreter.cxx
b/chart2/source/model/template/DataInterpreter.cxx
index 2ead42a70633..0f5cebc3bbec 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -68,7 +67,7 @@ InterpretedData DataInterpreter::interpretDataSource(
std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aData
= getDataSequences(xSource);
uno::Reference< chart2::data::XLabeledDataSequence > xCategories;
- vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSequencesVec;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSequencesVec;
// check if we should use categories
@@ -102,7 +101,7 @@ InterpretedData DataInterpreter::interpretDataSource(
// create DataSeries
std::size_t nSeriesIndex = 0;
- vector< rtl::Reference< DataSeries > > aSeriesVec;
+ std::vector< rtl::Reference< DataSeries > > aSeriesVec;
aSeriesVec.reserve( aSequencesVec.size());
for (auto const& elem : aSequencesVec)
@@ -252,7 +251,7 @@ private:
rtl::Reference< DataSource > DataInterpreter::mergeInterpretedData(
const InterpretedData& aInterpretedData )
{
- vector< Reference< data::XLabeledDataSequence > > aResultVec;
+ std::vector< Reference< data::XLabeledDataSequence > > aResultVec;
aResultVec.reserve( aInterpretedData.Series.size() +
1 // categories
);
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx
b/chart2/source/model/template/StockDataInterpreter.cxx
index 2b3a4756beb8..1575bba1b223 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -28,7 +28,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx
b/chart2/source/model/template/XYDataInterpreter.cxx
index 7a850217b558..1fc053f14c24 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -59,7 +58,7 @@ InterpretedData XYDataInterpreter::interpretDataSource(
std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aData
= DataInterpreter::getDataSequences(xSource);
uno::Reference< chart2::data::XLabeledDataSequence > xValuesX;
- vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSequencesVec;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSequencesVec;
uno::Reference< chart2::data::XLabeledDataSequence > xCategories;
bool bHasCategories = HasCategories( aArguments, aData );
@@ -103,7 +102,7 @@ InterpretedData XYDataInterpreter::interpretDataSource(
}
// create DataSeries
- vector< rtl::Reference< DataSeries > > aSeriesVec;
+ std::vector< rtl::Reference< DataSeries > > aSeriesVec;
aSeriesVec.reserve( aSequencesVec.size());
Reference< data::XLabeledDataSequence > xClonedXValues = xValuesX;
@@ -112,7 +111,7 @@ InterpretedData XYDataInterpreter::interpretDataSource(
std::size_t nSeriesIndex = 0;
for (auto const& elem : aSequencesVec)
{
- vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aNewData;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aNewData;
if( nSeriesIndex && xCloneable.is() )
xClonedXValues.set( xCloneable->createClone(), uno::UNO_QUERY );
@@ -159,7 +158,7 @@ InterpretedData XYDataInterpreter::reinterpretDataSeries(
if( ! xValuesX.is() ||
! xValuesY.is())
{
- vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aValueSeqVec(
+ std::vector< uno::Reference<
chart2::data::XLabeledDataSequence > > aValueSeqVec(
DataSeriesHelper::getAllDataSequencesByRole(
aSeries[i]->getDataSequences2(), "values" ));
if( xValuesX.is())
diff --git a/chart2/source/tools/DiagramHelper.cxx
b/chart2/source/tools/DiagramHelper.cxx
index b509f9ec5db3..2d02e17e0b57 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -66,7 +66,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -630,7 +629,7 @@ std::vector< std::vector< rtl::Reference< DataSeries > > >
if (!xDiagram)
return {};
- vector< std::vector< rtl::Reference< DataSeries > > > aResult;
+ std::vector< std::vector< rtl::Reference< DataSeries > > > aResult;
//iterate through all coordinate systems
for( rtl::Reference< BaseCoordinateSystem > const & coords :
xDiagram->getBaseCoordinateSystems() )
diff --git a/chart2/source/tools/InternalData.cxx
b/chart2/source/tools/InternalData.cxx
index 50a86a492c14..375e639c7879 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -40,7 +40,6 @@
using ::com::sun::star::uno::Sequence;
using namespace ::com::sun::star;
-using namespace ::std;
namespace chart
{
@@ -56,7 +55,7 @@ struct lcl_NumberedStringGenerator
m_nWildcardLength( rWildcard.size())
{
}
- vector< uno::Any > operator()()
+ std::vector< uno::Any > operator()()
{
return { uno::Any(m_aStub.replaceAt( m_nStubStartIndex,
m_nWildcardLength, OUString::number( ++m_nCounter ))) };
}
@@ -175,31 +174,31 @@ Sequence< double > InternalData::getRowValues( sal_Int32
nRowIndex ) const
return Sequence< double >();
}
-void InternalData::setColumnValues( sal_Int32 nColumnIndex, const vector<
double > & rNewData )
+void InternalData::setColumnValues( sal_Int32 nColumnIndex, const std::vector<
double > & rNewData )
{
if( nColumnIndex < 0 )
return;
enlargeData( nColumnIndex + 1, rNewData.size() );
tDataType aSlice = m_aData[ std::slice( nColumnIndex, m_nRowCount,
m_nColumnCount ) ];
- for( vector< double >::size_type i = 0; i < rNewData.size(); ++i )
+ for( std::vector< double >::size_type i = 0; i < rNewData.size(); ++i )
aSlice[i] = rNewData[i];
m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] =
aSlice;
}
-void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > &
rNewData )
+void InternalData::setRowValues( sal_Int32 nRowIndex, const std::vector<
double > & rNewData )
{
if( nRowIndex < 0 )
return;
enlargeData( rNewData.size(), nRowIndex+1 );
tDataType aSlice = m_aData[ std::slice( nRowIndex*m_nColumnCount,
m_nColumnCount, 1 ) ];
- for( vector< double >::size_type i = 0; i < rNewData.size(); ++i )
+ for( std::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;
}
-void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, vector<
uno::Any >&& rComplexLabel )
+void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, std::vector<
uno::Any >&& rComplexLabel )
{
if( nColumnIndex < 0 )
return;
@@ -213,7 +212,7 @@ void InternalData::setComplexColumnLabel( sal_Int32
nColumnIndex, vector< uno::A
dump();
}
-void InternalData::setComplexRowLabel( sal_Int32 nRowIndex, vector< uno::Any
>&& rComplexLabel )
+void InternalData::setComplexRowLabel( sal_Int32 nRowIndex, std::vector<
uno::Any >&& rComplexLabel )
{
if( nRowIndex < 0 )
return;
@@ -234,19 +233,19 @@ void InternalData::setComplexRowLabel( sal_Int32
nRowIndex, vector< uno::Any >&&
}
}
-vector< uno::Any > InternalData::getComplexColumnLabel( sal_Int32 nColumnIndex
) const
+std::vector< uno::Any > InternalData::getComplexColumnLabel( sal_Int32
nColumnIndex ) const
{
if( nColumnIndex < static_cast< sal_Int32 >( m_aColumnLabels.size() ) )
return m_aColumnLabels[nColumnIndex];
else
- return vector< uno::Any >();
+ return std::vector< uno::Any >();
}
-vector< uno::Any > InternalData::getComplexRowLabel( sal_Int32 nRowIndex )
const
+std::vector< uno::Any > InternalData::getComplexRowLabel( sal_Int32 nRowIndex
) const
{
if( nRowIndex < static_cast< sal_Int32 >( m_aRowLabels.size() ) )
return m_aRowLabels[nRowIndex];
else
- return vector< uno::Any >();
+ return std::vector< uno::Any >();
}
void InternalData::swapRowWithNext( sal_Int32 nRowIndex )
@@ -264,7 +263,7 @@ void InternalData::swapRowWithNext( sal_Int32 nRowIndex )
m_aData[nIndex2] = fTemp;
}
- vector< uno::Any > aTemp( m_aRowLabels[nRowIndex] );
+ std::vector< uno::Any > aTemp( m_aRowLabels[nRowIndex] );
m_aRowLabels[nRowIndex] = m_aRowLabels[nRowIndex + 1];
m_aRowLabels[nRowIndex + 1] = aTemp;
}
@@ -284,7 +283,7 @@ void InternalData::swapColumnWithNext( sal_Int32
nColumnIndex )
m_aData[nIndex2] = fTemp;
}
- vector< uno::Any > aTemp( m_aColumnLabels[nColumnIndex] );
+ std::vector< uno::Any > aTemp( m_aColumnLabels[nColumnIndex] );
m_aColumnLabels[nColumnIndex] = m_aColumnLabels[nColumnIndex + 1];
m_aColumnLabels[nColumnIndex + 1] = aTemp;
}
@@ -342,7 +341,7 @@ void InternalData::insertColumn( sal_Int32 nAfterIndex )
// labels
if( nAfterIndex < static_cast< sal_Int32 >( m_aColumnLabels.size()))
- m_aColumnLabels.insert( m_aColumnLabels.begin() + (nAfterIndex + 1),
vector< uno::Any >(1) );
+ m_aColumnLabels.insert( m_aColumnLabels.begin() + (nAfterIndex + 1),
std::vector< uno::Any >(1) );
dump();
}
@@ -400,7 +399,7 @@ void InternalData::insertRow( sal_Int32 nAfterIndex )
// labels
if( nAfterIndex < static_cast< sal_Int32 >( m_aRowLabels.size()))
- m_aRowLabels.insert( m_aRowLabels.begin() + nIndex, vector< uno::Any >
(1));
+ m_aRowLabels.insert( m_aRowLabels.begin() + nIndex, std::vector<
uno::Any > (1));
dump();
}
diff --git a/chart2/source/tools/InternalDataProvider.cxx
b/chart2/source/tools/InternalDataProvider.cxx
index e7327b1b6090..03d886cc9500 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -50,7 +50,6 @@
namespace com::sun::star::chart2 { class XChartDocument; }
using namespace ::com::sun::star;
-using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -185,7 +184,7 @@ public:
explicit lcl_copyFromLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
{}
- uno::Any operator() ( const vector< uno::Any >& rVector )
+ uno::Any operator() ( const std::vector< uno::Any >& rVector )
{
uno::Any aRet;
if( m_nLevel < static_cast< sal_Int32 >(rVector.size()) )
@@ -204,7 +203,7 @@ public:
explicit lcl_getStringFromLevelVector( sal_Int32 nLevel ) : m_nLevel(
nLevel )
{}
- OUString operator() ( const vector< uno::Any >& rVector )
+ OUString operator() ( const std::vector< uno::Any >& rVector )
{
OUString aString;
if( m_nLevel < static_cast< sal_Int32 >(rVector.size()) )
@@ -223,9 +222,9 @@ public:
explicit lcl_setAnyAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
{}
- vector< uno::Any > operator() ( const vector< uno::Any >& rVector, const
uno::Any& rNewValue )
+ std::vector< uno::Any > operator() ( const std::vector< uno::Any >&
rVector, const uno::Any& rNewValue )
{
- vector< uno::Any > aRet( rVector );
+ std::vector< uno::Any > aRet( rVector );
if( m_nLevel >= static_cast< sal_Int32 >(aRet.size()) )
aRet.resize( m_nLevel+1 );
aRet[ m_nLevel ]=rNewValue;
@@ -243,9 +242,9 @@ public:
explicit lcl_setAnyAtLevelFromStringSequence( sal_Int32 nLevel ) :
m_nLevel( nLevel )
{}
- vector< uno::Any > operator() ( const vector< uno::Any >& rVector, const
OUString& rNewValue )
+ std::vector< uno::Any > operator() ( const std::vector< uno::Any >&
rVector, const OUString& rNewValue )
{
- vector< uno::Any > aRet( rVector );
+ std::vector< uno::Any > aRet( rVector );
if( m_nLevel >= static_cast< sal_Int32 >(aRet.size()) )
aRet.resize( m_nLevel+1 );
aRet[ m_nLevel ] <<= rNewValue;
@@ -263,7 +262,7 @@ public:
explicit lcl_insertAnyAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
{}
- void operator() ( vector< uno::Any >& rVector )
+ void operator() ( std::vector< uno::Any >& rVector )
{
if( m_nLevel >= static_cast< sal_Int32 >(rVector.size()) )
{
@@ -286,7 +285,7 @@ public:
explicit lcl_removeAnyAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
{}
- void operator() ( vector< uno::Any >& rVector )
+ void operator() ( std::vector< uno::Any >& rVector )
{
if( m_nLevel < static_cast<sal_Int32>(rVector.size()) )
{
@@ -336,7 +335,7 @@ InternalDataProvider::InternalDataProvider(
// categories
{
- vector< vector< uno::Any > > aNewCategories;//inner count is
level
+ std::vector< std::vector< uno::Any > > aNewCategories;//inner
count is level
{
ExplicitCategoriesProvider
aExplicitCategoriesProvider(ChartModelHelper::getFirstCoordinateSystem(xModel),
*xModel);
@@ -683,7 +682,7 @@ sal_Bool SAL_CALL
InternalDataProvider::createDataSourcePossible( const Sequence
namespace
{
-sal_Int32 lcl_getInnerLevelCount( const vector< vector< uno::Any > >& rLabels )
+sal_Int32 lcl_getInnerLevelCount( const std::vector< std::vector< uno::Any >
>& rLabels )
{
sal_Int32 nCount = 1;//minimum is 1!
for (auto const& elemLabel : rLabels)
@@ -709,7 +708,7 @@ Reference< chart2::data::XDataSource > SAL_CALL
InternalDataProvider::createData
{
//return split complex categories if we have any:
std::vector< Reference< chart2::data::XLabeledDataSequence > >
aComplexCategories;
- const vector< vector< uno::Any > > & aCategories( m_bDataInColumns ?
m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels());
+ const std::vector< std::vector< uno::Any > > & aCategories(
m_bDataInColumns ? m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels());
if( bUseColumns==m_bDataInColumns )
{
sal_Int32 nLevelCount = lcl_getInnerLevelCount( aCategories );
@@ -889,7 +888,7 @@ Sequence< uno::Any > SAL_CALL
InternalDataProvider::getDataByRangeRepresentation
if( aRange.match( lcl_aLabelRangePrefix ) )
{
auto nIndex = o3tl::toUInt32(aRange.subView(
strlen(lcl_aLabelRangePrefix)));
- vector< uno::Any > aComplexLabel = m_bDataInColumns
+ std::vector< uno::Any > aComplexLabel = m_bDataInColumns
? m_aInternalData.getComplexColumnLabel( nIndex )
: m_aInternalData.getComplexRowLabel( nIndex );
if( !aComplexLabel.empty() )
@@ -898,7 +897,7 @@ Sequence< uno::Any > SAL_CALL
InternalDataProvider::getDataByRangeRepresentation
else if( aRange.match( lcl_aCategoriesPointRangeNamePrefix ) )
{
auto nPointIndex = o3tl::toUInt32(aRange.subView(
strlen(lcl_aCategoriesPointRangeNamePrefix) ));
- vector< uno::Any > aComplexCategory = m_bDataInColumns
+ std::vector< uno::Any > aComplexCategory = m_bDataInColumns
? m_aInternalData.getComplexRowLabel( nPointIndex )
: m_aInternalData.getComplexColumnLabel( nPointIndex );
if( !aComplexCategory.empty() )
@@ -907,7 +906,7 @@ Sequence< uno::Any > SAL_CALL
InternalDataProvider::getDataByRangeRepresentation
else if( aRange.match( lcl_aCategoriesLevelRangeNamePrefix ) )
{
sal_Int32 nLevel = o3tl::toInt32(aRange.subView(
strlen(lcl_aCategoriesLevelRangeNamePrefix) ));
- const vector< vector< uno::Any > > & aCategories( m_bDataInColumns ?
m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels());
+ const std::vector< std::vector< uno::Any > > & aCategories(
m_bDataInColumns ? m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels());
if( nLevel < lcl_getInnerLevelCount( aCategories ) )
{
aResult.realloc( aCategories.size() );
@@ -917,7 +916,7 @@ Sequence< uno::Any > SAL_CALL
InternalDataProvider::getDataByRangeRepresentation
}
else if( aRange == lcl_aCategoriesRangeName )
{
- const vector< vector< uno::Any > > & aCategories( m_bDataInColumns ?
m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels());
+ const std::vector< std::vector< uno::Any > > & aCategories(
m_bDataInColumns ? m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels());
sal_Int32 nLevelCount = lcl_getInnerLevelCount( aCategories );
if( nLevelCount == 1 )
{
@@ -928,7 +927,7 @@ Sequence< uno::Any > SAL_CALL
InternalDataProvider::getDataByRangeRepresentation
// Maybe this 'else' part and the functions is not necessary
anymore.
const Sequence< OUString > aLabels = m_bDataInColumns ?
getRowDescriptions() : getColumnDescriptions();
aResult.realloc( aLabels.getLength() );
- transform( aLabels.begin(), aLabels.end(),
+ std::transform( aLabels.begin(), aLabels.end(),
aResult.getArray(), CommonFunctors::makeAny< OUString
>() );
}
}
@@ -943,7 +942,7 @@ Sequence< uno::Any > SAL_CALL
InternalDataProvider::getDataByRangeRepresentation
if( aData.hasElements() )
{
aResult.realloc( aData.getLength());
- transform( aData.begin(), aData.end(),
+ std::transform( aData.begin(), aData.end(),
aResult.getArray(), CommonFunctors::makeAny< double
>());
}
}
@@ -955,7 +954,7 @@ Sequence< uno::Any > SAL_CALL
InternalDataProvider::getDataByRangeRepresentation
void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
const OUString& aRange, const Sequence< uno::Any >& aNewData )
{
- auto aNewVector( comphelper::sequenceToContainer<vector< uno::Any
>>(aNewData) );
+ auto aNewVector( comphelper::sequenceToContainer<std::vector< uno::Any
>>(aNewData) );
if( aRange.match( lcl_aLabelRangePrefix ) )
{
sal_uInt32 nIndex = o3tl::toInt32(aRange.subView(
strlen(lcl_aLabelRangePrefix)));
@@ -975,7 +974,7 @@ void SAL_CALL
InternalDataProvider::setDataByRangeRepresentation(
else if( aRange.match( lcl_aCategoriesLevelRangeNamePrefix ) )
{
sal_Int32 nLevel = o3tl::toInt32(aRange.subView(
strlen(lcl_aCategoriesLevelRangeNamePrefix)));
- vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ?
m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels();
+ std::vector< std::vector< uno::Any > > aComplexCategories =
m_bDataInColumns ? m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels();
//ensure equal length
if( aNewVector.size() > aComplexCategories.size() )
@@ -993,7 +992,7 @@ void SAL_CALL
InternalDataProvider::setDataByRangeRepresentation(
}
else if( aRange == lcl_aCategoriesRangeName )
{
- vector< vector< uno::Any > > aComplexCategories;
+ std::vector< std::vector< uno::Any > > aComplexCategories;
aComplexCategories.resize( aNewVector.size() );
transform( aComplexCategories.begin(), aComplexCategories.end(),
aNewVector.begin(),
aComplexCategories.begin(), lcl_setAnyAtLevel(0) );
@@ -1007,7 +1006,7 @@ void SAL_CALL
InternalDataProvider::setDataByRangeRepresentation(
sal_Int32 nIndex = aRange.toInt32();
if( nIndex>=0 )
{
- vector< double > aNewDataVec;
+ std::vector< double > aNewDataVec;
transform( aNewData.begin(), aNewData.end(),
back_inserter( aNewDataVec ),
CommonFunctors::AnyToDouble());
if( m_bDataInColumns )
@@ -1061,7 +1060,7 @@ void SAL_CALL
InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel
OSL_ENSURE( nLevel> 0, "you can only insert category levels > 0" );//the
first categories level cannot be deleted, check the calling code for error
if( nLevel>0 )
{
- vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ?
m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels();
+ std::vector< std::vector< uno::Any > > aComplexCategories =
m_bDataInColumns ? m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels();
std::for_each( aComplexCategories.begin(), aComplexCategories.end(),
lcl_insertAnyAtLevel(nLevel) );
if( m_bDataInColumns )
m_aInternalData.setComplexRowLabels( std::move(aComplexCategories)
);
@@ -1077,7 +1076,7 @@ void SAL_CALL
InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel
OSL_ENSURE( nLevel>0, "you can only delete category levels > 0" );//the
first categories level cannot be deleted, check the calling code for error
if( nLevel>0 )
{
- vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ?
m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels();
+ std::vector< std::vector< uno::Any > > aComplexCategories =
m_bDataInColumns ? m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels();
std::for_each( aComplexCategories.begin(), aComplexCategories.end(),
lcl_removeAnyAtLevel(nLevel) );
if( m_bDataInColumns )
m_aInternalData.setComplexRowLabels( std::move(aComplexCategories)
);
@@ -1292,7 +1291,7 @@ namespace
{
template< class Type >
-Sequence< Sequence< Type > > lcl_convertVectorVectorToSequenceSequence( const
vector< vector< Type > >& rIn )
+Sequence< Sequence< Type > > lcl_convertVectorVectorToSequenceSequence( const
std::vector< std::vector< Type > >& rIn )
{
Sequence< Sequence< Type > > aRet;
sal_Int32 nOuterCount = rIn.size();
@@ -1307,20 +1306,20 @@ Sequence< Sequence< Type > >
lcl_convertVectorVectorToSequenceSequence( const ve
}
template< class Type >
-vector< vector< Type > > lcl_convertSequenceSequenceToVectorVector( const
Sequence< Sequence< Type > >& rIn )
+std::vector< std::vector< Type > > lcl_convertSequenceSequenceToVectorVector(
const Sequence< Sequence< Type > >& rIn )
{
- vector< vector< Type > > aRet;
+ std::vector< std::vector< Type > > aRet;
sal_Int32 nOuterCount = rIn.getLength();
if( nOuterCount )
{
aRet.resize(nOuterCount);
for( sal_Int32 nN=0; nN<nOuterCount; nN++)
- aRet[nN]= comphelper::sequenceToContainer<vector< Type >>( rIn[nN]
);
+ aRet[nN]= comphelper::sequenceToContainer<std::vector< Type >>(
rIn[nN] );
}
return aRet;
}
-std::vector< Sequence< OUString > >
lcl_convertComplexAnyVectorToStringSequence( const vector< vector< uno::Any >
>& rIn )
+std::vector< Sequence< OUString > >
lcl_convertComplexAnyVectorToStringSequence( const std::vector< std::vector<
uno::Any > >& rIn )
{
std::vector< Sequence< OUString > > aRet;
sal_Int32 nOuterCount = rIn.size();
@@ -1333,9 +1332,9 @@ std::vector< Sequence< OUString > >
lcl_convertComplexAnyVectorToStringSequence(
return aRet;
}
-vector< vector< uno::Any > > lcl_convertComplexStringSequenceToAnyVector(
const Sequence< Sequence< OUString > >& rIn )
+std::vector< std::vector< uno::Any > >
lcl_convertComplexStringSequenceToAnyVector( const Sequence< Sequence< OUString
> >& rIn )
{
- vector< vector< uno::Any > > aRet;
+ std::vector< std::vector< uno::Any > > aRet;
sal_Int32 nOuterCount = rIn.getLength();
aRet.reserve(nOuterCount);
for (sal_Int32 nN = 0; nN < nOuterCount; nN++)
@@ -1379,7 +1378,7 @@ uno::Sequence< OUString >
SplitCategoriesProvider_ForComplexDescriptions::getStr
// ____ XDateCategories ____
Sequence< double > SAL_CALL InternalDataProvider::getDateCategories()
{
- const vector< vector< uno::Any > > & aCategories( m_bDataInColumns ?
m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels());
+ const std::vector< std::vector< uno::Any > > & aCategories(
m_bDataInColumns ? m_aInternalData.getComplexRowLabels() :
m_aInternalData.getComplexColumnLabels());
sal_Int32 nCount = aCategories.size();
Sequence< double > aDoubles( nCount );
auto aDoublesRange = asNonConstRange(aDoubles);
@@ -1397,9 +1396,9 @@ Sequence< double > SAL_CALL
InternalDataProvider::getDateCategories()
void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double
>& rDates )
{
sal_Int32 nCount = rDates.getLength();
- vector< vector< uno::Any > > aNewCategories;
+ std::vector< std::vector< uno::Any > > aNewCategories;
aNewCategories.reserve(nCount);
- vector< uno::Any > aSingleLabel(1);
+ std::vector< uno::Any > aSingleLabel(1);
for(sal_Int32 nN=0; nN<nCount; ++nN )
{
@@ -1462,7 +1461,7 @@ void SAL_CALL InternalDataProvider::setData( const
Sequence< Sequence< double >
void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence<
OUString >& aRowDescriptions )
{
- vector< vector< uno::Any > > aComplexDescriptions(
aRowDescriptions.getLength() );
+ std::vector< std::vector< uno::Any > > aComplexDescriptions(
aRowDescriptions.getLength() );
transform( aComplexDescriptions.begin(), aComplexDescriptions.end(),
aRowDescriptions.getConstArray(),
aComplexDescriptions.begin(),
lcl_setAnyAtLevelFromStringSequence(0) );
m_aInternalData.setComplexRowLabels( std::move(aComplexDescriptions) );
@@ -1470,7 +1469,7 @@ void SAL_CALL InternalDataProvider::setRowDescriptions(
const Sequence< OUString
void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence<
OUString >& aColumnDescriptions )
{
- vector< vector< uno::Any > > aComplexDescriptions(
aColumnDescriptions.getLength() );
+ std::vector< std::vector< uno::Any > > aComplexDescriptions(
aColumnDescriptions.getLength() );
transform( aComplexDescriptions.begin(), aComplexDescriptions.end(),
aColumnDescriptions.getConstArray(),
aComplexDescriptions.begin(),
lcl_setAnyAtLevelFromStringSequence(0) );
m_aInternalData.setComplexColumnLabels( std::move(aComplexDescriptions) );
@@ -1478,14 +1477,14 @@ void SAL_CALL
InternalDataProvider::setColumnDescriptions( const Sequence< OUStr
Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions()
{
- const vector< vector< uno::Any > > & aComplexLabels(
m_aInternalData.getComplexRowLabels() );
+ const std::vector< std::vector< uno::Any > > & aComplexLabels(
m_aInternalData.getComplexRowLabels() );
SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels );
return ExplicitCategoriesProvider::getExplicitSimpleCategories( aProvider
);
}
Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions()
{
- const vector< vector< uno::Any > > & aComplexLabels(
m_aInternalData.getComplexColumnLabels() );
+ const std::vector< std::vector< uno::Any > > & aComplexLabels(
m_aInternalData.getComplexColumnLabels() );
SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels );
return ExplicitCategoriesProvider::getExplicitSimpleCategories( aProvider
);
}
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx
b/chart2/source/tools/RelativeSizeHelper.cxx
index 294b50e34237..4a3cd84cfb88 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -27,7 +27,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
-using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
@@ -45,7 +44,7 @@ double RelativeSizeHelper::calculate(
rOldReferenceSize.Height <= 0 )
return fValue;
- return min(
+ return std::min(
static_cast< double >( rNewReferenceSize.Width ) / static_cast<
double >( rOldReferenceSize.Width ),
static_cast< double >( rNewReferenceSize.Height ) / static_cast<
double >( rOldReferenceSize.Height ))
* fValue;
@@ -58,7 +57,7 @@ void RelativeSizeHelper::adaptFontSizes(
{
float fFontHeight = 0;
- vector< OUString > aProperties;
+ std::vector< OUString > aProperties;
aProperties.emplace_back("CharHeight" );
aProperties.emplace_back("CharHeightAsian" );
aProperties.emplace_back("CharHeightComplex" );
@@ -92,7 +91,7 @@ void RelativeSizeHelper::adaptFontSizes(
float fFontHeight = 0;
- vector< OUString > aProperties;
+ std::vector< OUString > aProperties;
aProperties.emplace_back("CharHeight" );
aProperties.emplace_back("CharHeightAsian" );
aProperties.emplace_back("CharHeightComplex" );
diff --git a/connectivity/source/drivers/firebird/Indexes.cxx
b/connectivity/source/drivers/firebird/Indexes.cxx
index 10ec90dc5be0..7bf783c79c7b 100644
--- a/connectivity/source/drivers/firebird/Indexes.cxx
+++ b/connectivity/source/drivers/firebird/Indexes.cxx
@@ -13,12 +13,11 @@ using namespace ::connectivity;
using namespace ::connectivity::firebird;
using namespace ::osl;
-using namespace ::std;
using namespace ::com::sun::star;
using namespace ::com::sun::star::sdbc;
-Indexes::Indexes(Table* pTable, Mutex& rMutex, const vector<OUString>& rVector)
+Indexes::Indexes(Table* pTable, Mutex& rMutex, const std::vector<OUString>&
rVector)
: OIndexesHelper(pTable, rMutex, rVector)
, m_pTable(pTable)
{
diff --git a/connectivity/source/drivers/firebird/Statement.cxx
b/connectivity/source/drivers/firebird/Statement.cxx
index f4faebbf1a55..fec83410f802 100644
--- a/connectivity/source/drivers/firebird/Statement.cxx
+++ b/connectivity/source/drivers/firebird/Statement.cxx
@@ -40,7 +40,6 @@ using namespace com::sun::star::util;
using namespace ::comphelper;
using namespace ::osl;
-using namespace ::std;
// ---- XBatchExecution - UNSUPPORTED ----------------------------------------
void SAL_CALL OStatement::addBatch(const OUString&)
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index df4d971e89bc..917f801c7a9d 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star::util;
using namespace ::comphelper;
using namespace ::osl;
-using namespace ::std;
OStatementCommonBase::OStatementCommonBase(Connection* _pConnection)
: OStatementCommonBase_Base(m_aMutex),
diff --git a/cppu/source/threadpool/threadident.cxx
b/cppu/source/threadpool/threadident.cxx
index 16b7c0b2700a..f2b9511e6b46 100644
--- a/cppu/source/threadpool/threadident.cxx
+++ b/cppu/source/threadpool/threadident.cxx
@@ -27,7 +27,6 @@
#include "current.hxx"
-using namespace ::std;
using namespace ::osl;
using namespace ::cppu;
diff --git a/cppu/source/threadpool/threadpool.cxx
b/cppu/source/threadpool/threadpool.cxx
index 897bebed9ac4..a65bdcfaf625 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -33,7 +33,6 @@
#include "threadpool.hxx"
#include "thread.hxx"
-using namespace ::std;
using namespace ::osl;
using namespace ::rtl;
@@ -237,7 +236,7 @@ namespace cppu_threadpool
if( ii == m_mapQueue.end() )
{
- m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > (
nullptr , nullptr );
+ m_mapQueue[ aThreadId ] = std::pair < JobQueue * , JobQueue *
> ( nullptr , nullptr );
ii = m_mapQueue.find( aThreadId );
OSL_ASSERT( ii != m_mapQueue.end() );
}
@@ -280,7 +279,7 @@ namespace cppu_threadpool
if( ii == m_mapQueue.end() )
{
JobQueue *p = new JobQueue();
- m_mapQueue[ aThreadId ] = pair< JobQueue * , JobQueue * > ( p ,
nullptr );
+ m_mapQueue[ aThreadId ] = std::pair< JobQueue * , JobQueue * > ( p
, nullptr );
}
else if( nullptr == (*ii).second.first )
{
