rpms/openoffice.org/F-12 openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch, NONE, 1.1 openoffice.org.spec, 1.2044, 1.2045

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14525/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch 
Log Message:
Resolves: rhbz#547176 add openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch

openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch:
 drviews1.cxx |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch ---
diff -ru sd.orig/source/ui/view/drviews1.cxx sd/source/ui/view/drviews1.cxx
--- sd.orig/source/ui/view/drviews1.cxx	2009-12-15 12:17:56.000000000 +0000
+++ sd/source/ui/view/drviews1.cxx	2009-12-15 12:19:47.000000000 +0000
@@ -157,12 +157,32 @@
     ViewShell::Deactivate(bIsMDIActivate);
 }
 
+namespace
+{
+    class LockUI
+    {
+    private:
+        void Lock(bool bLock);
+        SfxViewFrame *mpFrame;
+    public:
+        LockUI(SfxViewFrame *pFrame) : mpFrame(pFrame) { Lock(true); }
+        ~LockUI() { Lock(false); }
+
+    };
+
+    void LockUI::Lock(bool bLock)
+    {
+        if (!mpFrame)
+            return;
+        mpFrame->Enable( !bLock );
+    }
+}
+
 /*************************************************************************
 |*
 |* Wird gerufen, wenn sich der Selektionszustand der View aendert
 |*
 \************************************************************************/
-
 void DrawViewShell::SelectionHasChanged (void)
 {
 	Invalidate();
@@ -216,6 +236,8 @@
 			// we need to deselect it now
 			if (!pOleObj)
 			{
+                //#i47279# disable frame until after object has completed unload
+                LockUI aUILock(GetViewFrame());
                 pIPClient->DeactivateObject();
 				//HMHmpDrView->ShowMarkHdl();
 			}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2044
retrieving revision 1.2045
diff -u -p -r1.2044 -r1.2045
--- openoffice.org.spec	15 Dec 2009 13:07:01 -0000	1.2044
+++ openoffice.org.spec	15 Dec 2009 13:27:58 -0000	1.2045
@@ -180,6 +180,7 @@ Patch103: openoffice.org-3.2.0.ooo106502
 Patch104: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 Patch105: workspace.vcl105.patch
 Patch106: workspace.fwk132.patch
+Patch107: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1746,6 +1747,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch104 -p0 -b .ooo107552.vcl.sft.patch
 %patch105 -p0 -b .workspace.vcl105.patch
 %patch106 -p1 -b .workspace.fwk132.patch
+%patch107 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4281,6 +4283,8 @@ fi
 %changelog
 * Tue Dec 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.22
 - Resolves: rhbz#529648 add workspace.fwk132.patch
+- Resolves: rhbz#547176 add 
+  openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 * Wed Dec 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.21
 - Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch