ooo-build r12759 - in branches/sled-10-sp1-ooo-build-2-4: . patches/emf+ patches/src680

[rodo svn gnome org]

Author: rodo
Date: Tue Jun  3 11:13:27 2008
New Revision: 12759
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12759&view=rev

Log:
2008-06-03  Radek Doulik  <rodo novell com>

	* patches/src680/apply: split original
	emf+-embedded-mf-image-and-roundcorners-fix.diff into
	emf+-embedded-mf-image.diff and cppcanvas-fix-roundcorners.diff so
	that round cornes can be applied without emf+ patches enabled as
	well



Added:
   branches/sled-10-sp1-ooo-build-2-4/patches/emf+/emf+-embedded-mf-image.diff
      - copied, changed from r12758, /branches/sled-10-sp1-ooo-build-2-4/patches/emf+/emf+-embedded-mf-image-and-roundcorners-fix.diff
   branches/sled-10-sp1-ooo-build-2-4/patches/src680/cppcanvas-fix-roundcorners.diff
Removed:
   branches/sled-10-sp1-ooo-build-2-4/patches/emf+/emf+-embedded-mf-image-and-roundcorners-fix.diff
Modified:
   branches/sled-10-sp1-ooo-build-2-4/ChangeLog
   branches/sled-10-sp1-ooo-build-2-4/patches/src680/apply

Copied: branches/sled-10-sp1-ooo-build-2-4/patches/emf+/emf+-embedded-mf-image.diff (from r12758, /branches/sled-10-sp1-ooo-build-2-4/patches/emf+/emf+-embedded-mf-image-and-roundcorners-fix.diff)
==============================================================================
--- /branches/sled-10-sp1-ooo-build-2-4/patches/emf+/emf+-embedded-mf-image-and-roundcorners-fix.diff	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/emf+/emf+-embedded-mf-image.diff	Tue Jun  3 11:13:27 2008
@@ -60,14 +60,3 @@
                                  }
                              }
                              EMFP_DEBUG (printf ("EMF+ passed to canvas mtf renderer, size: %d\n", pAct->GetDataSize ()));
-@@ -2039,8 +2040,8 @@ namespace cppcanvas
-                                     ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
-                                     ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
-                                     ::basegfx::B2DPoint(1,1) ),
--                                static_cast<MetaRoundRectAction*>(pCurrAct)->GetHorzRound(),
--                                static_cast<MetaRoundRectAction*>(pCurrAct)->GetVertRound() ));
-+                                ( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetHorzRound() ) / rRect.GetWidth(),
-+                                ( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetVertRound() ) / rRect.GetHeight() ) );
-                         aPoly.transform( getState( rStates ).mapModeTransform );
- 
-                         createFillAndStroke( aPoly,

Modified: branches/sled-10-sp1-ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/sled-10-sp1-ooo-build-2-4/patches/src680/apply	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/apply	Tue Jun  3 11:13:27 2008
@@ -2070,7 +2070,7 @@
 vcl-grey-alpha-unix-sal-bitmap.diff, rodo
 cairocanvas-alpha-pixmap-rewrite.diff, rodo
 emf+-multipart-objects.diff, rodo
-emf+-embedded-mf-image-and-roundcorners-fix.diff, rodo
+emf+-embedded-mf-image.diff, rodo
 
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips
@@ -2170,3 +2170,6 @@
 SectionOwner => tml
 
 i87401-packagelist.diff
+
+[ Fixes ]
+cppcanvas-fix-roundcorners.diff, rodo

Added: branches/sled-10-sp1-ooo-build-2-4/patches/src680/cppcanvas-fix-roundcorners.diff
==============================================================================
--- (empty file)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/cppcanvas-fix-roundcorners.diff	Tue Jun  3 11:13:27 2008
@@ -0,0 +1,14 @@
+diff -rup cppcanvas-orig-mp/source/mtfrenderer/implrenderer.cxx cppcanvas/source/mtfrenderer/implrenderer.cxx
+--- cppcanvas-orig-mp/source/mtfrenderer/implrenderer.cxx	2008-06-03 12:26:31.000000000 +0200
++++ cppcanvas/source/mtfrenderer/implrenderer.cxx	2008-06-03 12:26:44.000000000 +0200
+@@ -2039,8 +2040,8 @@ namespace cppcanvas
+                                     ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
+                                     ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
+                                     ::basegfx::B2DPoint(1,1) ),
+-                                static_cast<MetaRoundRectAction*>(pCurrAct)->GetHorzRound(),
+-                                static_cast<MetaRoundRectAction*>(pCurrAct)->GetVertRound() ));
++                                ( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetHorzRound() ) / rRect.GetWidth(),
++                                ( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetVertRound() ) / rRect.GetHeight() ) );
+                         aPoly.transform( getState( rStates ).mapModeTransform );
+ 
+                         createFillAndStroke( aPoly,