[Libreoffice-commits] core.git: svx/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Jan 3 21:00:36 UTC 2020


 svx/source/form/fmPropBrw.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0502eff0a23d370ee7f20446a96e95906b56654f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 3 15:16:54 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 3 22:00:06 2020 +0100

    cid#1401342 Uncaught exception
    
    Change-Id: Ia8746219c483a92977fa87993cb9a97189d52783
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86188
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index e7fdd4f99330..710fdb856072 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -53,6 +53,7 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
 #include <cppuhelper/component_context.hxx>
+#include <o3tl/deleter.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/dispatch.hxx>
@@ -90,7 +91,9 @@ FmPropBrwMgr::FmPropBrwMgr( vcl::Window* _pParent, sal_uInt16 _nId,
                             SfxBindings* _pBindings, SfxChildWinInfo* _pInfo)
               :SfxChildWindow(_pParent, _nId)
 {
-    SetController(std::make_shared<FmPropBrw>(::comphelper::getProcessComponentContext(), _pBindings, this, _pParent->GetFrameWeld(), _pInfo));
+    std::shared_ptr<FmPropBrw> xControl(new FmPropBrw(::comphelper::getProcessComponentContext(), _pBindings,
+                                                         this, _pParent->GetFrameWeld(), _pInfo), o3tl::default_delete<FmPropBrw>());
+    SetController(std::move(xControl));
     static_cast<FmPropBrw*>(GetController().get())->Initialize( _pInfo );
 }
 


More information about the Libreoffice-commits mailing list