Kaydet (Commit) 47ae2add authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in SortedResultSet

Change-Id: Ib57cf4b30afda6f5e0d024a0c72417f6b1786e9a
Reviewed-on: https://gerrit.libreoffice.org/48588Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 3cf85c9f
...@@ -141,9 +141,6 @@ SortedResultSet::~SortedResultSet() ...@@ -141,9 +141,6 @@ SortedResultSet::~SortedResultSet()
mpSortInfo = nullptr; mpSortInfo = nullptr;
mpPropSetInfo.clear(); mpPropSetInfo.clear();
delete mpPropChangeListeners;
delete mpVetoChangeListeners;
} }
...@@ -823,8 +820,8 @@ void SAL_CALL SortedResultSet::addPropertyChangeListener( ...@@ -823,8 +820,8 @@ void SAL_CALL SortedResultSet::addPropertyChangeListener(
osl::Guard< osl::Mutex > aGuard( maMutex ); osl::Guard< osl::Mutex > aGuard( maMutex );
if ( !mpPropChangeListeners ) if ( !mpPropChangeListeners )
mpPropChangeListeners = mpPropChangeListeners.reset(
new PropertyChangeListeners_Impl(); new PropertyChangeListeners_Impl() );
mpPropChangeListeners->addInterface( PropertyName, Listener ); mpPropChangeListeners->addInterface( PropertyName, Listener );
} }
...@@ -848,8 +845,8 @@ void SAL_CALL SortedResultSet::addVetoableChangeListener( ...@@ -848,8 +845,8 @@ void SAL_CALL SortedResultSet::addVetoableChangeListener(
osl::Guard< osl::Mutex > aGuard( maMutex ); osl::Guard< osl::Mutex > aGuard( maMutex );
if ( !mpVetoChangeListeners ) if ( !mpVetoChangeListeners )
mpVetoChangeListeners = mpVetoChangeListeners.reset(
new PropertyChangeListeners_Impl(); new PropertyChangeListeners_Impl() );
mpVetoChangeListeners->addInterface( PropertyName, Listener ); mpVetoChangeListeners->addInterface( PropertyName, Listener );
} }
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <deque> #include <deque>
#include <memory>
namespace comphelper { namespace comphelper {
class OInterfaceContainerHelper2; class OInterfaceContainerHelper2;
...@@ -99,8 +100,8 @@ class SortedResultSet: public cppu::WeakImplHelper < ...@@ -99,8 +100,8 @@ class SortedResultSet: public cppu::WeakImplHelper <
css::beans::XPropertySet > css::beans::XPropertySet >
{ {
comphelper::OInterfaceContainerHelper2 *mpDisposeEventListeners; comphelper::OInterfaceContainerHelper2 *mpDisposeEventListeners;
PropertyChangeListeners_Impl *mpPropChangeListeners; std::unique_ptr<PropertyChangeListeners_Impl> mpPropChangeListeners;
PropertyChangeListeners_Impl *mpVetoChangeListeners; std::unique_ptr<PropertyChangeListeners_Impl> mpVetoChangeListeners;
css::uno::Reference < css::sdbc::XResultSet > mxOriginal; css::uno::Reference < css::sdbc::XResultSet > mxOriginal;
css::uno::Reference < css::sdbc::XResultSet > mxOther; css::uno::Reference < css::sdbc::XResultSet > mxOther;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment