cid#1680644 Uncaught exception

and

cid#1401474 Uncaught exception

Change-Id: I8e13132f730c6ad6f4af5499226f0e3f4b7c22d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198034
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

extensions/source/propctrlr/browserpage.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <o3tl/deleter.hxx>
 #include <vcl/svapp.hxx>
 #include "browserpage.hxx"
 
@@ -30,12 +31,14 @@ OBrowserPage::OBrowserPage(weld::Container* pParent, weld::Container* pInitialCo
 {
 }
 
-OBrowserPage::~OBrowserPage()
+void OBrowserPage::ImplDestroy()
 {
     if (m_pParent)
         detach();
     assert(!m_pParent);
 }
+
+OBrowserPage::~OBrowserPage() { suppress_fun_call_w_exception(ImplDestroy()); }
 } // namespace pcr
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

extensions/source/propctrlr/browserpage.hxx

@@ -32,6 +32,8 @@ private:
     std::unique_ptr<weld::Container> m_xContainer;
     OBrowserListBox m_aBrowserListBox;
 
+    void ImplDestroy();
+
 public:
     // TODO inherit from BuilderPage
     explicit OBrowserPage(weld::Container* pParent, weld::Container* pContainer);