diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:15:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:15:55 +0000 |
| commit | 0da20a9ec477f484cf32c20336ec99d6df10cb67 (patch) | |
| tree | 43ee941b018fb25df308134d20edcdfcb8a7cb73 | |
| parent | 515cee3060734adce97a93cd76fd15cb2a4b9f7b (diff) | |
INTEGRATION: CWS mav4 (1.34.2); FILE MERGED
2003/04/23 10:30:50 mba 1.34.2.1: #108760#: avoid double disposing
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 4e360a27385b..1836cbeeeb8a 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objxtor.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: hr $ $Date: 2003-04-04 19:24:18 $ + * last change: $Author: rt $ $Date: 2003-04-24 13:15:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -254,8 +254,7 @@ SfxObjectShell::~SfxObjectShell() // Ableitungszweig SfxInternObject ist wegen eines Compiler Bugs nicht // erlaubt SfxObjectShell::Close(); - if ( pImp->xModel.is() ) - pImp->xModel->dispose(); + pImp->xModel = NULL; String aPhysName; if ( pMedium ) @@ -914,7 +913,7 @@ void SfxObjectShell::SetModel( SfxBaseModel* pModel ) void SfxObjectShell::SetBaseModel( SfxBaseModel* pModel ) { - if ( pImp->xModel.is() ) + if ( pImp->xModel.is() && pModel ) DBG_WARNING( "Model already set!" ); pImp->xModel = pModel; |