rpms/openoffice.org/devel workspace.cmcfixes59.patch, NONE, 1.1 workspace.cmcfixes60.patch, NONE, 1.1 openoffice.org.spec, 1.1953, 1.1954 openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch, 1.1, NONE openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7268

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes59.patch workspace.cmcfixes60.patch 
Removed Files:
	openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch 
	openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch 
Log Message:
rename/merge into accepted workspaces

workspace.cmcfixes59.patch:

--- NEW FILE workspace.cmcfixes59.patch ---
Index: typesconfig/typesconfig.c
===================================================================
--- sal.orig/typesconfig/typesconfig.c	(revision 269860)
+++ sal/typesconfig/typesconfig.c	(working copy)
@@ -163,20 +163,26 @@
 |*	Letzte Aenderung
 |*
 *************************************************************************/
-static int dummy(void* unused);
+#if defined(IA64) || defined(ARM32)
 
 int GetAtAddress( Type eT, void* p )
 {
-#if defined(IA64) || defined(ARM32)
   switch ( eT )
   {
   case t_char:		return *((char*)p);
-  case t_short:		if ((long)p % sizeof(short)) abort(); else return *((short*)p);
-  case t_int:		if ((long)p % sizeof(int)) abort(); else return *((int*)p);
-  case t_long:		if ((long)p % sizeof(long)) abort(); else return *((long*)p);
-  case t_double:	if ((long)p % sizeof(double)) abort(); else return *((double*)p);
+  case t_short:		if ((long)p % sizeof(short)) raise(SIGBUS); else return *((short*)p);
+  case t_int:		if ((long)p % sizeof(int)) raise(SIGBUS); else return *((int*)p);
+  case t_long:		if ((long)p % sizeof(long)) raise(SIGBUS); else return *((long*)p);
+  case t_double:	if ((long)p % sizeof(double)) raise(SIGBUS); else return *((double*)p);
   }
+  abort();
+}
+
 #else
+static int dummy(void* unused);
+
+int GetAtAddress( Type eT, void* p )
+{
   switch ( eT )
   {
   case t_char: { char x = *(char*)p; return dummy(&x); }
@@ -185,7 +191,6 @@
   case t_long: { long x = *(long*)p; return dummy(&x); }
   case t_double: { double x = *(double*)p; return dummy(&x); }
   }
-#endif
   abort();
 }
 
@@ -195,6 +200,7 @@
     return 0;
 }
 
+#endif
 /*************************************************************************
 |*
 |*	SetAtAddress()

workspace.cmcfixes60.patch:

--- NEW FILE workspace.cmcfixes60.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/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1953
retrieving revision 1.1954
diff -u -p -r1.1953 -r1.1954
--- openoffice.org.spec	28 Jun 2009 16:16:14 -0000	1.1953
+++ openoffice.org.spec	30 Jun 2009 08:13:22 -0000	1.1954
@@ -138,7 +138,7 @@ Patch60: openoffice.org-3.1.0.ooo101354.
 Patch61: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 Patch62: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 Patch63: workspace.evoab2def.patch
-Patch64: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch
+Patch64: workspace.cmcfixes59.patch
 Patch65: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
 Patch66: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
 Patch67: workspace.unifypaper01.patch
@@ -149,7 +149,7 @@ Patch71: openoffice.org-3.1.1-ooo102679.
 Patch72: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
 Patch73: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
 Patch74: workspace.aw073.patch
-Patch75: openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch
+Patch75: workspace.cmcfixes60.patch
 Patch76: openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
@@ -1646,7 +1646,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch61 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 %patch62 -p0 -b .ooo101379.vcl.qstart.SM.patch
 %patch63 -p0 -b .workspace.evoab2def.patch
-%patch64 -p0 -b .ooo100469.sal.ia64_arm.patch
+%patch64 -p0 -b .workspace.cmcfixes59.patch
 %patch65 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
 %patch66 -p0 -b .ooo101567.i18npool.mailocaledata.patch
 %patch67 -p1
@@ -1657,7 +1657,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch72 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
 %patch73 -p0 -b .ooo102920.i18npool.utf16bustage.patch
 %patch74 -p0 -b .workspace.aw073.patch
-%patch75 -p0 -b .ooo102932.sw.mailmerge.busted-integer-conversion.patch
+%patch75 -p0 -b .workspace.cmcfixes60.patch
 %patch76 -p0 -b .ooo92645.oox.msxmldecryptimpl.patch
 
 %build


--- openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch DELETED ---


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