[Libreoffice-commits] core.git: 2 commits - extensions/source

[Caolán McNamara (via logerrit)]

 extensions/source/propctrlr/browserpage.cxx |    2 +-
 extensions/source/propctrlr/browserpage.hxx |    3 ++-
 extensions/source/propctrlr/browserview.hxx |    3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e08a62124c1f135807f210d37b7c876e5392c5f0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 3 15:04:16 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 3 20:27:46 2020 +0100

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

diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx
index 183743ee0e04..edb6b08909af 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -26,7 +26,7 @@ namespace pcr
         : m_pParent(pParent)
         , m_xBuilder(Application::CreateBuilder(pParent, "modules/spropctrlr/ui/browserpage.ui"))
         , m_xContainer(m_xBuilder->weld_container("BrowserPage"))
-        , m_xListBox(std::make_unique<OBrowserListBox>(*m_xBuilder, pInitialControlContainer))
+        , m_xListBox(new OBrowserListBox(*m_xBuilder, pInitialControlContainer))
     {
     }
 
diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx
index dd8c44f2e583..cb13f1383050 100644
--- a/extensions/source/propctrlr/browserpage.hxx
+++ b/extensions/source/propctrlr/browserpage.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERPAGE_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERPAGE_HXX
 
+#include <o3tl/deleter.hxx>
 #include <vcl/builderpage.hxx>
 #include "browserlistbox.hxx"
 
@@ -31,7 +32,7 @@ namespace pcr
         weld::Container* m_pParent;
         std::unique_ptr<weld::Builder> m_xBuilder;
         std::unique_ptr<weld::Container> m_xContainer;
-        std::unique_ptr<OBrowserListBox> m_xListBox;
+        std::unique_ptr<OBrowserListBox, o3tl::default_delete<OBrowserListBox>> m_xListBox;
 
     public:
         // TODO inherit from BuilderPage
commit 92296fa4f2c976680c7b3496c33191dbbcac9b39
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 3 14:58:13 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 3 20:27:31 2020 +0100

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

diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 22f897114687..6201aacd217f 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <o3tl/deleter.hxx>
 #include <vcl/weld.hxx>
 
 namespace pcr
@@ -30,7 +31,7 @@ namespace pcr
     class OPropertyEditor;
     class OPropertyBrowserView final
     {
-        std::unique_ptr<OPropertyEditor> m_xPropBox;
+        std::unique_ptr<OPropertyEditor, o3tl::default_delete<OPropertyEditor>> m_xPropBox;
         sal_uInt16                  m_nActivePage;
         Link<LinkParamNone*,void>   m_aPageActivationHandler;