diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:12:41 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:12:41 +0000 |
| commit | e3a7eddc315082714eda34bf845991932c36b75f (patch) | |
| tree | 8444c890cfb617e04607bb0a6eb762812bd97fa6 /sfx2 | |
| parent | 43186607aaba2e8d98625af22e12ae1d82fd4ab0 (diff) | |
INTEGRATION: CWS fwkbugfix04 (1.49.6); FILE MERGED
2004/12/08 15:14:16 mba 1.49.6.4: RESYNC: (1.49-1.50); FILE MERGED
2004/12/06 18:00:28 mba 1.49.6.3: #i38334#: get rid of all code based on SfxConfigManager
2004/12/02 16:42:13 mba 1.49.6.2: #i38241#: don't create a TempStorage in dtor
2004/11/29 13:31:22 sb 1.49.6.1: #i33099# Copied over from CWS cd02.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 2cfbb78e7475..537d05131cbd 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objxtor.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: kz $ $Date: 2005-01-13 19:08:31 $ + * last change: $Author: kz $ $Date: 2005-01-18 16:12:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,11 +140,9 @@ #include "docfac.hxx" #include "docfile.hxx" #include "event.hxx" -#include "cfgmgr.hxx" #include "dispatch.hxx" #include "viewsh.hxx" #include "viewfrm.hxx" -//#include "interno.hxx" #include "sfxresid.hxx" #include "objshimp.hxx" #include "appbas.hxx" @@ -161,9 +159,6 @@ #include "basmgr.hxx" #include "dlgcont.hxx" #include "scriptcont.hxx" -#include "imgmgr.hxx" -#include "tbxconf.hxx" -#include "accmgr.hxx" #include "QuerySaveDocument.hxx" #include "helpid.hrc" #include "msg.hxx" @@ -268,10 +263,10 @@ SfxObjectShell::~SfxObjectShell() SfxObjectShell::Close(); pImp->xModel = NULL; - DELETEX(pImp->pEventConfig); - DELETEX(pImp->pTbxConfig); - DELETEX(pImp->pAccMgr); - DELETEX(pImp->pCfgMgr); +// DELETEX(pImp->pEventConfig); +// DELETEX(pImp->pTbxConfig); +// DELETEX(pImp->pAccMgr); +// DELETEX(pImp->pCfgMgr); DELETEX(pImp->pReloadTimer ); SfxApplication *pSfxApp = SFX_APP(); @@ -296,7 +291,8 @@ SfxObjectShell::~SfxObjectShell() //REMOVE if ( pMedium && pMedium->IsTemporary() ) //REMOVE HandsOff(); - if ( pMedium->HasStorage_Impl() && pMedium->GetStorage() == GetStorage() ) + // don't call GetStorage() here, in case of Load Failure it's possible that a storage was never assigned! + if ( pMedium->HasStorage_Impl() && pMedium->GetStorage() == pImp->m_xDocStorage ) pMedium->CanDisposeStorage_Impl( sal_False ); DELETEX( pMedium ); |