diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-17 19:06:24 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-17 18:41:19 +0000 |
commit | b57d51e32fb85e9cde64f85719725253162c42e4 (patch) | |
tree | afe75470b9fc3c12a3d240577b07042985882675 /dbaccess/source/ui/relationdesign | |
parent | c910d1dae1a9fcf0591098244debc863dd59618a (diff) |
Drop :: prefix from std in [de]*/
Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4
Reviewed-on: https://gerrit.libreoffice.org/34377
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
3 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 4b5824a0dbb0..6b0468508fda 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -61,7 +61,7 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re long nTemp; const OConnectionLine* pTopLine = nullptr; - const ::std::vector<OConnectionLine*>& rConnLineList = GetConnLineList(); + const std::vector<OConnectionLine*>& rConnLineList = GetConnLineList(); std::vector<OConnectionLine*>::const_iterator aIter = rConnLineList.begin(); std::vector<OConnectionLine*>::const_iterator aEnd = rConnLineList.end(); diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index e42dc0df526e..04f355764bb6 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -274,7 +274,7 @@ namespace { class RelationLoader : public ::osl::Thread { - typedef std::map<OUString, ::std::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper; + typedef std::map<OUString, std::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper; TTableDataHelper m_aTableData; TTableConnectionData m_vTableConnectionData; const Sequence< OUString> m_aTableList; @@ -442,7 +442,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData { ::osl::MutexGuard aGuard( getMutex() ); - ::std::copy( _aConnectionData.begin(), _aConnectionData.end(), ::std::back_inserter( m_vTableConnectionData )); + std::copy( _aConnectionData.begin(), _aConnectionData.end(), std::back_inserter( m_vTableConnectionData )); // here we are finished, so we can collect the table from connection data TTableConnectionData::const_iterator aConnDataIter = m_vTableConnectionData.begin(); TTableConnectionData::const_iterator aConnDataEnd = m_vTableConnectionData.end(); @@ -501,7 +501,7 @@ void ORelationController::loadData() if ( aMeta.supportsThreads() ) { const sal_Int32 nMaxElements = (nCount / MAX_THREADS) +1; - sal_Int32 nStart = 0,nEnd = ::std::min(nMaxElements,nCount); + sal_Int32 nStart = 0,nEnd = std::min(nMaxElements,nCount); while(nStart != nEnd) { ++m_nThreadEvent; @@ -511,7 +511,7 @@ void ORelationController::loadData() pThread->resume(); nStart = nEnd; nEnd += nMaxElements; - nEnd = ::std::min(nEnd,nCount); + nEnd = std::min(nEnd,nCount); } } else diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index d0af2765bb64..705931b5cd0e 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -98,7 +98,7 @@ void ORelationTableView::ReSync() // Tables could have been hidden in the database, which are part of a relation. Or a table was in layout // (quite often without a relation) and does not exist anymore. In both cases creation of TabWins will fail // and all TabWinDatas and related ConnDates should be deleted. - ::std::vector< OUString> arrInvalidTables; + std::vector< OUString> arrInvalidTables; // create and insert windows TTableWindowData& rTabWinDataList = m_pView->getController().getTableWindowData(); @@ -116,7 +116,7 @@ void ORelationTableView::ReSync() pTabWin.disposeAndClear(); arrInvalidTables.push_back(pData->GetTableName()); - rTabWinDataList.erase( ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end()); + rTabWinDataList.erase( std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end()); continue; } @@ -139,14 +139,14 @@ void ORelationTableView::ReSync() { // do the tables to the connection exist? OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetTableName(); - bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bool bInvalid = std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); strTabExistenceTest = pTabConnData->getReferencedTable()->GetTableName(); - bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bInvalid = bInvalid || std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) { // no -> bad luck, the connection is gone - rTabConnDataList.erase( ::std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end() ); + rTabConnDataList.erase( std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end() ); continue; } } |