diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 08:06:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 08:06:17 +0000 |
| commit | 779f37e69529f5c0f73bbb237365eaed7bc2111e (patch) | |
| tree | f366cffcf7296ad347a0f662efc5b1e87875572b /sfx2 | |
| parent | f117fe35e35020ebdb25862e1e5552ed285387e5 (diff) | |
INTEGRATION: CWS perform06 (1.60.16); FILE MERGED
2005/10/26 10:19:00 mav 1.60.16.1: #120150# document owns the provided temporary storage in case of crashrecovery scenario
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index a0c67319efb3..1ac1c02f8b8f 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -4,9 +4,9 @@ * * $RCSfile: objxtor.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: kz $ $Date: 2005-11-03 12:05:44 $ + * last change: $Author: rt $ $Date: 2005-11-11 09:06:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -271,15 +271,6 @@ SfxObjectShell::~SfxObjectShell() DELETEX( pMedium ); - if ( pImp->aTempName.Len() ) - { -//REMOVE if ( aPhysName == pImp->aTempName && !IsHandsOff() ) -//REMOVE HandsOff(); - String aTmp; - ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->aTempName, aTmp ); - ::utl::UCBContentHelper::Kill( aTmp ); - } - if ( pImp->mpObjectContainer ) { pImp->mpObjectContainer->CloseEmbeddedObjects(); @@ -289,6 +280,14 @@ SfxObjectShell::~SfxObjectShell() if ( pImp->bOwnsStorage && pImp->m_xDocStorage.is() ) pImp->m_xDocStorage->dispose(); + // The removing of the temporary file must be done as the latest step in the document destruction + if ( pImp->aTempName.Len() ) + { + String aTmp; + ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->aTempName, aTmp ); + ::utl::UCBContentHelper::Kill( aTmp ); + } + delete pImp; } |