rpms/openoffice.org/devel openoffice.org-2.3.0.ooo81815.sc.maketypesagree.patch, NONE, 1.1 openoffice.org.spec, 1.1309, 1.1310

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo81815.sc.maketypesagree.patch 
Log Message:
add openoffice.org-2.3.0.ooo81815.sc.maketypesagree.patch

openoffice.org-2.3.0.ooo81815.sc.maketypesagree.patch:

--- NEW FILE openoffice.org-2.3.0.ooo81815.sc.maketypesagree.patch ---
--- openoffice.org.orig/sc/source/filter/xml/xmlexprt.cxx	2007-10-02 15:44:50.000000000 +0100
+++ openoffice.org/sc/source/filter/xml/xmlexprt.cxx	2007-10-02 15:46:54.000000000 +0100
@@ -3508,13 +3508,13 @@
 					Rectangle aRect(pEmbeddedObj->GetVisArea());
 					sal_uInt16 i(0);
 					pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaTop"));
-					pProps[i].Value <<= aRect.getY();
+					pProps[i].Value <<= (sal_Int32)aRect.getY();
 					pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaLeft"));
-					pProps[i].Value <<= aRect.getX();
+					pProps[i].Value <<= (sal_Int32)aRect.getX();
 					pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaWidth"));
-					pProps[i].Value <<= aRect.getWidth();
+					pProps[i].Value <<= (sal_Int32)aRect.getWidth();
 					pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaHeight"));
-					pProps[i].Value <<= aRect.getHeight();
+					pProps[i].Value <<= (sal_Int32)aRect.getHeight();
 				}
 			}
 		}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1309
retrieving revision 1.1310
diff -u -r1.1309 -r1.1310
--- openoffice.org.spec	2 Oct 2007 12:41:22 -0000	1.1309
+++ openoffice.org.spec	2 Oct 2007 13:56:01 -0000	1.1310
@@ -145,6 +145,7 @@
 Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
 Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
 Patch65: openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
+Patch66: openoffice.org-2.3.0.ooo81815.sc.maketypesagree.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1083,8 +1084,9 @@
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
 %patch63 -p1 -b .ooo77672.boost.use.end_p.patch
-#%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
 %patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
+%patch66 -p1 -b .ooo81815.sc.maketypesagree.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2781,6 +2783,7 @@
 * Tue Oct 02 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-5.2
 - Resolves: rhbz#299391 Serbian langpack name update
 - Resolves: rhbz#286221 allow custom printing commands
+- add openoffice.org-2.3.0.ooo81815.sc.maketypesagree.patch
 
 * Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.3.0-5.1
 - release candidate