[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

[Steve Yin]

 sw/source/core/access/acccontext.cxx |    3 ++-
 sw/source/core/access/accpara.cxx    |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5802b1bd0725151d3fa0ea311cf4405fb58ff409
Author: Steve Yin <steve_y at apache.org>
Date:   Wed Dec 4 10:09:58 2013 +0000

    i121761 - [ia2] Writer crashes on exit with an msvcrt runtime error

diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 039512a..da80a18 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -588,7 +588,8 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM,
 
 SwAccessibleContext::~SwAccessibleContext()
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
+    if(Application::GetUnoWrapper())
+        vos::OGuard aGuard(Application::GetSolarMutex());
 
     DBG_MSG_CD( "destructed" )
     RemoveFrmFromAccessibleMap();
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index ac0c5f1..5dff84d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -594,7 +594,8 @@ SwAccessibleParagraph::SwAccessibleParagraph(
 
 SwAccessibleParagraph::~SwAccessibleParagraph()
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
+    if(Application::GetUnoWrapper())
+        vos::OGuard aGuard(Application::GetSolarMutex());
 
     delete pPortionData;
     delete pHyperTextData;