cid#1401342 Uncaught exception

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

1 files changed, 8 insertions, 1 deletions

diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 817340afb341..3f9e3fe7d0ec 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -226,6 +226,8 @@ private:
     /** Finalizes the filter process (sets some needed document properties). */
     void                finalize();
 
+    void                ImplDestroy();
+
 private:
     typedef ::std::unique_ptr< ScEditEngineDefaulter >    EditEngineDefaulterPtr;
     typedef ::std::unique_ptr< FormulaBuffer >          FormulaBufferPtr;
@@ -308,12 +310,17 @@ WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) :
     initialize();
 }
 
-WorkbookGlobals::~WorkbookGlobals()
+void WorkbookGlobals::ImplDestroy()
 {
     finalize();
     mrExcelFilter.unregisterWorkbookGlobals();
 }
 
+WorkbookGlobals::~WorkbookGlobals()
+{
+    suppress_fun_call_w_exception(ImplDestroy());
+}
+
 ScDocumentImport& WorkbookGlobals::getDocImport()
 {
     return *mxDocImport;