rpms/openoffice.org/devel openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch, 1.3, 1.4 openoffice.org.spec, 1.1225, 1.1226

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 
	openoffice.org.spec 
Log Message:
gotopage uses visual reported page no

openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch:

Index: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch	10 Jul 2007 14:48:36 -0000	1.3
+++ openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch	17 Jul 2007 16:31:26 -0000	1.4
@@ -731,7 +731,7 @@
 +#define PB_HELP              19
 --- /dev/null	2007-07-10 08:03:57.022658051 +0100
 +++ openoffice.org/sw/source/ui/misc/titlepage.cxx	2007-07-10 14:18:25.000000000 +0100
-@@ -0,0 +1,364 @@
+@@ -0,0 +1,368 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -843,10 +843,14 @@
 +
 +        void lcl_ChangePage(SwWrtShell *pSh, USHORT nNoPages, USHORT nNewNumber, const SwPageDesc *pNewDesc)
 +	{
-+		if (pSh->GotoPage(nNoPages+1))
++		pSh->SttDoc();
++		FASTBOOL bAllOk = true;
++		
++		for (USHORT nI = 0; nI < nNoPages; ++nI)
++			bAllOk = pSh->SttNxtPg();
++		
++		if (bAllOk);
 +		{
-+		    pSh->SttPg();
-+
 +		    const USHORT nCurIdx = pSh->GetCurPageDesc();
 +		    const SwPageDesc &rCurrentDesc = pSh->GetPageDesc( nCurIdx );
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1225
retrieving revision 1.1226
diff -u -r1.1225 -r1.1226
--- openoffice.org.spec	11 Jul 2007 13:32:55 -0000	1.1225
+++ openoffice.org.spec	17 Jul 2007 16:31:26 -0000	1.1226
@@ -2688,8 +2688,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Jul 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.6
+* Tue Jul 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.6
 - Resolves: rhbz#247781 openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+- better page counting for titlepage dialog
 
 * Mon Jul 10 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.5
 - Resolves: rhbz#245729 openoffice.org-2.2.1.ooo78921.sw.embedded.patch