summaryrefslogtreecommitdiff
path: root/connectivity/source/commontools
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 /connectivity/source/commontools
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 'connectivity/source/commontools')
-rw-r--r--connectivity/source/commontools/ConnectionWrapper.cxx4
-rw-r--r--connectivity/source/commontools/RowFunctionParser.cxx4
-rw-r--r--connectivity/source/commontools/TDatabaseMetaDataBase.cxx32
-rw-r--r--connectivity/source/commontools/TIndex.cxx4
-rw-r--r--connectivity/source/commontools/TIndexColumns.cxx2
-rw-r--r--connectivity/source/commontools/TIndexes.cxx2
-rw-r--r--connectivity/source/commontools/TKey.cxx2
-rw-r--r--connectivity/source/commontools/TKeyColumns.cxx2
-rw-r--r--connectivity/source/commontools/TSkipDeletedSet.cxx10
-rw-r--r--connectivity/source/commontools/TSortIndex.cxx18
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx34
-rw-r--r--connectivity/source/commontools/dbtools.cxx32
-rw-r--r--connectivity/source/commontools/dbtools2.cxx4
-rw-r--r--connectivity/source/commontools/parameters.cxx20
-rw-r--r--connectivity/source/commontools/paramwrapper.cxx4
-rw-r--r--connectivity/source/commontools/propertyids.cxx2
-rw-r--r--connectivity/source/commontools/sqlerror.cxx4
17 files changed, 90 insertions, 90 deletions
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 2e8be47952bf..9cf55cb1a351 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -181,7 +181,7 @@ Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelImplementationId()
namespace
{
- class TPropertyValueLessFunctor : public ::std::binary_function< css::beans::PropertyValue,css::beans::PropertyValue,bool>
+ class TPropertyValueLessFunctor : public std::binary_function< css::beans::PropertyValue,css::beans::PropertyValue,bool>
{
public:
TPropertyValueLessFunctor()
@@ -212,7 +212,7 @@ void OConnectionWrapper::createUniqueId( const OUString& _rURL
// now we need to sort the properties
PropertyValue* pBegin = _rInfo.getArray();
PropertyValue* pEnd = pBegin + _rInfo.getLength();
- ::std::sort(pBegin,pEnd,TPropertyValueLessFunctor());
+ std::sort(pBegin,pEnd,TPropertyValueLessFunctor());
pBegin = _rInfo.getArray();
pEnd = pBegin + _rInfo.getLength();
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index cada6eeb03e2..30ccbd971eed 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -129,7 +129,7 @@ typedef const sal_Char* StringIteratorT;
struct ParserContext
{
- typedef ::std::stack< std::shared_ptr<ExpressionNode> > OperandStack;
+ typedef std::stack< std::shared_ptr<ExpressionNode> > OperandStack;
// stores a stack of not-yet-evaluated operands. This is used
// by the operators (i.e. '+', '*', 'sin' etc.) to pop their
@@ -426,7 +426,7 @@ std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& _
::boost::spirit::space_p ) );
#if (OSL_DEBUG_LEVEL > 0)
- ::std::cout.flush(); // needed to keep stdout and cout in sync
+ std::cout.flush(); // needed to keep stdout and cout in sync
#endif
// input fully congested by the parser?
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index d8d426b1182d..92728dfc1406 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -114,7 +114,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( )
,DataType::INTEGER
,DataType::INTEGER
};
- ::std::vector<std::shared_ptr<ExpressionNode>> aConditions;
+ std::vector<std::shared_ptr<ExpressionNode>> aConditions;
if ( aTypeInfoSettings.getLength() > 1 && ((aTypeInfoSettings.getLength() % 2) == 0) )
{
const Any* pIter = aTypeInfoSettings.getConstArray();
@@ -145,8 +145,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( )
aRow.push_back(new ORowSetValueDecorator(aValue));
}
- ::std::vector<std::shared_ptr<ExpressionNode>>::iterator aIter = aConditions.begin();
- ::std::vector<std::shared_ptr<ExpressionNode>>::const_iterator aEnd = aConditions.end();
+ std::vector<std::shared_ptr<ExpressionNode>>::iterator aIter = aConditions.begin();
+ std::vector<std::shared_ptr<ExpressionNode>>::const_iterator aEnd = aConditions.end();
for (; aIter != aEnd; ++aIter)
{
if ( (*aIter)->evaluate(aRow)->getValue().getBool() )
@@ -258,67 +258,67 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( )
OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( )
{
- return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
+ return callImplMethod(m_sIdentifierQuoteString,std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( )
{
- return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
+ return callImplMethod(m_isCatalogAtStart,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
}
OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( )
{
- return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
+ return callImplMethod(m_sCatalogSeparator,std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( )
{
- return callImplMethod(m_supportsCatalogsInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
+ return callImplMethod(m_supportsCatalogsInTableDefinitions,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( )
{
- return callImplMethod(m_supportsSchemasInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
+ return callImplMethod(m_supportsSchemasInTableDefinitions,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( )
{
- return callImplMethod(m_supportsCatalogsInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
+ return callImplMethod(m_supportsCatalogsInDataManipulation,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( )
{
- return callImplMethod(m_supportsSchemasInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
+ return callImplMethod(m_supportsSchemasInDataManipulation,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( )
{
- return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
+ return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( )
{
- return callImplMethod(m_supportsAlterTableWithAddColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
+ return callImplMethod(m_supportsAlterTableWithAddColumn,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( )
{
- return callImplMethod(m_supportsAlterTableWithDropColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
+ return callImplMethod(m_supportsAlterTableWithDropColumn,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
}
sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( )
{
- return callImplMethod(m_MaxStatements,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
+ return callImplMethod(m_MaxStatements,std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
}
sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( )
{
- return callImplMethod(m_MaxTablesInSelect,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
+ return callImplMethod(m_MaxTablesInSelect,std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( )
{
- return callImplMethod(m_storesMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
+ return callImplMethod(m_storesMixedCaseQuotedIdentifiers,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
}
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index 0adbc7031a48..28c1827075eb 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -36,7 +36,7 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex
, m_pTable(_pTable)
{
construct();
- ::std::vector< OUString> aVector;
+ std::vector< OUString> aVector;
m_pColumns.reset( new OIndexColumns(this,m_aMutex,aVector) );
}
@@ -63,7 +63,7 @@ void OIndexHelper::refreshColumns()
if ( !m_pTable )
return;
- ::std::vector< OUString> aVector;
+ std::vector< OUString> aVector;
if ( !isNew() )
{
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 3d19c026ec1d..fcddb7f4caec 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::lang;
OIndexColumns::OIndexColumns( OIndexHelper* _pIndex,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector)
+ const std::vector< OUString> &_rVector)
: connectivity::sdbcx::OCollection(*_pIndex,true,_rMutex,_rVector)
,m_pIndex(_pIndex)
{
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 66a7ccb6078d..0c950b919e24 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -40,7 +40,7 @@ using namespace cppu;
OIndexesHelper::OIndexesHelper(OTableHelper* _pTable,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector
+ const std::vector< OUString> &_rVector
)
: OCollection(*_pTable,true,_rMutex,_rVector)
,m_pTable(_pTable)
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 783aa533ad92..89d5bf44b3f1 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -52,7 +52,7 @@ void OTableKeyHelper::refreshColumns()
if ( !m_pTable )
return;
- ::std::vector< OUString> aVector;
+ std::vector< OUString> aVector;
if ( !isNew() )
{
aVector = m_aProps->m_aKeyColumnNames;
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 01cdab458112..5e6dca1c3f5d 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang;
OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector)
+ const std::vector< OUString> &_rVector)
: connectivity::sdbcx::OCollection(*_pKey,true,_rMutex,_rVector)
,m_pKey(_pKey)
{
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index 829dfd1beb8e..5778e219d121 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -151,7 +151,7 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, s
if ( nDriverPos > (sal_Int32)m_aBookmarksPositions.size() )
m_aBookmarksPositions.push_back(nDriverPos);
}
- else if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
+ else if ( std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
m_aBookmarksPositions.push_back(nDriverPos);
/*sal_Int32 nDriverPos = m_pHelper->getDriverPos();
if(m_aBookmarks.find(nDriverPos) == m_aBookmarks.end())
@@ -225,13 +225,13 @@ bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool _bRetrieveData)
void OSkipDeletedSet::clear()
{
- ::std::vector<sal_Int32>().swap(m_aBookmarksPositions);
+ std::vector<sal_Int32>().swap(m_aBookmarksPositions);
//TInt2IntMap().swap(m_aBookmarks);
}
sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const
{
- ::std::vector<sal_Int32>::const_iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos);
+ std::vector<sal_Int32>::const_iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos);
if ( aFind != m_aBookmarksPositions.end() )
return (aFind - m_aBookmarksPositions.begin()) + 1;
/*TInt2IntMap::const_iterator aFind = m_aBookmarks.find(_nPos);
@@ -245,13 +245,13 @@ void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos)
{
//OSL_ENSURE(m_aBookmarks.find(_nPos) == m_aBookmarks.end(),"OSkipDeletedSet::insertNewPosition: Invalid position");
//m_aBookmarksPositions.push_back(m_aBookmarks.insert(TInt2IntMap::value_type(_nPos,m_aBookmarksPositions.size()+1)).first);
- //OSL_ENSURE(::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos");
+ //OSL_ENSURE(std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos");
m_aBookmarksPositions.push_back(_nPos);
}
void OSkipDeletedSet::deletePosition(sal_Int32 _nBookmark)
{
- ::std::vector<sal_Int32>::iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark);
+ std::vector<sal_Int32>::iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark);
if ( aFind != m_aBookmarksPositions.end() )
{
//TInt2IntMap::iterator aFind = m_aBookmarks.find(_nPos);
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 2bb5541d0d6d..d1c72e01a921 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -25,7 +25,7 @@
using namespace connectivity;
/// binary_function Functor object for class OSortIndex::TIntValuePairVector::value_type returntype is bool
-struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::value_type,OSortIndex::TIntValuePairVector::value_type,bool>
+struct TKeyValueFunc : std::binary_function<OSortIndex::TIntValuePairVector::value_type,OSortIndex::TIntValuePairVector::value_type,bool>
{
OSortIndex* pIndex;
@@ -35,9 +35,9 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
// return false if compared values are equal otherwise true
inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const
{
- const ::std::vector<OKeyType>& aKeyType = pIndex->getKeyType();
- ::std::vector<OKeyType>::const_iterator aIter = aKeyType.begin();
- for (::std::vector<sal_Int16>::size_type i=0;aIter != aKeyType.end(); ++aIter,++i)
+ const std::vector<OKeyType>& aKeyType = pIndex->getKeyType();
+ std::vector<OKeyType>::const_iterator aIter = aKeyType.begin();
+ for (std::vector<sal_Int16>::size_type i=0;aIter != aKeyType.end(); ++aIter,++i)
{
const bool bGreater = pIndex->getAscending(i) != TAscendingOrder::ASC;
const bool bLess = !bGreater;
@@ -82,16 +82,16 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
::rtl::Reference<OKeySet> pKeySet = new OKeySet();
pKeySet->get().reserve(m_aKeyValues.size());
- ::std::transform(m_aKeyValues.begin()
+ std::transform(m_aKeyValues.begin()
,m_aKeyValues.end()
- ,::std::back_inserter(pKeySet->get())
+ ,std::back_inserter(pKeySet->get())
,::o3tl::select1st<TIntValuePairVector::value_type>());
pKeySet->setFrozen();
return pKeySet;
}
-OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType,
- const ::std::vector<TAscendingOrder>& _aAscending)
+OSortIndex::OSortIndex( const std::vector<OKeyType>& _aKeyType,
+ const std::vector<TAscendingOrder>& _aAscending)
:m_aKeyType(_aKeyType)
,m_aAscending(_aAscending)
,m_bFrozen(false)
@@ -120,7 +120,7 @@ void OSortIndex::Freeze()
// Sortierung:
if (m_aKeyType[0] != OKeyType::NONE)
// we will sort ourself when the first keyType say so
- ::std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this));
+ std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this));
TIntValuePairVector::iterator aIter = m_aKeyValues.begin();
for(;aIter != m_aKeyValues.end();++aIter)
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 7d20c75e7573..3f851a6afd1f 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -57,7 +57,7 @@ class OTableContainerListener:
public ::cppu::WeakImplHelper< XContainerListener >
{
OTableHelper* m_pComponent;
- ::std::map< OUString,bool> m_aRefNames;
+ std::map< OUString,bool> m_aRefNames;
protected:
virtual ~OTableContainerListener() override {}
@@ -89,7 +89,7 @@ public:
{
}
void clear() { m_pComponent = nullptr; }
- inline void add(const OUString& _sRefName) { m_aRefNames.insert(::std::map< OUString,bool>::value_type(_sRefName,true)); }
+ inline void add(const OUString& _sRefName) { m_aRefNames.insert(std::map< OUString,bool>::value_type(_sRefName,true)); }
};
}
namespace connectivity
@@ -116,7 +116,7 @@ namespace connectivity
Reference< css::sdbc::XDatabaseMetaData > m_xMetaData;
Reference< css::sdbc::XConnection > m_xConnection;
rtl::Reference<OTableContainerListener> m_xTablePropertyListener;
- ::std::vector< ColumnDesc > m_aColumnDesc;
+ std::vector< ColumnDesc > m_aColumnDesc;
explicit OTableHelperImpl(const Reference< css::sdbc::XConnection >& _xConnection)
: m_xConnection(_xConnection)
{
@@ -191,7 +191,7 @@ namespace
{
/** collects ColumnDesc's from a resultset produced by XDatabaseMetaData::getColumns
*/
- void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, ::std::vector< ColumnDesc >& _out_rColumns )
+ void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, std::vector< ColumnDesc >& _out_rColumns )
{
Reference< XRow > xRow( _rxResult, UNO_QUERY_THROW );
OUString sName;
@@ -214,14 +214,14 @@ namespace
/** checks a given array of ColumnDesc's whether it has reasonable ordinal positions. If not,
they will be normalized to be the array index.
*/
- void lcl_sanitizeColumnDescs( ::std::vector< ColumnDesc >& _rColumns )
+ void lcl_sanitizeColumnDescs( std::vector< ColumnDesc >& _rColumns )
{
if ( _rColumns.empty() )
return;
// collect all used ordinals
- ::std::set< OrdinalPosition > aUsedOrdinals;
- for ( ::std::vector< ColumnDesc >::const_iterator collect = _rColumns.begin();
+ std::set< OrdinalPosition > aUsedOrdinals;
+ for ( std::vector< ColumnDesc >::const_iterator collect = _rColumns.begin();
collect != _rColumns.end();
++collect
)
@@ -239,7 +239,7 @@ namespace
OSL_FAIL( "lcl_sanitizeColumnDescs: database did provide invalid ORDINAL_POSITION values!" );
OrdinalPosition nNormalizedPosition = 1;
- for ( ::std::vector< ColumnDesc >::iterator normalize = _rColumns.begin();
+ for ( std::vector< ColumnDesc >::iterator normalize = _rColumns.begin();
normalize != _rColumns.end();
++normalize
)
@@ -250,7 +250,7 @@ namespace
// what's left is that the range might not be from 1 to <column count>, but for instance
// 0 to <column count>-1.
size_t nOffset = *aUsedOrdinals.begin() - 1;
- for ( ::std::vector< ColumnDesc >::iterator offset = _rColumns.begin();
+ for ( std::vector< ColumnDesc >::iterator offset = _rColumns.begin();
offset != _rColumns.end();
++offset
)
@@ -283,19 +283,19 @@ void OTableHelper::refreshColumns()
lcl_sanitizeColumnDescs( m_pImpl->m_aColumnDesc );
// sort by ordinal position
- ::std::map< OrdinalPosition, OUString > aSortedColumns;
- for ( ::std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin();
+ std::map< OrdinalPosition, OUString > aSortedColumns;
+ for ( std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin();
copy != m_pImpl->m_aColumnDesc.end();
++copy
)
aSortedColumns[ copy->nOrdinalPosition ] = copy->sName;
// copy them to aVector, now that we have the proper ordering
- ::std::transform(
+ std::transform(
aSortedColumns.begin(),
aSortedColumns.end(),
- ::std::insert_iterator< TStringVector >( aVector, aVector.begin() ),
- ::o3tl::select2nd< ::std::map< OrdinalPosition, OUString >::value_type >()
+ std::insert_iterator< TStringVector >( aVector, aVector.begin() ),
+ ::o3tl::select2nd< std::map< OrdinalPosition, OUString >::value_type >()
);
}
@@ -308,15 +308,15 @@ void OTableHelper::refreshColumns()
const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) const
{
const ColumnDesc* pRet = nullptr;
- ::std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end();
- for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
+ std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end();
+ for (std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
{
if ( aIter->sName == _sName )
{
pRet = &*aIter;
break;
}
- } // for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
+ } // for (std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
return pRet;
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index dc3440f66b9d..f883b576ee4d 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -965,7 +965,7 @@ try
if ( pOldProps[i].Name != "DefaultControl" && pOldProps[i].Name != "LabelControl" )
{
// binary search
- Property* pResult = ::std::lower_bound(
+ Property* pResult = std::lower_bound(
pNewProps, pNewProps + nNewLen, pOldProps[i], ::comphelper::PropertyCompareByName());
if ( pResult
@@ -1383,11 +1383,11 @@ sal_Int32 getSearchColumnFlag( const Reference< XConnection>& _rxConn,sal_Int32
OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& _rBaseName, bool _bStartWithNumber )
{
- ::std::set< OUString > aUsedNames;
- ::std::copy(
+ std::set< OUString > aUsedNames;
+ std::copy(
_rNames.getConstArray(),
_rNames.getConstArray() + _rNames.getLength(),
- ::std::insert_iterator< ::std::set< OUString > >( aUsedNames, aUsedNames.end() )
+ std::insert_iterator< std::set< OUString > >( aUsedNames, aUsedNames.end() )
);
OUString sName( _rBaseName );
@@ -1630,10 +1630,10 @@ namespace
{
class OParameterWrapper : public ::cppu::WeakImplHelper< XIndexAccess >
{
- ::std::vector<bool, std::allocator<bool> > m_aSet;
+ std::vector<bool, std::allocator<bool> > m_aSet;
Reference<XIndexAccess> m_xSource;
public:
- OParameterWrapper(const ::std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){}
+ OParameterWrapper(const std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){}
private:
// css::container::XElementAccess
virtual Type SAL_CALL getElementType() override
@@ -1644,14 +1644,14 @@ namespace
{
if ( m_aSet.empty() )
return m_xSource->hasElements();
- return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
+ return std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
}
// css::container::XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) override
{
if ( m_aSet.empty() )
return m_xSource->getCount();
- return ::std::count(m_aSet.begin(),m_aSet.end(),false);
+ return std::count(m_aSet.begin(),m_aSet.end(),false);
}
virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override
{
@@ -1660,8 +1660,8 @@ namespace
if ( m_aSet.size() < (size_t)Index )
throw IndexOutOfBoundsException();
- ::std::vector<bool, std::allocator<bool> >::const_iterator aIter = m_aSet.begin();
- ::std::vector<bool, std::allocator<bool> >::const_iterator aEnd = m_aSet.end();
+ std::vector<bool, std::allocator<bool> >::const_iterator aIter = m_aSet.begin();
+ std::vector<bool, std::allocator<bool> >::const_iterator aEnd = m_aSet.end();
sal_Int32 i = 0;
sal_Int32 nParamPos = -1;
for(; aIter != aEnd && i <= Index; ++aIter)
@@ -1681,7 +1681,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
const Reference<XParameters>& _xParameters,
const Reference< XConnection>& _xConnection,
const Reference< XInteractionHandler >& _rxHandler,
- const ::std::vector<bool, std::allocator<bool> >& _aParametersSet)
+ const std::vector<bool, std::allocator<bool> >& _aParametersSet)
{
OSL_ENSURE(_xComposer.is(),"dbtools::askForParameters XSQLQueryComposer is null!");
OSL_ENSURE(_xParameters.is(),"dbtools::askForParameters XParameters is null!");
@@ -1693,12 +1693,12 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
Reference<XIndexAccess> xParamsAsIndicies = xParameters.is() ? xParameters->getParameters() : Reference<XIndexAccess>();
sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0;
- ::std::vector<bool, std::allocator<bool> > aNewParameterSet( _aParametersSet );
- if ( nParamCount && ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
+ std::vector<bool, std::allocator<bool> > aNewParameterSet( _aParametersSet );
+ if ( nParamCount && std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
{
static const OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
aNewParameterSet.resize(nParamCount ,false);
- typedef ::std::map< OUString, ::std::vector<sal_Int32> > TParameterPositions;
+ typedef std::map< OUString, std::vector<sal_Int32> > TParameterPositions;
TParameterPositions aParameterNames;
for(sal_Int32 i = 0; i < nParamCount; ++i)
{
@@ -1758,8 +1758,8 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
xParamColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale;
// (the index of the parameters is one-based)
TParameterPositions::const_iterator aFind = aParameterNames.find(pFinalValues->Name);
- ::std::vector<sal_Int32>::const_iterator aIterPos = aFind->second.begin();
- ::std::vector<sal_Int32>::const_iterator aEndPos = aFind->second.end();
+ std::vector<sal_Int32>::const_iterator aIterPos = aFind->second.begin();
+ std::vector<sal_Int32>::const_iterator aEndPos = aFind->second.end();
for(;aIterPos != aEndPos;++aIterPos)
{
if ( _aParametersSet.empty() || !_aParametersSet[(*aIterPos)-1] )
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index ba73d0dddf03..43c0b424200e 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -638,9 +638,9 @@ bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp, const OUSt
{
Sequence< PropertyValue > aInfo;
xProp->getPropertyValue("Info") >>= aInfo;
- const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(),
+ const PropertyValue* pValue =std::find_if(aInfo.getConstArray(),
aInfo.getConstArray() + aInfo.getLength(),
- ::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty));
+ std::bind2nd(TPropertyValueEqualFunctor(),_sProperty));
if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) )
pValue->Value >>= bEnabled;
}
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index ad3bf0338f15..2db8bb4e12a0 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -107,7 +107,7 @@ namespace dbtools
m_sIdentifierQuoteString.clear();
m_sSpecialCharacters.clear();
m_xConnectionMetadata.clear();
- ::std::vector< bool > aEmptyArray;
+ std::vector< bool > aEmptyArray;
m_aParametersVisited.swap( aEmptyArray );
m_bUpToDate = false;
}
@@ -240,7 +240,7 @@ namespace dbtools
void ParameterManager::classifyLinks( const Reference< XNameAccess >& _rxParentColumns,
- const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents )
+ const Reference< XNameAccess >& _rxColumns, std::vector< OUString >& _out_rAdditionalFilterComponents )
{
OSL_PRECOND( m_aMasterFields.size() == m_aDetailFields.size(),
"ParameterManager::classifyLinks: master and detail fields should have the same length!" );
@@ -251,8 +251,8 @@ namespace dbtools
// we may need to strip any links which are invalid, so here go the containers
// for temporarirly holding the new pairs
- ::std::vector< OUString > aStrippedMasterFields;
- ::std::vector< OUString > aStrippedDetailFields;
+ std::vector< OUString > aStrippedMasterFields;
+ std::vector< OUString > aStrippedDetailFields;
bool bNeedExchangeLinks = false;
@@ -297,7 +297,7 @@ namespace dbtools
OSL_PRECOND( !sNewParamName.isEmpty(), "ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned nonsense!" );
// remember meta information about this new parameter
- ::std::pair< ParameterInformation::iterator, bool > aInsertionPos =
+ std::pair< ParameterInformation::iterator, bool > aInsertionPos =
m_aParameterInformation.insert(
ParameterInformation::value_type( sNewParamName, ParameterMetaData( nullptr ) )
);
@@ -376,7 +376,7 @@ namespace dbtools
return;
// classify the links - depending on what the detail fields in each link pair denotes
- ::std::vector< OUString > aAdditionalFilterComponents;
+ std::vector< OUString > aAdditionalFilterComponents;
classifyLinks( xParentColumns, xColumns, aAdditionalFilterComponents );
// did we find links where the detail field refers to a detail column (instead of a parameter name)?
@@ -384,7 +384,7 @@ namespace dbtools
{
// build a conjunction of all the filter components
OUStringBuffer sAdditionalFilter;
- for ( ::std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin();
+ for ( std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin();
aComponent != aAdditionalFilterComponents.end();
++aComponent
)
@@ -447,7 +447,7 @@ namespace dbtools
// check which of the parameters have already been visited (e.g. filled via XParameters)
size_t nAlreadyVisited = 0;
- for ( ::std::vector< sal_Int32 >::iterator aIndex = aParam->second.aInnerIndexes.begin();
+ for ( std::vector< sal_Int32 >::iterator aIndex = aParam->second.aInnerIndexes.begin();
aIndex != aParam->second.aInnerIndexes.end();
++aIndex
)
@@ -580,7 +580,7 @@ namespace dbtools
Reference< XPropertySet > xMasterField(_rxParentColumns->getByName( *pMasterFields ),UNO_QUERY);
// the positions where we have to fill in values for the current parameter name
- for ( ::std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin();
+ for ( std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin();
aPosition != aParamInfo->second.aInnerIndexes.end();
++aPosition
)
@@ -908,7 +908,7 @@ namespace dbtools
if ( !xMasterField.is() )
continue;
- for ( ::std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin();
+ for ( std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin();
aPosition != aParamInfo->second.aInnerIndexes.end();
++aPosition
)
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 1db52ce640c3..817de72d9365 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -76,7 +76,7 @@ namespace param
ParameterWrapper::ParameterWrapper( const Reference< XPropertySet >& _rxColumn,
- const Reference< XParameters >& _rxAllParameters, const ::std::vector< sal_Int32 >& _rIndexes )
+ const Reference< XParameters >& _rxAllParameters, const std::vector< sal_Int32 >& _rIndexes )
:PropertyBase( m_aBHelper )
,m_aIndexes( _rIndexes )
,m_xDelegator( _rxColumn )
@@ -206,7 +206,7 @@ namespace param
if ( m_xValueDestination.is() )
{
- for ( ::std::vector< sal_Int32 >::const_iterator aIter = m_aIndexes.begin(); aIter != m_aIndexes.end(); ++aIter )
+ for ( std::vector< sal_Int32 >::const_iterator aIter = m_aIndexes.begin(); aIter != m_aIndexes.end(); ++aIter )
{
m_xValueDestination->setObjectWithInfo( *aIter + 1, rValue, nParamType, nScale );
// (the index of the parameters is one-based)
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index b653d0f8eb4a..e88fb5098def 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -94,7 +94,7 @@ namespace dbtools
const OUString& OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const
{
- ::std::map<sal_Int32, OUString>::const_iterator aIter = m_aPropertyMap.find(_nIndex);
+ std::map<sal_Int32, OUString>::const_iterator aIter = m_aPropertyMap.find(_nIndex);
return aIter->second;
}
}
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index c261aeca4d24..9a6d5d657456 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -82,7 +82,7 @@ namespace connectivity
private:
::osl::Mutex m_aMutex;
Reference<XComponentContext> m_aContext;
- ::std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
+ std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
bool m_bAttemptedInit;
};
@@ -177,7 +177,7 @@ namespace connectivity
const Type& _rExceptionType, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
{
if ( !::cppu::UnoType< SQLException >::get().isAssignableFrom( _rExceptionType ) )
- throw ::std::bad_cast();
+ throw std::bad_cast();
// default-construct an exception of the desired type
Any aException( nullptr, _rExceptionType );