diff options
Diffstat (limited to 'dbaccess/source/ui/querydesign')
13 files changed, 60 insertions, 60 deletions
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 1ddeaf5dbcc0..a14d86e50c7d 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -315,8 +315,8 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const double l = fabs(dist_Euklid(m_aSourceConnPos,m_aDestConnPos,rMousePos,q)); if( l < HIT_SENSITIVE_RADIUS) { - if(::std::min(m_aSourceConnPos.X(),m_aDestConnPos.X()) <= q.X() && ::std::min(m_aSourceConnPos.Y(),m_aDestConnPos.Y()) <= q.Y() - && q.X() <= ::std::max(m_aDestConnPos.X(),m_aSourceConnPos.X()) && q.Y() <= ::std::max(m_aDestConnPos.Y(),m_aSourceConnPos.Y())) + if(std::min(m_aSourceConnPos.X(),m_aDestConnPos.X()) <= q.X() && std::min(m_aSourceConnPos.Y(),m_aDestConnPos.Y()) <= q.Y() + && q.X() <= std::max(m_aDestConnPos.X(),m_aSourceConnPos.X()) && q.Y() <= std::max(m_aDestConnPos.Y(),m_aSourceConnPos.Y())) return true; } diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index b2243bc4e505..84044841c6ed 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -301,7 +301,7 @@ void OJoinController::SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabW void OJoinController::removeConnectionData(const TTableConnectionData::value_type& _pData) { - m_vTableConnectionData.erase( ::std::remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end()); + m_vTableConnectionData.erase( std::remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end()); } void OJoinController::describeSupportedFeatures() diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 88fe2941e6cd..6f383c341841 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -380,7 +380,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) pTabWin->Hide(); OJoinController& rController = m_pView->getController(); - TTableWindowData::iterator aFind = ::std::find(rController.getTableWindowData().begin(), rController.getTableWindowData().end(), pData); + TTableWindowData::iterator aFind = std::find(rController.getTableWindowData().begin(), rController.getTableWindowData().end(), pData); if(aFind != rController.getTableWindowData().end()) { rController.getTableWindowData().erase(aFind); @@ -902,8 +902,8 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) SvTreeListEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView(); SvTreeListEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView(); - const ::std::vector<OConnectionLine*>& rLines = pConn->GetConnLineList(); - ::std::vector<OConnectionLine*>::const_reverse_iterator aIter = rLines.rbegin(); + const std::vector<OConnectionLine*>& rLines = pConn->GetConnLineList(); + std::vector<OConnectionLine*>::const_reverse_iterator aIter = rLines.rbegin(); for(;aIter != rLines.rend();++aIter) { if ((*aIter)->IsValid()) @@ -955,18 +955,18 @@ void OJoinTableView::DrawConnections(vcl::RenderContext& rRenderContext, const R GetSelectedConn()->Draw(rRenderContext, rRect); } -::std::vector<VclPtr<OTableConnection> >::const_iterator OJoinTableView::getTableConnections(const OTableWindow* _pFromWin) const +std::vector<VclPtr<OTableConnection> >::const_iterator OJoinTableView::getTableConnections(const OTableWindow* _pFromWin) const { - return ::std::find_if( m_vTableConnection.begin(), + return std::find_if( m_vTableConnection.begin(), m_vTableConnection.end(), - ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); + std::bind2nd(std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); } sal_Int32 OJoinTableView::getConnectionCount(const OTableWindow* _pFromWin) const { - return ::std::count_if( m_vTableConnection.begin(), + return std::count_if( m_vTableConnection.begin(), m_vTableConnection.end(), - ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); + std::bind2nd(std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); } bool OJoinTableView::ExistsAConn(const OTableWindow* pFrom) const @@ -1159,8 +1159,8 @@ void OJoinTableView::Command(const CommandEvent& rEvt) { if (rSelConnection) { - const ::std::vector<OConnectionLine*>& rLines = rSelConnection->GetConnLineList(); - ::std::vector<OConnectionLine*>::const_iterator aIter = ::std::find_if(rLines.begin(), rLines.end(),::std::mem_fun(&OConnectionLine::IsValid)); + const std::vector<OConnectionLine*>& rLines = rSelConnection->GetConnLineList(); + std::vector<OConnectionLine*>::const_iterator aIter = std::find_if(rLines.begin(), rLines.end(),std::mem_fun(&OConnectionLine::IsValid)); if( aIter != rLines.end() ) executePopup((*aIter)->getMidPoint(), rSelConnection); } @@ -1561,7 +1561,7 @@ void OJoinTableView::addConnection(OTableConnection* _pConnection,bool _bAddData { #if OSL_DEBUG_LEVEL > 0 TTableConnectionData& rTabConnDataList = m_pView->getController().getTableConnectionData(); - OSL_ENSURE( ::std::find(rTabConnDataList.begin(), rTabConnDataList.end(),_pConnection->GetData()) == rTabConnDataList.end(),"Data already in vector!"); + OSL_ENSURE( std::find(rTabConnDataList.begin(), rTabConnDataList.end(),_pConnection->GetData()) == rTabConnDataList.end(),"Data already in vector!"); #endif m_pView->getController().getTableConnectionData().push_back(_pConnection->GetData()); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index ab12b20f4e34..8463687025c3 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -719,7 +719,7 @@ namespace OTableFields::const_iterator aEnd = _rFieldList.end(); for(;aIter != aEnd;++aIter) { - nMaxCriteria = ::std::max<sal_uInt16>(nMaxCriteria,(sal_uInt16)(*aIter)->GetCriteria().size()); + nMaxCriteria = std::max<sal_uInt16>(nMaxCriteria,(sal_uInt16)(*aIter)->GetCriteria().size()); } try { @@ -964,7 +964,7 @@ namespace void GenerateInnerJoinCriterias(const Reference< XConnection>& _xConnection, OUString& _rJoinCrit, - const ::std::vector<VclPtr<OTableConnection> >& _rConnList) + const std::vector<VclPtr<OTableConnection> >& _rConnList) { auto aIter = _rConnList.begin(); auto aEnd = _rConnList.end(); @@ -995,7 +995,7 @@ namespace } OUString GenerateFromClause( const Reference< XConnection>& _xConnection, const OQueryTableView::OTableWindowMap* pTabList, - const ::std::vector<VclPtr<OTableConnection> >& rConnList + const std::vector<VclPtr<OTableConnection> >& rConnList ) { @@ -1008,24 +1008,24 @@ namespace { auto aIter = rConnList.begin(); auto aEnd = rConnList.end(); - ::std::map<OTableWindow*,sal_Int32> aConnectionCount; + std::map<OTableWindow*,sal_Int32> aConnectionCount; for(;aIter != aEnd;++aIter) { static_cast<OQueryTableConnection*>((*aIter).get())->SetVisited(false); ++aConnectionCount[(*aIter)->GetSourceWin()]; ++aConnectionCount[(*aIter)->GetDestWin()]; } - ::std::multimap<sal_Int32 , OTableWindow*> aMulti; - ::std::map<OTableWindow*,sal_Int32>::const_iterator aCountIter = aConnectionCount.begin(); - ::std::map<OTableWindow*,sal_Int32>::const_iterator aCountEnd = aConnectionCount.end(); + std::multimap<sal_Int32 , OTableWindow*> aMulti; + std::map<OTableWindow*,sal_Int32>::const_iterator aCountIter = aConnectionCount.begin(); + std::map<OTableWindow*,sal_Int32>::const_iterator aCountEnd = aConnectionCount.end(); for(;aCountIter != aCountEnd;++aCountIter) { - aMulti.insert(::std::multimap<sal_Int32 , OTableWindow*>::value_type(aCountIter->second,aCountIter->first)); + aMulti.insert(std::multimap<sal_Int32 , OTableWindow*>::value_type(aCountIter->second,aCountIter->first)); } const bool bUseEscape = ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_OUTERJOINESCAPE ); - ::std::multimap<sal_Int32 , OTableWindow*>::const_reverse_iterator aRIter = aMulti.rbegin(); - ::std::multimap<sal_Int32 , OTableWindow*>::const_reverse_iterator aREnd = aMulti.rend(); + std::multimap<sal_Int32 , OTableWindow*>::const_reverse_iterator aRIter = aMulti.rbegin(); + std::multimap<sal_Int32 , OTableWindow*>::const_reverse_iterator aREnd = aMulti.rend(); for(;aRIter != aREnd;++aRIter) { auto aConIter = aRIter->second->getTableView()->getTableConnections(aRIter->second); @@ -1115,7 +1115,7 @@ namespace if(!xConnection.is()) return OUString(); - ::std::map< OUString,bool> aGroupByNames; + std::map< OUString,bool> aGroupByNames; OUString aGroupByStr; try @@ -1159,7 +1159,7 @@ namespace } if ( aGroupByNames.find(sGroupByPart) == aGroupByNames.end() ) { - aGroupByNames.insert(::std::map< OUString,bool>::value_type(sGroupByPart,true)); + aGroupByNames.insert(std::map< OUString,bool>::value_type(sGroupByPart,true)); aGroupByStr += sGroupByPart + ","; } } @@ -2701,7 +2701,7 @@ void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFi OJoinTableView::OTableWindowMap& rTabWins = m_pTableView->GetTabWinMap(); OUString strCurrentPrefix; - ::std::vector< OUString> aFields; + std::vector< OUString> aFields; OJoinTableView::OTableWindowMap::const_iterator aIter = rTabWins.begin(); OJoinTableView::OTableWindowMap::const_iterator aEnd = rTabWins.end(); for(;aIter != aEnd;++aIter) @@ -2713,8 +2713,8 @@ void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFi pCurrentWin->EnumValidFields(aFields); - ::std::vector< OUString>::const_iterator aStrIter = aFields.begin(); - ::std::vector< OUString>::const_iterator aStrEnd = aFields.end(); + std::vector< OUString>::const_iterator aStrIter = aFields.begin(); + std::vector< OUString>::const_iterator aStrEnd = aFields.end(); for(;aStrIter != aStrEnd;++aStrIter) { if (bAllTables || aStrIter->toChar() == '*') diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index 30257e9a9f6f..e0bfd9658a19 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -33,7 +33,7 @@ namespace dbaui class OQueryTabWinUndoAct : public OQueryDesignUndoAction { protected: - ::std::vector<VclPtr<OTableConnection> > m_vTableConnection; + std::vector<VclPtr<OTableConnection> > m_vTableConnection; VclPtr<OQueryTableWindow> m_pTabWin; bool m_bOwnerOfObjects; // am I the only owner of the managed objects? (changes with every redo or undo) @@ -51,7 +51,7 @@ namespace dbaui void SetTabWin(OQueryTableWindow* pTW) { m_pTabWin = pTW; } // now SetOwnership should be invoked - ::std::vector<VclPtr<OTableConnection> >& GetTabConnList() { return m_vTableConnection; } + std::vector<VclPtr<OTableConnection> >& GetTabConnList() { return m_vTableConnection; } void InsertConnection( OTableConnection* pConnection ) { m_vTableConnection.push_back(pConnection); } }; diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index c6fa90fc8e6d..a5097e0b6e0b 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -251,7 +251,7 @@ void OQueryTableView::ReSync() "before calling OQueryTableView::ReSync() please call ClearAll !"); // I need a collection of all window names that cannot be created so that I do not initialize connections for them. - ::std::vector<OUString> arrInvalidTables; + std::vector<OUString> arrInvalidTables; TTableWindowData::const_reverse_iterator aIter = rTabWinDataList.rbegin(); // Create the window and add it @@ -272,7 +272,7 @@ void OQueryTableView::ReSync() pTabWin.disposeAndClear(); arrInvalidTables.push_back(pData->GetAliasName()); - rTabWinDataList.erase( ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end()); + rTabWinDataList.erase( std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end()); continue; } @@ -294,14 +294,14 @@ void OQueryTableView::ReSync() // do both tables for the connection exist ? OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetWinName(); - 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()->GetWinName(); - 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, no connection - rTabConnDataList.erase( ::std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end()); + rTabConnDataList.erase( std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end()); continue; } @@ -329,7 +329,7 @@ void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, OQueryTableConnection* pTabConn = nullptr; const auto& rConnections = getTableConnections(); auto aEnd = rConnections.end(); - auto aIter = ::std::find( rConnections.begin(), + auto aIter = std::find( rConnections.begin(), aEnd, VclPtr<OTableConnection>(const_cast<OTableConnection*>(static_cast<const OTableConnection*>(&rNewConn))) ); @@ -809,7 +809,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc // the TabWin data must also be passed out of my responsibility TTableWindowData& rTabWinDataList = m_pView->getController().getTableWindowData(); - rTabWinDataList.erase( ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), pTabWin->GetData()), rTabWinDataList.end()); + rTabWinDataList.erase( std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), pTabWin->GetData()), rTabWinDataList.end()); // The data should not be destroyed as TabWin itself - which is still alive - needs them // Either it goes back into my responsibility, (via ShowTabWin), then I add the data back, // or the Undo-Action, which currently has full responsibility for the window diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index b9fb54822c11..9994c52ed909 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -930,7 +930,7 @@ bool OSelectionBrowseBox::SaveModified() { OTableFieldDescRef pNewEntry = new OTableFieldDesc(); pNewEntry->SetColumnId( pEntry->GetColumnId() ); - ::std::replace(getFields().begin(),getFields().end(),pEntry,pNewEntry); + std::replace(getFields().begin(),getFields().end(),pEntry,pNewEntry); sal_uInt16 nCol = GetCurColumnId(); for (int i = 0; i < m_nVisibleCount; i++) // redraw column RowModified(i,nCol); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 4fad23f3af48..9366ecfbbb44 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -51,7 +51,7 @@ namespace dbaui class OSelectionBrowseBox : public ::svt::EditBrowseBox { friend class OQueryDesignView; - ::std::vector<bool> m_bVisibleRow; // at pos we find the RowId + std::vector<bool> m_bVisibleRow; // at pos we find the RowId Timer m_timerInvalidate; long m_nSeekRow; diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 2f4d014a96c2..606e9f10ba9b 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -64,8 +64,8 @@ namespace dbaui void OTableConnection::clearLineData() { - ::std::vector<OConnectionLine*>::const_iterator aLineEnd = m_vConnLine.end(); - for(::std::vector<OConnectionLine*>::const_iterator aLineIter = m_vConnLine.begin();aLineIter != aLineEnd;++aLineIter) + std::vector<OConnectionLine*>::const_iterator aLineEnd = m_vConnLine.end(); + for(std::vector<OConnectionLine*>::const_iterator aLineIter = m_vConnLine.begin();aLineIter != aLineEnd;++aLineIter) delete *aLineIter; m_vConnLine.clear(); } @@ -88,9 +88,9 @@ namespace dbaui // copy linelist if(! rConn.GetConnLineList().empty() ) { - const ::std::vector<OConnectionLine*>& rLine = rConn.GetConnLineList(); - ::std::vector<OConnectionLine*>::const_iterator aIter = rLine.begin(); - ::std::vector<OConnectionLine*>::const_iterator aEnd = rLine.end(); + const std::vector<OConnectionLine*>& rLine = rConn.GetConnLineList(); + std::vector<OConnectionLine*>::const_iterator aIter = rLine.begin(); + std::vector<OConnectionLine*>::const_iterator aEnd = rLine.end(); m_vConnLine.reserve(rLine.size()); for(;aIter != aEnd;++aIter) m_vConnLine.push_back( new OConnectionLine( **aIter )); @@ -148,7 +148,7 @@ namespace dbaui bool OTableConnection::CheckHit( const Point& rMousePos ) const { // check if the point hit our line - return ::std::any_of(m_vConnLine.begin(), + return std::any_of(m_vConnLine.begin(), m_vConnLine.end(), [&rMousePos] ( const OConnectionLine* pLine ) @@ -172,8 +172,8 @@ namespace dbaui // determine all lines of the surrounding rectangle Rectangle aBoundingRect( Point(0,0), Point(0,0) ); Rectangle aTempRect; - ::std::vector<OConnectionLine*>::const_iterator aEnd = m_vConnLine.end(); - for(::std::vector<OConnectionLine*>::const_iterator aIter = m_vConnLine.begin();aIter != aEnd;++aIter) + std::vector<OConnectionLine*>::const_iterator aEnd = m_vConnLine.end(); + for(std::vector<OConnectionLine*>::const_iterator aIter = m_vConnLine.begin();aIter != aEnd;++aIter) { aTempRect = (*aIter)->GetBoundingRect(); diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index c9d755d8b26f..21e7348d9d2f 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -121,7 +121,7 @@ OUString OTableFieldDesc::GetCriteria( sal_uInt16 nIdx ) const namespace { - struct SelectPropertyValueAsString : public ::std::unary_function< PropertyValue, OUString > + struct SelectPropertyValueAsString : public std::unary_function< PropertyValue, OUString > { OUString operator()( const PropertyValue& i_rPropValue ) const { @@ -154,7 +154,7 @@ void OTableFieldDesc::Load( const css::beans::PropertyValue& i_rSettings, const { const Sequence< PropertyValue > aCriteria( aFieldDesc.getOrDefault( "Criteria", Sequence< PropertyValue >() ) ); m_aCriteria.resize( aCriteria.getLength() ); - ::std::transform( + std::transform( aCriteria.getConstArray(), aCriteria.getConstArray() + aCriteria.getLength(), m_aCriteria.begin(), @@ -185,7 +185,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con { sal_Int32 c = 0; Sequence< PropertyValue > aCriteria( m_aCriteria.size() ); - for ( ::std::vector< OUString >::const_iterator crit = m_aCriteria.begin(); + for ( std::vector< OUString >::const_iterator crit = m_aCriteria.begin(); crit != m_aCriteria.end(); ++crit, ++c ) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index c2ae87db31b6..dfc78424b2a7 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -519,7 +519,7 @@ bool OTableWindow::ExistsAConn() const return getTableView()->ExistsAConn(this); } -void OTableWindow::EnumValidFields(::std::vector< OUString>& arrstrFields) +void OTableWindow::EnumValidFields(std::vector< OUString>& arrstrFields) { arrstrFields.clear(); // This default implementation counts every item in the ListBox ... for any other behaviour it must be over-written diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index e3b132b1f689..0a0c98cc3357 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -213,7 +213,7 @@ namespace dbaui auto aIter = pView->getTableConnections(m_pTable); auto aEnd = rConnectionList.end(); - ::std::vector< Reference<XInterface> > aRelations; + std::vector< Reference<XInterface> > aRelations; aRelations.reserve(5); // just guessing for (; aIter != aEnd ; ++aIter ) { diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 9351116c60c3..6d20196910bd 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -403,7 +403,7 @@ void SAL_CALL OQueryController::getFastPropertyValue( Any& o_rValue, sal_Int32 i PropertyAttribute::READONLY ); - ::std::sort( + std::sort( aProps.getArray(), aProps.getArray() + aProps.getLength(), ::comphelper::PropertyCompareByName() @@ -1568,9 +1568,9 @@ struct CommentStrip See also delComment() implementation for OSQLParser::parseTree(). */ -static ::std::vector< CommentStrip > getComment( const OUString& rQuery ) +static std::vector< CommentStrip > getComment( const OUString& rQuery ) { - ::std::vector< CommentStrip > aRet; + std::vector< CommentStrip > aRet; // First a quick search if there is any "--" or "//" or "/*", if not then // the whole copying loop is pointless. if (rQuery.indexOf( "--" ) < 0 && rQuery.indexOf( "//" ) < 0 && @@ -1645,7 +1645,7 @@ static ::std::vector< CommentStrip > getComment( const OUString& rQuery ) recomposition. This is ugly but at least allows commented queries while preserving the comments _somehow_. */ -static OUString concatComment( const OUString& rQuery, const ::std::vector< CommentStrip >& rComments ) +static OUString concatComment( const OUString& rQuery, const std::vector< CommentStrip >& rComments ) { // No comments => return query. if (rComments.empty()) @@ -1657,7 +1657,7 @@ static OUString concatComment( const OUString& rQuery, const ::std::vector< Comm // Obtaining the needed size once should be faster than reallocating. // Also add a blank or linefeed for each comment. sal_Int32 nBufSize = nLen + nComments; - for (::std::vector< CommentStrip >::const_iterator it( rComments.begin()); it != rComments.end(); ++it) + for (std::vector< CommentStrip >::const_iterator it( rComments.begin()); it != rComments.end(); ++it) nBufSize += (*it).maComment.getLength(); OUStringBuffer aBuf( nBufSize ); sal_Int32 nIndBeg = 0; @@ -1706,7 +1706,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange ) { OUString aErrorMsg; - ::std::vector< CommentStrip > aComments = getComment( m_sStatement); + std::vector< CommentStrip > aComments = getComment( m_sStatement); ::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign ); if(pNode) @@ -1844,7 +1844,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings else if ( m_bEscapeProcessing ) { OUString aErrorMsg; - ::std::unique_ptr< ::connectivity::OSQLParseNode > pNode( + std::unique_ptr< ::connectivity::OSQLParseNode > pNode( m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign ) ); if ( pNode.get() ) |