diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-18 10:21:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-18 11:26:34 +0200 |
| commit | 32694db4bf90d58ed35987f3c56793a1530fb3d2 (patch) | |
| tree | 995f6e358a81d28e8d7733d6dfba38befabe8184 /dbaccess | |
| parent | 03a1c4214319049e663e7d50d416edbf2e5edbd3 (diff) | |
rtl::Reference fits just fine here
Change-Id: I14cdcab307f1d2edcebb9fd4aa3009daa32bc7d1
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index d96b6d8d867d..f4e6725378e5 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -103,7 +103,7 @@ void OComponentDefinition::initialize( const Sequence< Any >& aArguments ) throw void OComponentDefinition::registerProperties() { - m_xColumnPropertyListener = ::comphelper::ImplementationReference<OColumnPropertyListener,XPropertyChangeListener>(new OColumnPropertyListener(this)); + m_xColumnPropertyListener = new OColumnPropertyListener(this); OComponentDefinition_Impl& rDefinition( getDefinition() ); ODataSettings::registerPropertiesFor( &rDefinition ); @@ -194,7 +194,7 @@ void SAL_CALL OComponentDefinition::disposing() if ( m_pColumns.get() ) m_pColumns->disposing(); m_xColumnPropertyListener->clear(); - m_xColumnPropertyListener.dispose(); + m_xColumnPropertyListener.clear(); } IPropertyArrayHelper& OComponentDefinition::getInfoHelper() @@ -251,7 +251,7 @@ OColumn* OComponentDefinition::createColumn(const OUString& _rName) const OComponentDefinition_Impl::const_iterator aFind = rDefinition.find( _rName ); if ( aFind != rDefinition.end() ) { - aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener.getRef()); + aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener.get()); return new OTableColumnWrapper( aFind->second, aFind->second, true ); } OSL_FAIL( "OComponentDefinition::createColumn: is this a valid case?" ); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 25b2e1ebb505..e801d1d9d5c9 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -33,7 +33,6 @@ #include "ContentHelper.hxx" #include "apitools.hxx" #include <column.hxx> -#include <comphelper/implementationreference.hxx> #include <memory> namespace dbaccess @@ -90,8 +89,7 @@ class OComponentDefinition :public OContentHelper protected: ::std::auto_ptr< OColumns > m_pColumns; - ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener> - m_xColumnPropertyListener; + rtl::Reference<OColumnPropertyListener> m_xColumnPropertyListener; bool m_bTable; virtual ~OComponentDefinition(); |