rpms/openoffice.org/F-11 openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch, NONE, 1.1 openoffice.org.spec, 1.1919, 1.1920

[David Tardon]

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24601

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch 
Log Message:
Resolves: rhbz#504452 Serial printing: Problems with datasource refresh, selection of records when printing to a file

openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch:

--- NEW FILE openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch ---
Index: sw/source/ui/envelp/mailmrge.cxx
===================================================================
--- sw/source/ui/envelp/mailmrge.cxx	(revision 272843)
+++ sw/source/ui/envelp/mailmrge.cxx	(working copy)
@@ -402,6 +402,8 @@
     aLk = LINK(this, SwMailMergeDlg, ModifyHdl);
 	aFromNF.SetModifyHdl(aLk);
 	aToNF.SetModifyHdl(aLk);
+    aFromNF.SetMax(SAL_MAX_INT32);
+    aToNF.SetMax(SAL_MAX_INT32);
 
     SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
     if(_xConnection.is())
@@ -783,19 +785,20 @@
 
 	if (aFromRB.IsChecked())	// Liste Einfuegen
 	{
-        ULONG nStart = static_cast< ULONG >(aFromNF.GetValue());
-        ULONG nEnd   = static_cast< ULONG >(aToNF.GetValue());
+        // Safe: the maximal value of the fields is limited
+        sal_Int32 nStart = sal::static_int_cast<sal_Int32>(aFromNF.GetValue());
+        sal_Int32 nEnd   = sal::static_int_cast<sal_Int32>(aToNF.GetValue());
 
 		if (nEnd < nStart)
 		{
-			ULONG nZw = nEnd;
+			const sal_Int32 nZw = nEnd;
 			nEnd = nStart;
 			nStart = nZw;
 		}
 
 		m_aSelection.realloc(nEnd - nStart + 1);
 		Any* pSelection = m_aSelection.getArray();
-		for (ULONG i = nStart; i <= nEnd; ++i, ++pSelection)
+		for (sal_Int32 i = nStart; i != nEnd; ++i, ++pSelection)
 			*pSelection <<= i;
 	}
     else if (aAllRB.IsChecked() )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1919
retrieving revision 1.1920
diff -u -p -r1.1919 -r1.1920
--- openoffice.org.spec	18 Jun 2009 17:16:10 -0000	1.1919
+++ openoffice.org.spec	19 Jun 2009 06:37:06 -0000	1.1920
@@ -145,6 +145,7 @@ Patch69: openoffice.org-3.1.0.ooo102566.
 Patch70: workspace.pdfextfix02.patch
 Patch71: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
 Patch72: workspace.aw073.patch
+Patch73: openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1648,6 +1649,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch70 -p0 -b .workspace.pdfextfix02.patch
 %patch71 -p0 -b .ooo102920.i18npool.utf16bustage.patch
 %patch72 -p0 -b .workspace.aw073.patch
+%patch73 -p0 -b .ooo102932.sw.mailmerge.busted-integer-conversion.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4157,6 +4159,8 @@ fi
 - Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import
 - Resolves: rhbz#506545 openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
 - Resolves: rhbz#506184 workspace.aw073.patch
+- Resolves: rhbz#504452 Serial printing: Problems with datasource
+  refresh, selection of records when printing to a file
 
 * Mon May 25 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
 - add in the ia64 and arm fixes for the secondary arch people