summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-18 10:20:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-18 11:26:33 +0200
commit03a1c4214319049e663e7d50d416edbf2e5edbd3 (patch)
tree22ccc31b276b6f1714d5584cc8adb7f577301f66 /connectivity
parentb67f325a265d3372bcf211a964a5c0adcfb1ce0e (diff)
rtl::Reference fits just fine here
Change-Id: Ib48999c7fe532b2a8bf5222ef27d8d4929937e3b
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/inc/pch/precompiled_dbtools.hxx1
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx12
2 files changed, 5 insertions, 8 deletions
diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx
index 7c16205ecbee..6c9ed754692d 100644
--- a/connectivity/inc/pch/precompiled_dbtools.hxx
+++ b/connectivity/inc/pch/precompiled_dbtools.hxx
@@ -123,7 +123,6 @@
#include <comphelper/enumhelper.hxx>
#include <comphelper/evtlistenerhlp.hxx>
#include <comphelper/extract.hxx>
-#include <comphelper/implementationreference.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/numbers.hxx>
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 75a47668d293..4bf877afffbd 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -28,7 +28,6 @@
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <comphelper/implementationreference.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
@@ -112,8 +111,7 @@ namespace connectivity
Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener>
- m_xTablePropertyListener;
+ rtl::Reference<OTableContainerListener> m_xTablePropertyListener;
::std::vector< ColumnDesc > m_aColumnDesc;
OTableHelperImpl(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection)
: m_xConnection(_xConnection)
@@ -177,9 +175,9 @@ void SAL_CALL OTableHelper::disposing()
::osl::MutexGuard aGuard(m_aMutex);
if ( m_pImpl->m_xTablePropertyListener.is() )
{
- m_pTables->removeContainerListener(m_pImpl->m_xTablePropertyListener.getRef());
+ m_pTables->removeContainerListener(m_pImpl->m_xTablePropertyListener.get());
m_pImpl->m_xTablePropertyListener->clear();
- m_pImpl->m_xTablePropertyListener.dispose();
+ m_pImpl->m_xTablePropertyListener.clear();
}
OTable_TYPEDEF::disposing();
@@ -403,8 +401,8 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames)
if ( m_pTables->hasByName(sReferencedName) )
{
if ( !m_pImpl->m_xTablePropertyListener.is() )
- m_pImpl->m_xTablePropertyListener = ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener>( new OTableContainerListener(this) );
- m_pTables->addContainerListener(m_pImpl->m_xTablePropertyListener.getRef());
+ m_pImpl->m_xTablePropertyListener = new OTableContainerListener(this);
+ m_pTables->addContainerListener(m_pImpl->m_xTablePropertyListener.get());
m_pImpl->m_xTablePropertyListener->add(sReferencedName);
} // if ( m_pTables->hasByName(sReferencedName) )
sOldFKName = sFkName;