rpms/openoffice.org/devel openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3882

Modified Files:
	openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch 
Log Message:
streams closed early during recovery

openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch:
 embeddedobj/source/msole/olepersist.cxx |    9 ++++++++-
 sfx2/source/doc/docfile.cxx             |   20 ++++++++++++--------
 source/msole/olepersist.cxx             |    0 
 3 files changed, 20 insertions(+), 9 deletions(-)

Index: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch	7 Jun 2006 08:51:24 -0000	1.1
+++ openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch	8 Jun 2006 12:04:24 -0000	1.2
@@ -25,3 +25,39 @@
  
  		if ( xNameContainer.is() )
  		{
+Index: source/doc/docfile.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/doc/docfile.cxx,v
+retrieving revision 1.179
+retrieving revision 1.179.30.1
+diff -u -r1.179 -r1.179.30.1
+--- openoffice.org.orig/sfx2/source/doc/docfile.cxx	2 May 2006 16:41:30 -0000	1.179
++++ openoffice.org/sfx2/source/doc/docfile.cxx	8 Jun 2006 11:29:48 -0000	1.179.30.1
+@@ -2640,15 +2640,19 @@
+ 	// 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& )
++        {
++        }
+     }
+ }
+