diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:17:20 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:17:20 +0000 |
| commit | f761aef48901f3c07f897e222571ca8ed7a681c1 (patch) | |
| tree | 22ed844a8e073fbcc51d573629bf6763613ce3a7 /sfx2 | |
| parent | 29d3a56eacd57f987a2bc27c2b62153f70464a46 (diff) | |
INTEGRATION: CWS fwk40 (1.179.30); FILE MERGED
2006/06/30 14:24:13 mav 1.179.30.2: RESYNC: (1.179-1.180); FILE MERGED
2006/06/08 11:29:48 mav 1.179.30.1: #i66067# do not close the streams in salvage mode
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 6cbb01ca30c5..6a04c1d8c2fb 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docfile.cxx,v $ * - * $Revision: 1.181 $ + * $Revision: 1.182 $ * - * last change: $Author: obo $ $Date: 2006-07-13 13:26:35 $ + * last change: $Author: ihi $ $Date: 2006-08-01 11:17:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2645,15 +2645,19 @@ void SfxMedium::CloseAndReleaseStreams_Impl() // The probably exsisting SvStream wrappers should be closed first CloseStreams_Impl(); - try - { - if ( xInToClose.is() ) - xInToClose->closeInput(); - if ( xOutToClose.is() ) - xOutToClose->closeOutput(); - } - catch ( uno::Exception& ) + // in case of salvage mode the storage is based on the streams + if ( !pImp->m_bSalvageMode ) { + try + { + if ( xInToClose.is() ) + xInToClose->closeInput(); + if ( xOutToClose.is() ) + xOutToClose->closeOutput(); + } + catch ( uno::Exception& ) + { + } } } |