ooo-build r11448 - in trunk: . patches/emf+ patches/src680

[tml svn gnome org]

Author: tml
Date: Tue Jan 29 22:41:42 2008
New Revision: 11448
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11448&view=rev

Log:
2008-01-30  Tor Lillqvist  <tml novell com>

	* patches/emf+/emf+-dxcanvas.diff: New diff to
	canvas/source/directx/dx_canvashelper_texturefill.cxx. Simply use
	the first and last colour from maColors instead of the now
	nonexistent maColor1 and maColor2. The proper fix would be to
	actually use all colours and stops of the gradient.

	* patches/src680/apply: Add it to EMFplus.



Added:
   trunk/patches/emf+/emf+-dxcanvas.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Added: trunk/patches/emf+/emf+-dxcanvas.diff
==============================================================================
--- (empty file)
+++ trunk/patches/emf+/emf+-dxcanvas.diff	Tue Jan 29 22:41:42 2008
@@ -0,0 +1,13 @@
+--- canvas/source/directx/dx_canvashelper_texturefill.cxx
++++ canvas/source/directx/dx_canvashelper_texturefill.cxx
+@@ -711,8 +711,8 @@
+                     const ::canvas::ParametricPolyPolygon::Values& rValues(
+                         pGradient->getValues() );
+ 
+-                    const Gdiplus::Color aColor1(tools::sequenceToArgb(rValues.maColor1));
+-                    const Gdiplus::Color aColor2(tools::sequenceToArgb(rValues.maColor2));
++                    const Gdiplus::Color aColor1(tools::sequenceToArgb(rValues.maColors[0]));
++                    const Gdiplus::Color aColor2(tools::sequenceToArgb(rValues.maColors[rValues.maColors.getLength()-1]));
+ 
+                     // TODO(E1): Return value
+                     // TODO(F1): FillRule

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Jan 29 22:41:42 2008
@@ -2033,6 +2033,7 @@
 emf+-vcl-renderer.diff
 emf+-svtools.diff
 emf+-scp2-renderer.diff
+emf+-dxcanvas.diff
 
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips