summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-05-21 15:19:08 +0200
committerMichael Stahl <mst@openoffice.org>2010-05-21 15:19:08 +0200
commit047c38908df32c7de6634b1d5963b0df71d4e6e8 (patch)
tree14db73a0c489aecaa06b6b4eac98925dfb518b8c
parent33ddea2d2bdb996a7f8eb7189b311bafa0de367e (diff)
sw33bf04: #i58606#: ~SwExtTextInput(): do not do anything if in SwDoc dtor
-rw-r--r--sw/source/core/doc/extinput.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index 2b2c809c3cb2..f627870932f9 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -54,6 +54,9 @@ SwExtTextInput::SwExtTextInput( const SwPaM& rPam, Ring* pRing )
SwExtTextInput::~SwExtTextInput()
{
+ SwDoc *const pDoc = GetDoc();
+ if (pDoc->IsInDtor()) { return; /* #i58606# */ }
+
SwTxtNode* pTNd = GetPoint()->nNode.GetNode().GetTxtNode();
if( pTNd )
{
@@ -69,7 +72,6 @@ SwExtTextInput::~SwExtTextInput()
// damit Undo / Redlining usw. richtig funktioniert,
// muss ueber die Doc-Schnittstellen gegangen werden !!!
- SwDoc* pDoc = GetDoc();
if(eInputLanguage != LANGUAGE_DONTKNOW)
{
// --> FME 2005-02-11 #i41974# Only set language attribute