diff options
Diffstat (limited to 'connectivity/source')
-rw-r--r-- | connectivity/source/cpool/ZPoolCollection.cxx | 6 | ||||
-rw-r--r-- | connectivity/source/cpool/ZPoolCollection.hxx | 6 | ||||
-rw-r--r-- | connectivity/source/parse/sqliterator.cxx | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 57ce183a2777..03eb49e15294 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -187,7 +187,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _ { Reference< XDriver > xExistentProxy; // look if we already have a proxy for this driver - for ( ConstMapDriver2DriverRefIterator aLookup = m_aDriverProxies.begin(); + for ( MapDriver2DriverRef::const_iterator aLookup = m_aDriverProxies.begin(); aLookup != m_aDriverProxies.end(); ++aLookup ) @@ -474,10 +474,10 @@ void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::Pr getNodeValue(getDriverNameNodeName(),evt.Source) >>= sThisDriverName; // 1nd relase the driver // look if we already have a proxy for this driver - MapDriver2DriverRefIterator aLookup = m_aDriverProxies.begin(); + MapDriver2DriverRef::iterator aLookup = m_aDriverProxies.begin(); while( aLookup != m_aDriverProxies.end()) { - MapDriver2DriverRefIterator aFind = aLookup; + MapDriver2DriverRef::iterator aFind = aLookup; Reference<XServiceInfo> xInfo(aLookup->first,UNO_QUERY); ++aLookup; if(xInfo.is() && xInfo->getImplementationName() == sThisDriverName) diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index 41062127d21a..60fe2b4845ea 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -61,11 +61,11 @@ namespace connectivity typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver > ODriverCompare; typedef std::map<OUString, OConnectionPool*> OConnectionPools; - DECLARE_STL_MAP( + typedef std::map< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >, ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDriver >, - ODriverCompare, - MapDriver2DriverRef ); + ODriverCompare> + MapDriver2DriverRef; MapDriver2DriverRef m_aDriverProxies; ::osl::Mutex m_aMutex; diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index e388676320b6..06b07cac2922 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -825,7 +825,7 @@ bool OSQLParseTreeIterator::impl_getColumnTableRange(const OSQLParseNode* pNode, if (aTableRange.isEmpty()) // None found { // Look for the columns in the tables - for (ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter) + for (OSQLTables::const_iterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter) { if (aIter->second.is()) { @@ -1697,13 +1697,13 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ if(rColumnName.toChar() == '*' && rTableRange.isEmpty()) { // SELECT * ... OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!"); - for(ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end();++aIter) + for(OSQLTables::const_iterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end();++aIter) appendColumns(_rColumns,aIter->first,aIter->second); } else if( rColumnName.toChar() == '*' && !rTableRange.isEmpty() ) { // SELECT <table>.* OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!"); - ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange); + OSQLTables::const_iterator aFind = m_pImpl->m_pTables->find(rTableRange); if(aFind != m_pImpl->m_pTables->end()) appendColumns(_rColumns,rTableRange,aFind->second); @@ -1715,7 +1715,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ { Reference< XPropertySet> xNewColumn; - for ( OSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter ) + for ( OSQLTables::iterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter ) { if ( !aIter->second.is() ) continue; @@ -1786,7 +1786,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ } else // ColumnName and TableName exist { - ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange); + OSQLTables::const_iterator aFind = m_pImpl->m_pTables->find(rTableRange); sal_Bool bError = sal_False; if (aFind != m_pImpl->m_pTables->end() && aFind->second.is()) @@ -2095,7 +2095,7 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _r Reference< XPropertySet > xColumn; if ( !rTableRange.isEmpty() ) { - ConstOSQLTablesIterator aFind = _rTables.find(rTableRange); + OSQLTables::const_iterator aFind = _rTables.find(rTableRange); if ( aFind != _rTables.end() && aFind->second.is() |