summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-21 14:46:13 +0200
committerNoel Grandin <noel@peralex.com>2015-10-21 15:10:24 +0200
commita673713bb35321eaef7ce9f35f5407e0174b664e (patch)
treef07eb91f33f15ddf32849b057f7844966438bac7 /dbaccess
parentddee0e30ec93da3b842ee6822980b0a99fa206ce (diff)
more removal of com::sun::star typedefs
Change-Id: Ia73f1b4f1dcfa3f0936359e744afe76e02dcd2eb
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.hxx3
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx2
3 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 63eb72697909..3a2da2aa5c77 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -634,7 +634,7 @@ void SAL_CALL ODatabaseModelImpl::disposing( const css::lang::EventObject& Sourc
{
if ( xCon == i->get() )
{
- *i = OWeakConnection();
+ *i = css::uno::WeakReference< css::sdbc::XConnection >();
bStore = true;
break;
}
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index e347aa8c5d6c..79de473dfaa3 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -79,8 +79,7 @@ namespace comphelper
namespace dbaccess
{
-typedef css::uno::WeakReference< css::sdbc::XConnection > OWeakConnection;
-typedef std::vector< OWeakConnection > OWeakConnectionArray;
+typedef std::vector< css::uno::WeakReference< css::sdbc::XConnection > > OWeakConnectionArray;
struct AsciiPropertyValue
{
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index eb418f7a58f1..73bf3c8d3810 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -1188,7 +1188,7 @@ Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, co
Reference< XComponent> xComp(xConn,UNO_QUERY);
if ( xComp.is() )
xComp->addEventListener( static_cast< XContainerListener* >( this ) );
- m_pImpl->m_aConnections.push_back(OWeakConnection(xConn));
+ m_pImpl->m_aConnections.push_back(css::uno::WeakReference< css::sdbc::XConnection >(xConn));
}
return xConn;