[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                       |    3 ---
 patches/dev300/canvas-nosubpixel-clip.diff |   24 ------------------------
 2 files changed, 27 deletions(-)

New commits:
commit c69fbab1839b86268f3828bd65a05ed3569a1c66
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:40:14 2009 +0300

    canvas-nosubpixel-clip.diff is upstream
    
    * patches/dev300/canvas-nosubpixel-clip.diff: Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a79b7ed..129617e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2919,9 +2919,6 @@ sd-animation-ui-fix.diff, thorsten
 # mute sound on all but the first slideshow view
 slideshow-mute-sound.diff, thorsten
 
-# avoid subpixel clipping in cairocanvas
-canvas-nosubpixel-clip.diff, thorsten
-
 # several compile fixes for --enable-debug.
 buildfix-enable-debug.diff
 
diff --git a/patches/dev300/canvas-nosubpixel-clip.diff b/patches/dev300/canvas-nosubpixel-clip.diff
deleted file mode 100644
index 1074b2e..0000000
--- a/patches/dev300/canvas-nosubpixel-clip.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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 );
- 		    }