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

loplugin:useuniqueptr in dbaccess

Change-Id: Iecf167f2018537476107d0850bef6f6e8ae344a4
Reviewed-on: https://gerrit.libreoffice.org/41494Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 7ca950ec
......@@ -192,9 +192,6 @@ ODatabaseDocument::~ODatabaseDocument()
acquire();
dispose();
}
delete m_pEventContainer;
m_pEventContainer = nullptr;
}
Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType )
......@@ -2003,7 +2000,7 @@ Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProv
Reference< XNameReplace > SAL_CALL ODatabaseDocument::getEvents( )
{
DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
return m_pEventContainer;
return m_pEventContainer.get();
}
Reference< XInterface > ODatabaseDocument::getThis() const
......
......@@ -171,7 +171,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
::comphelper::OInterfaceContainerHelper2 m_aCloseListener;
::comphelper::OInterfaceContainerHelper2 m_aStorageListeners;
DocumentEvents* m_pEventContainer;
rtl::Reference<DocumentEvents> m_pEventContainer;
::rtl::Reference< DocumentEventExecutor > m_pEventExecutor;
DocumentEventNotifier m_aEventNotifier;
......
......@@ -42,7 +42,7 @@ protected:
SfxItemPool* m_pItemPool; // item pool for the item set for the dialog
std::vector<SfxPoolItem*>*
m_pItemPoolDefaults; // pool defaults
::dbaccess::ODsnTypeCollection*
std::unique_ptr<::dbaccess::ODsnTypeCollection>
m_pCollection; // datasource type collection
css::uno::Any m_aInitialSelection;
......
......@@ -45,11 +45,9 @@ ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XC
,m_pDatasourceItems(nullptr)
,m_pItemPool(nullptr)
,m_pItemPoolDefaults(nullptr)
,m_pCollection(nullptr)
{
m_pCollection = new ::dbaccess::ODsnTypeCollection(_rxORB);
ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, m_pCollection);
m_pCollection.reset( new ::dbaccess::ODsnTypeCollection(_rxORB) );
ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, m_pCollection.get());
}
ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog()
......@@ -63,10 +61,6 @@ ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog()
ODbAdminDialog::destroyItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults);
}
}
delete m_pCollection;
m_pCollection = nullptr;
}
void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue)
......
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