diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 10:19:59 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 10:19:59 +0000 |
| commit | de89edaf95735c36eb24d2cb7891ec69150680ca (patch) | |
| tree | 0901169532958bc9ff6ded410ea1908dc099bb3c /sw/source/core/unocore | |
| parent | 2ac74e390f25f78414eeb18c0565000eaa954ea1 (diff) | |
INTEGRATION: CWS os65 (1.50.188); FILE MERGED
2005/06/30 07:20:26 os 1.50.188.1: #i50955# SolarMutex locking in destructors
Diffstat (limited to 'sw/source/core/unocore')
| -rw-r--r-- | sw/source/core/unocore/unoobj2.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index f1388c04f847..cab46c0a395b 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoobj2.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: vg $ $Date: 2005-03-07 17:34:02 $ + * last change: $Author: kz $ $Date: 2005-07-12 11:19:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1183,6 +1183,7 @@ SwXParagraphEnumeration::SwXParagraphEnumeration(SwXText* pParent, -----------------------------------------------------------------------*/ SwXParagraphEnumeration::~SwXParagraphEnumeration() { + vos::OGuard aGuard(Application::GetSolarMutex()); SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) delete pUnoCrsr; @@ -1504,6 +1505,7 @@ SwXTextRange::SwXTextRange(SwFrmFmt& rTblFmt) : -----------------------------------------------------------------------*/ SwXTextRange::~SwXTextRange() { + vos::OGuard aGuard(Application::GetSolarMutex()); if(GetBookmark()) pDoc->DelBookmark( GetBookmark()->GetName() ); } @@ -2427,6 +2429,7 @@ SwXTextRanges::SwXTextRanges(SwPaM* pCrsr) : -----------------------------------------------------------------------*/ SwXTextRanges::~SwXTextRanges() { + vos::OGuard aGuard(Application::GetSolarMutex()); SwUnoCrsr* pCrsr = GetCrsr(); delete pCrsr; if(pRangeArr) @@ -2631,6 +2634,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(const SwUnoCrsr& rUnoCrsr, -----------------------------------------------------------------------*/ SwXParaFrameEnumeration::~SwXParaFrameEnumeration() { + vos::OGuard aGuard(Application::GetSolarMutex()); aFrameArr.DeleteAndDestroy(0, aFrameArr.Count()); SwUnoCrsr* pUnoCrsr = GetCrsr(); delete pUnoCrsr; |