[ooo-build-commit] .: 2 commits - patches/dev300 patches/emf+
Radek DoulÃk
rodo at kemper.freedesktop.org
Thu May 13 02:38:54 PDT 2010
patches/dev300/apply | 3 +
patches/emf+/emf+-canvas-line-width.diff | 15 -------
patches/emf+/emf+-canvas-smooth-poly.diff | 37 ------------------
patches/emf+/emf+-canvas-vcl-clear.diff | 12 ++---
patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff | 33 ----------------
5 files changed, 9 insertions(+), 91 deletions(-)
New commits:
commit 610d9d05daf211d42e6f2f4b725933c985229663
Author: Radek Doulik <rodo at novell.com>
Date: Thu May 13 11:38:29 2010 +0200
updated and reenabled orphaned patch
* patches/dev300/apply:
* patches/emf+/emf+-canvas-vcl-clear.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a031962..142b072 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4019,3 +4019,6 @@ patchability-reportbuilder.diff, fridrich
[ Fixes ]
svx-ppt-bullet-offset-fix.diff, n#593609, rodo
+
+[ EMFPlus ]
+emf+-canvas-vcl-clear.diff, rodo
diff --git a/patches/emf+/emf+-canvas-vcl-clear.diff b/patches/emf+/emf+-canvas-vcl-clear.diff
index e68832a..baf5896 100644
--- a/patches/emf+/emf+-canvas-vcl-clear.diff
+++ b/patches/emf+/emf+-canvas-vcl-clear.diff
@@ -1,8 +1,8 @@
-diff -rup canvas-orig/source/vcl/canvashelper.cxx canvas/source/vcl/canvashelper.cxx
---- canvas-orig/source/vcl/canvashelper.cxx 2007-11-12 10:22:38.000000000 +0100
-+++ canvas/source/vcl/canvashelper.cxx 2007-11-12 10:36:46.000000000 +0100
-@@ -162,8 +162,8 @@ namespace vclcanvas
- OutputDevice& rOutDev( mpOutDev->getOutDev() );
+diff -rup canvas/source/vcl-orig/canvashelper.cxx canvas/source/vcl/canvashelper.cxx
+--- canvas/source/vcl-orig/canvashelper.cxx 2010-05-13 11:35:15.000000000 +0200
++++ canvas/source/vcl/canvashelper.cxx 2010-05-13 11:35:29.000000000 +0200
+@@ -156,8 +156,8 @@ namespace vclcanvas
+ tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
rOutDev.EnableMapMode( FALSE );
- rOutDev.SetLineColor( COL_WHITE );
@@ -12,7 +12,7 @@ diff -rup canvas-orig/source/vcl/canvashelper.cxx canvas/source/vcl/canvashelper
rOutDev.DrawRect( Rectangle( Point(),
rOutDev.GetOutputSizePixel()) );
-@@ -173,8 +173,8 @@ namespace vclcanvas
+@@ -167,8 +167,8 @@ namespace vclcanvas
rOutDev2.SetDrawMode( DRAWMODE_DEFAULT );
rOutDev2.EnableMapMode( FALSE );
commit ad49835945ad18385e273b6de38288ce5444a689
Author: Radek Doulik <rodo at novell.com>
Date: Thu May 13 11:38:17 2010 +0200
removed patches which went upstream
* patches/emf+/emf+-canvas-line-width.diff:
* patches/emf+/emf+-canvas-smooth-poly.diff:
* patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff:
diff --git a/patches/emf+/emf+-canvas-line-width.diff b/patches/emf+/emf+-canvas-line-width.diff
deleted file mode 100644
index 7c155d4..0000000
--- a/patches/emf+/emf+-canvas-line-width.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- /home/rodo/svn/ooo-build-reference/build/oog680-m5/canvas/source/cairo/cairo_canvashelper.cxx 2007-10-31 17:29:51.000000000 +0100
-+++ canvas/source/cairo/cairo_canvashelper.cxx 2007-11-01 13:32:40.000000000 +0100
-@@ -1080,7 +1080,11 @@
-
- useStates( viewState, renderState, true );
-
-- cairo_set_line_width( mpCairo, strokeAttributes.StrokeWidth );
-+ Matrix aMatrix;
-+ double w = strokeAttributes.StrokeWidth, h = 0;
-+ cairo_get_matrix( mpCairo, &aMatrix );
-+ cairo_matrix_transform_distance( &aMatrix, &w, &h );
-+ cairo_set_line_width( mpCairo, w );
- cairo_set_miter_limit( mpCairo, strokeAttributes.MiterLimit );
-
- // FIXME: cairo doesn't handle end cap so far (rodo)
diff --git a/patches/emf+/emf+-canvas-smooth-poly.diff b/patches/emf+/emf+-canvas-smooth-poly.diff
deleted file mode 100644
index cbaa9fd..0000000
--- a/patches/emf+/emf+-canvas-smooth-poly.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -rup canvas-orig-1/source/cairo/cairo_canvashelper.cxx canvas/source/cairo/cairo_canvashelper.cxx
---- canvas-orig-1/source/cairo/cairo_canvashelper.cxx 2007-11-15 11:23:44.000000000 +0100
-+++ canvas/source/cairo/cairo_canvashelper.cxx 2007-11-15 12:10:57.000000000 +0100
-@@ -55,6 +55,7 @@
- #include <basegfx/point/b2dpoint.hxx>
- #include <basegfx/polygon/b2dpolygon.hxx>
- #include <basegfx/polygon/b2dpolypolygon.hxx>
-+#include <basegfx/polygon/b2dpolygontools.hxx>
- #include <basegfx/tools/canvastools.hxx>
-
- #include <comphelper/sequence.hxx>
-@@ -928,6 +929,7 @@ namespace cairocanvas
-
- if( nPointCount > 1) {
- bool bIsBezier = aPolygon.areControlPointsUsed();
-+ bool bIsRectangle = ::basegfx::tools::isRectangle( aPolygon );
- ::basegfx::B2DPoint aA, aB, aP;
-
- aP = aPolygon.getB2DPoint( 0 );
-@@ -936,7 +938,7 @@ namespace cairocanvas
-
- cairo_matrix_transform_point( &aOrigMatrix, &nX, &nY );
-
-- if( ! bIsBezier ) {
-+ if( ! bIsBezier && bIsRectangle ) {
- nX = basegfx::fround( nX );
- nY = basegfx::fround( nY );
- }
-@@ -961,7 +963,7 @@ namespace cairocanvas
- nY = aP.getY();
- cairo_matrix_transform_point( &aOrigMatrix, &nX, &nY );
-
-- if( ! bIsBezier ) {
-+ if( ! bIsBezier && bIsRectangle ) {
- nX = basegfx::fround( nX );
- nY = basegfx::fround( nY );
- }
diff --git a/patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff b/patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff
deleted file mode 100644
index 9b8d473..0000000
--- a/patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rup ../oog680-m5.orig/canvas/source/vcl/canvashelper.cxx canvas/source/vcl/canvashelper.cxx
---- ../oog680-m5.orig/canvas/source/vcl/canvashelper.cxx 2007-11-13 12:44:32.000000000 +0100
-+++ canvas/source/vcl/canvashelper.cxx 2007-11-20 12:49:03.000000000 +0100
-@@ -415,9 +415,24 @@ namespace vclcanvas
-
- for( USHORT i=0; i<nSize; ++i )
- {
-- mpOutDev->getOutDev().DrawPolygon( aVCLPolyPoly[i] );
--
-- if( mp2ndOutDev )
-- mp2ndOutDev->getOutDev().DrawPolygon( aVCLPolyPoly[i] );
-+ if( aStrokedPolyPoly.getB2DPolygon( i ).isClosed() ) {
-+ mpOutDev->getOutDev().DrawPolygon( aVCLPolyPoly[i] );
-+ if( mp2ndOutDev )
-+ mp2ndOutDev->getOutDev().DrawPolygon( aVCLPolyPoly[i] );
-+ } else {
-+ const USHORT nPolySize = aVCLPolyPoly[i].GetSize();
-+ if( nPolySize ) {
-+ Point rPrevPoint = aVCLPolyPoly[i].GetPoint( 0 );
-+ Point rPoint;
-+
-+ for( USHORT j=1; j<nPolySize; j++ ) {
-+ rPoint = aVCLPolyPoly[i].GetPoint( j );
-+ mpOutDev->getOutDev().DrawLine( rPrevPoint, rPoint );
-+ if( mp2ndOutDev )
-+ mp2ndOutDev->getOutDev().DrawLine( rPrevPoint, rPoint );
-+ rPrevPoint = rPoint;
-+ }
-+ }
-+ }
- }
- }
-
More information about the ooo-build-commit
mailing list