From 28adfcdcbc504db8d5014a8939aa5e834e5d43d0 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 23 Oct 2014 21:07:49 +0200
Subject: fdo#84935: basic: avoid silly SolarMutex asserts on exit on Mac

Change-Id: If22b8ff962d2b68130176de3b7b9eccacfc850dc
---
 basic/source/sbx/sbxbase.cxx | 4 ++++
 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;
-- 
cgit v1.2.3