ooo-build r12496 - in branches/ooo-build-2-4: . patches/emf+

[pmladek svn gnome org]

Author: pmladek
Date: Fri May  9 09:04:24 2008
New Revision: 12496
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12496&view=rev

Log:
2008-05-09  Petr Mladek  <pmladek suse cz>

	* patches/emf+/emf+-canvas-smooth-poly.diff:
	* patches/emf+/emf+-canvas.diff: update to apply after
	  cairo-canvas-win32.diff has been removed



Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/emf+/emf+-canvas-smooth-poly.diff
   branches/ooo-build-2-4/patches/emf+/emf+-canvas.diff

Modified: branches/ooo-build-2-4/patches/emf+/emf+-canvas-smooth-poly.diff
==============================================================================
--- branches/ooo-build-2-4/patches/emf+/emf+-canvas-smooth-poly.diff	(original)
+++ branches/ooo-build-2-4/patches/emf+/emf+-canvas-smooth-poly.diff	Fri May  9 09:04:24 2008
@@ -23,8 +23,8 @@
  
 -		if( ! bIsBezier ) {
 +		if( ! bIsBezier && bIsRectangle ) {
- 		    nX = ::rtl::math::round( nX );
- 		    nY = ::rtl::math::round( nY );
+ 		    nX = round( nX );
+ 		    nY = round( nY );
  		}
 @@ -961,7 +963,7 @@ namespace cairocanvas
  		    nY = aP.getY();
@@ -32,6 +32,6 @@
  
 -		    if( ! bIsBezier ) {
 +		    if( ! bIsBezier && bIsRectangle ) {
- 			nX = ::rtl::math::round( nX );
- 			nY = ::rtl::math::round( nY );
+ 			nX = round( nX );
+ 			nY = round( nY );
  		    }

Modified: branches/ooo-build-2-4/patches/emf+/emf+-canvas.diff
==============================================================================
--- branches/ooo-build-2-4/patches/emf+/emf+-canvas.diff	(original)
+++ branches/ooo-build-2-4/patches/emf+/emf+-canvas.diff	Fri May  9 09:04:24 2008
@@ -165,9 +165,9 @@
 +        {
 +            mbFreePixmap = false;
 +        }
- #endif
  
  		// use only for surfaces made on X Drawables
+ 		void Resize( int width, int height );
 diff -rup canvas-orig/source/cairo/cairo_canvasbitmap.hxx canvas/source/cairo/cairo_canvasbitmap.hxx
 --- canvas-orig/source/cairo/cairo_canvasbitmap.hxx	2007-08-21 13:19:18.000000000 +0200
 +++ canvas/source/cairo/cairo_canvasbitmap.hxx	2007-10-24 13:07:12.000000000 +0200
@@ -545,14 +545,14 @@
                      // TODO(F1): FillRule
 --- canvas-bak/source/cairo/cairo_canvashelper.hxx      2007-10-29 20:07:45.000000000 +0100
 +++ canvas/source/cairo/cairo_canvashelper.hxx  2007-10-30 10:12:33.000000000 +0100
-@@ -324,6 +324,7 @@
-                ::cairo::Cairo* mpCairo;
-                ::cairo::Surface* mpSurface;
-                SurfaceProvider* mpSurfaceProvider;
+@@ -324,6 +324,7 @@ namespace cairocanvas
+ 		::cairo::Cairo* mpCairo;
+ 		::cairo::Surface* mpSurface;
+ 		SurfaceProvider* mpSurfaceProvider;
 +    public:
          ::basegfx::B2ISize maSize;
      };
-
+ 
 --- canvas-orig/source/cairo/cairo_canvasbitmap.cxx	2007-08-21 13:19:18.000000000 +0200
 +++ canvas/source/cairo/cairo_canvasbitmap.cxx	2007-11-01 13:57:20.000000000 +0100
 @@ -96,6 +96,67 @@