From bbbd1f1eec7ce078a37bc3a23a7f1e8ec4070634 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 8 Mar 2017 16:09:58 +0000 Subject: valgrind: fix leak Change-Id: I569698af09dfe71c0c8b89c40ab111ce71635492 --- connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 6 ++---- connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 505a23b1e376..a243ecca59aa 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -48,8 +48,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance } MozillaBootstrap::MozillaBootstrap() - : OMozillaBootstrap_BASE(m_aMutex), - m_ProfileAccess(nullptr) + : OMozillaBootstrap_BASE(m_aMutex) { } @@ -59,11 +58,10 @@ MozillaBootstrap::~MozillaBootstrap() void MozillaBootstrap::Init() { - m_ProfileAccess = new ProfileAccess(); + m_ProfileAccess.reset(new ProfileAccess); bootupProfile(css::mozilla::MozillaProductType_Mozilla,OUString()); } - void MozillaBootstrap::disposing() { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index de921e956dca..25e68a9e24b6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -40,7 +40,7 @@ namespace connectivity private: ::osl::Mutex m_aMutex; // mutex is need to control member access virtual ~MozillaBootstrap() override; - ProfileAccess * m_ProfileAccess; + std::unique_ptr m_ProfileAccess; public: void Init(); -- cgit