diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 10:17:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 10:37:50 +0100 |
| commit | c78f7d85ab72a447cabbeebcc76706b796c7308a (patch) | |
| tree | 76bc731ae0268960e2bf95a06476fa516f7b78e1 /connectivity/source/cpool | |
| parent | 1a715d4d67ca398d59a8f7e8b41bdfeeabdd4b74 (diff) | |
Get rid of DECLARE_STL_MAP
Change-Id: Ifbda934a89087fcc1c031978d3e5b5783722b328
Diffstat (limited to 'connectivity/source/cpool')
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.hxx | 6 |
2 files changed, 6 insertions, 6 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; |