diff options
Diffstat (limited to 'connectivity/source/sdbcx')
-rw-r--r-- | connectivity/source/sdbcx/VGroup.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VIndex.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VKey.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VUser.cxx | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index 21ac50470a2c..e1f9ea34e20d 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -52,7 +52,6 @@ OGroup::OGroup(const OUString& Name, bool _bCase) : OGroup_BASE(m_aMutex) OGroup::~OGroup() { - delete m_pUsers; } Any SAL_CALL OGroup::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) @@ -108,7 +107,7 @@ Reference< XNameAccess > SAL_CALL OGroup::getUsers( ) throw(RuntimeException, s // allowed } - return m_pUsers; + return m_pUsers.get(); } diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index a0dacf137503..120222b9d1b4 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -88,7 +88,6 @@ OIndex::OIndex( const OUString& Name, OIndex::~OIndex( ) { - delete m_pColumns; } ::cppu::IPropertyArrayHelper* OIndex::createArrayHelper( sal_Int32 /*_nId*/ ) const @@ -163,7 +162,7 @@ Reference< css::container::XNameAccess > SAL_CALL OIndex::getColumns( ) throw(R OSL_FAIL( "OIndex::getColumns: caught an exception!" ); } - return m_pColumns; + return m_pColumns.get(); } Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor( ) throw(RuntimeException, std::exception) diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index 8eaf5e784792..a3c15cd83427 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -92,7 +92,6 @@ OKey::OKey(const OUString& Name,const std::shared_ptr<KeyProperties>& _rProps, b OKey::~OKey( ) { - delete m_pColumns; } Any SAL_CALL OKey::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) @@ -171,7 +170,7 @@ Reference< css::container::XNameAccess > SAL_CALL OKey::getColumns( ) throw(Run // allowed } - return m_pColumns; + return m_pColumns.get(); } Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor( ) throw(RuntimeException, std::exception) diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index 88e7cb296e2f..e77b55b9509a 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -53,7 +53,6 @@ OUser::OUser(const OUString& Name, bool _bCase) : OUser_BASE(m_aMutex) OUser::~OUser( ) { - delete m_pGroups; } void OUser::disposing() @@ -117,7 +116,7 @@ Reference< XNameAccess > SAL_CALL OUser::getGroups( ) throw(RuntimeException, s // allowed } - return m_pGroups; + return m_pGroups.get(); } |