rpms/openoffice.org/devel openoffice.org.spec, 1.1418, 1.1419 workspace.notes2.patch, 1.4, 1.5

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23979

Modified Files:
	openoffice.org.spec workspace.notes2.patch 
Log Message:
ooo#85914 work around trouble with deleting multiple notes


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1418
retrieving revision 1.1419
diff -u -r1.1418 -r1.1419
--- openoffice.org.spec	6 Feb 2008 12:42:42 -0000	1.1418
+++ openoffice.org.spec	6 Feb 2008 13:44:01 -0000	1.1419
@@ -2862,6 +2862,7 @@
 - Resolves: ooo#84209 make letter wizard work with gstreamer changes
 - Resolves: rhbz#431606 require jre not java
 - Resolves: rhbz#431620/ooo#85909 depth mismatch for text
+- ooo#85914 work around trouble with deleting multiple notes
 
 * Mon Feb 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-6.1
 - next milestone

workspace.notes2.patch:

Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.notes2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.notes2.patch	5 Feb 2008 16:25:54 -0000	1.4
+++ workspace.notes2.patch	6 Feb 2008 13:44:01 -0000	1.5
@@ -4220,7 +4220,7 @@
 diff -u /dev/null sw/sw/source/ui/docvw/PostItMgr.cxx:1.1.2.129
 --- /dev/null	Tue Feb  5 02:33:27 2008
 +++ sw/sw/source/ui/docvw/PostItMgr.cxx	Thu Jan 31 04:06:53 2008
-@@ -0,0 +1,1589 @@
+@@ -0,0 +1,1588 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -4463,11 +4463,10 @@
 +		{
 +			// if postits are there make sure that page lists are not empty
 +			// otherwise sudden paints can cause pain (in BorderOverPageBorder)
-+			if (!mbDeletingSeveral)
++			if (!mbDeletingSeveral && !mbWaitingForCalcRects)
 +			{
-+				mbLayout = true;
-+				CalcRects();
-+				LayoutPostIts();
++				mbWaitingForCalcRects = true;
++				mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl), 0 );
 +			}
 +		}
 +	}