rpms/openoffice.org/devel workspace.fwk59.patch, NONE, 1.1 openoffice.org.spec, 1.984, 1.985 openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk59.patch 
Removed Files:
	openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch 
Log Message:
rename patch as owner workspace

workspace.fwk59.patch:
 objstor.cxx |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE workspace.fwk59.patch ---
Index: source/doc/objstor.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objstor.cxx,v
retrieving revision 1.187
retrieving revision 1.187.40.1
diff -u -r1.187 -r1.187.40.1
--- openoffice.org.orig/sfx2/source/doc/objstor.cxx	9 Nov 2006 14:29:32 -0000	1.187
+++ openoffice.org/sfx2/source/doc/objstor.cxx	19 Dec 2006 14:26:56 -0000	1.187.40.1
@@ -1978,9 +1978,13 @@
         if ( !pFilter || IsPackageStorageFormat_Impl( *pMedium ) )
 		{
             uno::Reference < embed::XStorage > xOld = GetStorage();
+
+			// when the package based medium is broken and has no storage or if the storage
+			// is the same as the document storage the current document storage should be preserved
 			xStorage = pMedium->GetStorage();
 			bOk = SaveCompleted( xStorage );
-            if ( bOk && (!pOld || !pOld->HasStorage_Impl() || xOld != pOld->GetStorage() ) )
+            if ( bOk && xStorage.is() && xOld != xStorage 
+			  && (!pOld || !pOld->HasStorage_Impl() || xOld != pOld->GetStorage() ) )
 			{
                 // old own storage was not controlled by old Medium -> dispose it
 				try {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -r1.984 -r1.985
--- openoffice.org.spec	19 Dec 2006 14:23:33 -0000	1.984
+++ openoffice.org.spec	19 Dec 2006 14:45:06 -0000	1.985
@@ -95,7 +95,7 @@
 Patch27: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
 Patch28: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch29: ooobuild.VBAObjects.patch
-Patch30: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch30: workspace.fwk59.patch
 Patch31: workspace.os89.patch
 Patch32: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
 Patch33: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
@@ -956,7 +956,7 @@
 %patch27 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
 %patch28 -p1 -b .rh187919.gtkunderkde.patch
 %patch29 -p0 -b .ooobuild.VBAObjects.patch
-%patch30 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch30 -p1 -b .workspace.fwk59.patch
 %patch31 -p1 -b .workspace.os89.patch
 %patch32 -p1 -b .ooo68048.vcl.imsurroundtext.patch
 %patch33 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch


--- openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch DELETED ---