rpms/openoffice.org/devel workspace.fwk102.patch, NONE, 1.1 openoffice.org.spec, 1.1784, 1.1785 openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch, 1.2, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6953

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk102.patch 
Removed Files:
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch 
Log Message:
rename to upstream workspace

workspace.fwk102.patch:

--- NEW FILE workspace.fwk102.patch ---
diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx
index 80944e4..204dd55 100644
--- openoffice.org.orig/sfx2/source/doc/objserv.cxx
+++ openoffice.org/sfx2/source/doc/objserv.cxx
@@ -1333,7 +1333,7 @@ sal_uInt16 SfxObjectShell::ImplGetSignatureState( sal_Bool bScriptingContent )
     {
         *pState = SIGNATURESTATE_NOSIGNATURES;
 
-        if ( GetMedium() && GetMedium()->GetName().Len() && GetMedium()->GetStorage().is() && IsOwnStorageFormat_Impl( *GetMedium()) )
+        if ( GetMedium() && GetMedium()->GetName().Len() &&  IsOwnStorageFormat_Impl( *GetMedium()) && GetMedium()->GetStorage().is() )
         {
 			try
 			{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1784
retrieving revision 1.1785
diff -u -r1.1784 -r1.1785
--- openoffice.org.spec	6 Feb 2009 11:47:31 -0000	1.1784
+++ openoffice.org.spec	9 Feb 2009 09:24:13 -0000	1.1785
@@ -132,7 +132,7 @@
 Patch61: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch62: workspace.fwk99.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
+Patch64: workspace.fwk102.patch
 Patch65: workspace.cmcfixes54.patch
 Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch67: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
@@ -1597,7 +1597,7 @@
 %patch61 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch62 -p1 -b .workspace.fwk99.patch
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
-%patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
+%patch64 -p1 -b .workspace.fwk102.patch
 %patch65 -p1 -b .workspace.cmcfixes54.patch
 %patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch67 -p1 -b .ooo98649.svtools.missingUI.patch


--- openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch DELETED ---