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

1 files changed, 14 insertions, 10 deletions

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 4d8e158b7f..592c4b2afe 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& )
+        {
+        }
     }
 }