[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Thorsten Behrens]

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

New commits:
commit dc4fb864901c8023551a725a728a329aa36d38b2
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Aug 12 14:36:40 2010 +0200

    Set cairocanvas border treatment correctly
    
    * patches/dev300/apply: added below patch
    * patches/dev300/canvas-cairopattern.diff: avoid ugly grey seams
      around bitmaps in cairocanvas, by properly setting pattern border
      treatment. Fixes n#629546, rh#557317

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fd50026..8d8f5e0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -430,6 +430,9 @@ slideshow-effect-rewind.diff, i#48179, thorsten
 # 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
+
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
diff --git a/patches/dev300/canvas-cairopattern.diff b/patches/dev300/canvas-cairopattern.diff
new file mode 100644
index 0000000..4a9a23b
--- /dev/null
+++ b/patches/dev300/canvas-cairopattern.diff
@@ -0,0 +1,12 @@
+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() );
+             cairo_paint( mpCairo.get() );