rpms/openoffice.org/F-9 openoffice.org.spec, 1.1506, 1.1507 workspace.notes2.patch, 1.14, 1.15

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.notes2.patch 
Log Message:
Resolves: ooo#94495 Toggle weblayout/normal layout and notes


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1506
retrieving revision 1.1507
diff -u -r1.1506 -r1.1507
--- openoffice.org.spec	27 Aug 2008 19:11:46 -0000	1.1506
+++ openoffice.org.spec	2 Oct 2008 10:22:24 -0000	1.1507
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 17
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -2949,6 +2949,9 @@
 
 
 %changelog
+* Thu Oct 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.7
+- Resolves: ooo#94495 Toggle weblayout/normal layout and notes
+
 * Tue Aug 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.6
 - Resolves: CVE-2008-3282 numeric truncation error in OOo memory allocator
 - add openoffice.org-2.4.0.ooo93119.shell.echos.patch

workspace.notes2.patch:

Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.notes2.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- workspace.notes2.patch	31 Jul 2008 08:12:18 -0000	1.14
+++ workspace.notes2.patch	2 Oct 2008 10:22:24 -0000	1.15
@@ -18505,3 +18505,16 @@
              <menu:menuseparator/>
              <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
              <menu:menuseparator/>
+diff -ru sw/source/ui/docvw/PostItMgr.cxx sw/source/ui/docvw/PostItMgr.cxx
+--- openoffice.org.orig/sw/source/ui/docvw/PostItMgr.cxx	2008-10-02 10:54:48.000000000 +0100
++++ openoffice.org/sw/source/ui/docvw/PostItMgr.cxx	2008-10-02 11:21:41.000000000 +0100
+@@ -451,7 +451,8 @@
+ 			const unsigned long aPageNum = pPage ? pPage->GetPhyPageNum() : 1;
+ 			if (aPageNum > mPages.size())
+ 			{
+-				for (unsigned int j=0; j<aPageNum - mPages.size();j++)
++				const unsigned long nNumberOfPages = mPages.size();
++				for (unsigned int j=0; j<aPageNum - nNumberOfPages;j++)
+ 					mPages.push_back( new SwPostItPageItem());
+ 			}
+ 			mPages[aPageNum-1]->mList->push_back(*i);