[ooo-build-commit] .: patches/dev300

[Caolán McNamara]

 patches/dev300/apply                    |    3 ---
 patches/dev300/canvas-cairopattern.diff |   12 ------------
 2 files changed, 15 deletions(-)

New commits:
commit 839d6e3a04fd05aed69de57226b8f0f83c91e408
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 08:58:04 2010 +0100

    #i113910# fix frame effect around images in cairo on some drivers

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4d2ed40..ec6ecf4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -291,9 +291,6 @@ redirect-extensions.diff
 # correctly set table row height during ppt import
 svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
 
-# set border treatment for cairocanvas correctly
-canvas-cairopattern.diff, n#629546, thorsten
-
 [ Cairo10 ]
 # CAIRO_EXTEND_PAD is not available in cairo-1.0.2
 canvas-build-cairo-1.0.diff, i#123456, pmladek
diff --git a/patches/dev300/canvas-cairopattern.diff b/patches/dev300/canvas-cairopattern.diff
deleted file mode 100644
index f52ab53..0000000
--- a/patches/dev300/canvas-cairopattern.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
-index 22280fe..e4e504b 100644
---- canvas/source/cairo/cairo_canvashelper.cxx
-+++ canvas/source/cairo/cairo_canvashelper.cxx
-@@ -1268,6 +1268,7 @@ namespace cairocanvas
-                 ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
-                 ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
-                  cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
-+            cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
-             cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height );
-             cairo_clip( mpCairo.get() );
-