rpms/openoffice.org/devel workspace.hb33patches1.patch, NONE, 1.1 openoffice.org.spec, 1.2071, 1.2072 openoffice.org-3.2.0.ooo59648.sw.scaling.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-serv23733

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.hb33patches1.patch 
Removed Files:
	openoffice.org-3.2.0.ooo59648.sw.scaling.patch 
Log Message:
rename to upstream workspace.hb33patches1.patch

workspace.hb33patches1.patch:
 wrtww8gr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE workspace.hb33patches1.patch ---
--- sw/source/filter/ww8/wrtww8gr.cxx	2009-11-10 16:54:31.000000000 -0200
+++ sw/source/filter/ww8/wrtww8gr.cxx	2009-11-10 16:54:47.000000000 -0200
@@ -608,7 +608,7 @@
     substitute the final size and loose on retaining the scaling factor but
     still keep the correct display size anyway.
     */
-    if ( (aGrTwipSz.Width() > USHRT_MAX) || (aGrTwipSz.Height() > USHRT_MAX)
+    if ( (aGrTwipSz.Width() > SHRT_MAX) || (aGrTwipSz.Height() > SHRT_MAX)
         || (aGrTwipSz.Width() < 0 ) || (aGrTwipSz.Height() < 0) )
     {
         aGrTwipSz.Width() = nWidth;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2071
retrieving revision 1.2072
diff -u -p -r1.2071 -r1.2072
--- openoffice.org.spec	13 Nov 2009 10:57:46 -0000	1.2071
+++ openoffice.org.spec	14 Nov 2009 11:48:27 -0000	1.2072
@@ -127,7 +127,7 @@ Patch49: workspace.vcl107.patch
 Patch50: openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch
 Patch51: openoffice.org-3.2.0.ooo106523.icc.fixendianandtypes.patch
 Patch52: openoffice.org-3.1.1.ooo105710.svx.loadstorenumbering.patch
-Patch53: openoffice.org-3.2.0.ooo59648.sw.scaling.patch
+Patch53: workspace.hb33patches1.patch
 Patch54: openoffice.org-3.2.0.ooo101158.fixxmlhelpparallel.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
@@ -1649,7 +1649,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch50 -p1 -b .ooo106497.lingucomponent.langnotfound.patch
 %patch51 -p1 -b .ooo106523.icc.fixendianandtypes.patch
 %patch52 -p1 -b .ooo105710.svx.loadstorenumbering.patch
-%patch53 -p1 -b .ooo59648.sw.scaling.patch
+%patch53 -p0 -b .workspace.hb33patches1.patch
 %patch54 -p0 -b .ooo101158.fixxmlhelpparallel.patch
 
 %build


--- openoffice.org-3.2.0.ooo59648.sw.scaling.patch DELETED ---