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

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch 
Removed Files:
	openoffice.org-2.3.0.ooo81815.sc.maketypesagree.patch 
Log Message:
move to more complete openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch

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

--- NEW FILE openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch ---
Index: sc/source/filter/xml/xmlexprt.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/xml/xmlexprt.cxx,v
retrieving revision 1.207
diff -u -p -r1.207 xmlexprt.cxx
--- openoffice.org/sc/source/filter/xml/xmlexprt.cxx	6 Jul 2007 12:40:24 -0000	1.207
+++ openoffice.org.orig/sc/source/filter/xml/xmlexprt.cxx	23 Sep 2007 09:09:02 -0000
@@ -3545,13 +3572,13 @@ void ScXMLExport::GetViewSettings(uno::S
 					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 <<= static_cast<sal_Int32>(aRect.getY());
 					pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaLeft"));
-					pProps[i].Value <<= aRect.getX();
+					pProps[i].Value <<= static_cast<sal_Int32>(aRect.getX());
 					pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaWidth"));
-					pProps[i].Value <<= aRect.getWidth();
+					pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth());
 					pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaHeight"));
-					pProps[i].Value <<= aRect.getHeight();
+					pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight());
 				}
 			}
 		}
Index: sc/source/ui/view/viewdata.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/viewdata.cxx,v
retrieving revision 1.59
diff -u -p -r1.59 viewdata.cxx
--- openoffice.org.orig/sc/source/ui/view/viewdata.cxx	10 May 2007 17:03:57 -0000	1.59
+++ openoffice.org/sc/source/ui/view/viewdata.cxx	23 Sep 2007 09:10:00 -0000
@@ -185,12 +150,12 @@ void ScViewDataTable::WriteUserDataSeque
 		if (eHSplitMode == SC_SPLIT_FIX)
 			pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosX);
 		else
-			pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= nHSplitPos;
+			pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nHSplitPos);
 		pSettings[SC_VERTICAL_SPLIT_POSITION].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITPOSITION));
 		if (eVSplitMode == SC_SPLIT_FIX)
 			pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosY);
 		else
-			pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= nVSplitPos;
+			pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nVSplitPos);
 		pSettings[SC_ACTIVE_SPLIT_RANGE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVESPLITRANGE));
 		pSettings[SC_ACTIVE_SPLIT_RANGE].Value <<= sal_Int16(eWhichActive);
 		pSettings[SC_POSITION_LEFT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONLEFT));


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1310
retrieving revision 1.1311
diff -u -r1.1310 -r1.1311
--- openoffice.org.spec	2 Oct 2007 13:56:01 -0000	1.1310
+++ openoffice.org.spec	2 Oct 2007 15:17:53 -0000	1.1311
@@ -145,7 +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
+Patch66: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1086,7 +1086,7 @@
 %patch63 -p1 -b .ooo77672.boost.use.end_p.patch
 %patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
 %patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
-%patch66 -p1 -b .ooo81815.sc.maketypesagree.patch
+%patch66 -p1 -b .ooo81936.sc.maketypesagree.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2783,7 +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
+- add openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
 
 * Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.3.0-5.1
 - release candidate


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