ooo-build r12669 - in branches/ooo-build-2-4-1: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon May 26 15:12:18 2008
New Revision: 12669
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12669&view=rev

Log:
	* patches/src680/svg-import-filter.diff: updated to last revision
	(order of color stops corrected, preventing type clobbering when
	inheriting gradient info)



Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/svg-import-filter.diff

Modified: branches/ooo-build-2-4-1/patches/src680/svg-import-filter.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/svg-import-filter.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/svg-import-filter.diff	Mon May 26 15:12:18 2008
@@ -1849,7 +1849,7 @@
      
 --- filter/source/svg/svgreader.cxx	1970-01-01 01:00:00.000000000 +0100
 +++ filter/source/svg/svgreader.cxx	2008-04-11 09:33:30.000000000 +0200
-@@ -0,0 +1,1888 @@
+@@ -0,0 +1,1890 @@
 +/*************************************************************************
 + *
 + *    OpenOffice.org - a multi-platform office productivity suite
@@ -2026,6 +2026,7 @@
 +                // do that after dereferencing, to prevent hyperlinked
 +                // gradient to clobber our Id again
 +                maGradientVector.back().mnId = maGradientVector.size()-1;
++                maGradientVector.back().meType = Gradient::LINEAR; // has been clobbered as well
 +
 +				for( sal_Int32 i=0; i<nNumAttrs; ++i )
 +				{
@@ -2063,6 +2064,7 @@
 +                // do that after dereferencing, to prevent hyperlinked
 +                // gradient to clobber our Id again
 +                maGradientVector.back().mnId = maGradientVector.size()-1;
++                maGradientVector.back().meType = Gradient::RADIAL; // has been clobbered as well
 +
 +				for( sal_Int32 i=0; i<nNumAttrs; ++i )
 +				{
@@ -2338,12 +2340,12 @@
 +                }
 +
 +                // modulate gradient opacity with overall fill opacity
-+                xAttrs->AddAttribute( USTR( "draw:start" ), 
++                xAttrs->AddAttribute( USTR( "draw:end" ), 
 +                                      rtl::OUString::valueOf(
 +                                          maGradientStopVector[
 +                                              rState.maFillGradient.maStops[0]].maStopColor.a*
 +                                          maCurrState.mnFillOpacity*100.0)+USTR("%" ) );
-+                xAttrs->AddAttribute( USTR( "draw:end" ), 
++                xAttrs->AddAttribute( USTR( "draw:start" ), 
 +                                      rtl::OUString::valueOf(
 +                                          maGradientStopVector[
 +                                              rState.maFillGradient.maStops[1]].maStopColor.a*