diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-23 21:07:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-23 21:30:45 +0200 |
| commit | 28adfcdcbc504db8d5014a8939aa5e834e5d43d0 (patch) | |
| tree | b1879661cab9d8e03b9cdd8d13a9b51ac5ad8e9e | |
| parent | 51906611abb53e8a22f2d460964e87b0b399d684 (diff) | |
fdo#84935: basic: avoid silly SolarMutex asserts on exit on Mac
Change-Id: If22b8ff962d2b68130176de3b7b9eccacfc850dc
| -rw-r--r-- | basic/source/sbx/sbxbase.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/app.cxx | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index c9ec487f5ebe..0a88f5412a66 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -19,6 +19,7 @@ #include <tools/debug.hxx> #include <tools/stream.hxx> +#include <vcl/svapp.hxx> #include <basic/sbx.hxx> #include <basic/sbxfac.hxx> @@ -41,7 +42,10 @@ SbxAppData::SbxAppData() SbxAppData::~SbxAppData() { + SolarMutexGuard g; + delete pBasicFormater; + aFacs.clear(); } SbxBase::SbxBase() diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 0eeb327f7db5..7c3b8884b56a 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -232,11 +232,12 @@ SfxApplication::~SfxApplication() // delete global options SvtViewOptions::ReleaseOptions(); + if ( !pAppData_Impl->bDowning ) + Deinitialize(); + #if HAVE_FEATURE_SCRIPTING delete pBasic; #endif - if ( !pAppData_Impl->bDowning ) - Deinitialize(); delete pAppData_Impl; pApp = 0; |