You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/12/04 11:09:58 UTC

svn commit: r1547747 - in /openoffice/trunk/main/sw/source/core/access: acccontext.cxx accpara.cxx

Author: steve_y
Date: Wed Dec  4 10:09:58 2013
New Revision: 1547747

URL: http://svn.apache.org/r1547747
Log:
i121761 - [ia2] Writer crashes on exit with an msvcrt runtime error

Modified:
    openoffice/trunk/main/sw/source/core/access/acccontext.cxx
    openoffice/trunk/main/sw/source/core/access/accpara.cxx

Modified: openoffice/trunk/main/sw/source/core/access/acccontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/acccontext.cxx?rev=1547747&r1=1547746&r2=1547747&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/acccontext.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/acccontext.cxx Wed Dec  4 10:09:58 2013
@@ -588,7 +588,8 @@ SwAccessibleContext::SwAccessibleContext
 
 SwAccessibleContext::~SwAccessibleContext()
 {
-	vos::OGuard aGuard(Application::GetSolarMutex());
+	if(Application::GetUnoWrapper())
+		vos::OGuard aGuard(Application::GetSolarMutex());
 
 	DBG_MSG_CD( "destructed" )
     RemoveFrmFromAccessibleMap();

Modified: openoffice/trunk/main/sw/source/core/access/accpara.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accpara.cxx?rev=1547747&r1=1547746&r2=1547747&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accpara.cxx Wed Dec  4 10:09:58 2013
@@ -594,7 +594,8 @@ SwAccessibleParagraph::SwAccessibleParag
 
 SwAccessibleParagraph::~SwAccessibleParagraph()
 {
-	vos::OGuard aGuard(Application::GetSolarMutex());
+	if(Application::GetUnoWrapper())
+		vos::OGuard aGuard(Application::GetSolarMutex());
 
     delete pPortionData;
     delete pHyperTextData;