rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch, NONE, 1.1 openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch, 1.1, 1.2 openoffice.org.spec, 1.1924, 1.1925

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch 
Log Message:
Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc

openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch:
 cairo_canvashelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch ---
Avoid subpixel clipping for cairocanvas. nobody is expecting this.

From: Thorsten Behrens <thb at openoffice.org>


---

 canvas/source/cairo/cairo_canvashelper.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git canvas/source/cairo/cairo_canvashelper.cxx canvas/source/cairo/cairo_canvashelper.cxx
index 3b3571a..9684b8d 100644
--- canvas/source/cairo/cairo_canvashelper.cxx
+++ canvas/source/cairo/cairo_canvashelper.cxx
@@ -888,7 +888,7 @@ namespace cairocanvas
 		    nY = aP.getY();
 		    cairo_matrix_transform_point( &aOrigMatrix, &nX, &nY );
 
- 		    if( ! bIsBezier && bIsRectangle ) {
+ 		    if( ! bIsBezier && (bIsRectangle || aOperation == Clip) ) {
                 nX = basegfx::fround( nX );
                 nY = basegfx::fround( nY );
 		    }

openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch:
 inc/svx/xcolit.hxx       |    2 -
 inc/svx/xflclit.hxx      |    2 -
 inc/svx/xflftrit.hxx     |    2 -
 inc/svx/xflgrit.hxx      |    2 -
 inc/svx/xflhtit.hxx      |    2 -
 inc/svx/xftshcit.hxx     |    2 -
 inc/svx/xit.hxx          |    8 +++----
 inc/svx/xlnclit.hxx      |    2 -
 inc/svx/xlndsit.hxx      |    2 -
 inc/svx/xlnedit.hxx      |    2 -
 inc/svx/xlnstit.hxx      |    2 -
 inc/svx/xsflclit.hxx     |    2 -
 source/xoutdev/xattr.cxx |   50 ++++++++++++++++++++++++-----------------------
 13 files changed, 41 insertions(+), 39 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch	9 Jul 2009 19:32:44 -0000	1.1
+++ openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch	20 Jul 2009 08:47:35 -0000	1.2
@@ -201,21 +201,12 @@ diff -ru svx.orig/source/xoutdev/xattr.c
  {
  }
  
-@@ -152,6 +154,7 @@
- 	SfxStringItem(_nWhich, rIn)
- {
- 	rIn >> nPalIndex;
-+	fprintf(stderr, "stream one way\n");
- }
- 
- /*************************************************************************
-@@ -230,7 +233,8 @@
+@@ -230,7 +233,7 @@
  SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
  {
  	SfxStringItem::Store( rOut, nItemVersion );
 -	rOut << (INT32)nPalIndex;
 +	rOut << nPalIndex;
-+	fprintf(stderr, "stream the other way\n");
  	return rOut;
  }
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1924
retrieving revision 1.1925
diff -u -p -r1.1924 -r1.1925
--- openoffice.org.spec	9 Jul 2009 19:32:44 -0000	1.1924
+++ openoffice.org.spec	20 Jul 2009 08:47:35 -0000	1.1925
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 11
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -149,6 +149,7 @@ Patch73: openoffice.org-3.1.1.ooo102932.
 Patch74: openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
 Patch75: workspace.calc311fixes.patch
 Patch76: openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
+Patch77: openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1656,6 +1657,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch74 -p0 -b .ooo103277.vcl.kwinworkaround.patch
 %patch75 -p0 -b .workspace.calc311fixes.patch
 %patch76 -p0 -b .oooXXXXX.svx.64bit.patch
+%patch77 -p0 -b .ooo103651.canvas.nosubpixel.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4158,6 +4160,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Jul 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
+- Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc
+
 * Thu Jul 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.5
 - Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
 - Resolves: rhbz#510394 Crash while saving xls file possibly due to