ooo-build r11696 - in trunk: . patches/src680 patches/svgimport

[strba svn gnome org]

Author: strba
Date: Sun Feb 24 11:19:43 2008
New Revision: 11696
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11696&view=rev

Log:
fix a missing hunk

Modified:
   trunk/ChangeLog
   trunk/patches/src680/svg-import-basegfx.diff
   trunk/patches/svgimport/svg-import-basegfx.diff

Modified: trunk/patches/src680/svg-import-basegfx.diff
==============================================================================
--- trunk/patches/src680/svg-import-basegfx.diff	(original)
+++ trunk/patches/src680/svg-import-basegfx.diff	Sun Feb 24 11:19:43 2008
@@ -1,3 +1,48 @@
+--- basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
++++ basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+@@ -127,19 +127,37 @@ namespace basegfx
+         /** Read poly-polygon from SVG.
+ 
+         	This function imports a poly-polygon from an SVG-D
+-        	statement. Currently, elliptical arc elements are not yet
++        	attribute. Currently, elliptical arc elements are not yet
+         	supported (and ignored during parsing).
+ 
+             @param o_rPolyPoly
+             The output poly-polygon
+ 
+-            @param rSvgDStatement
+-            A valid SVG-D statement
++            @param rSvgDAttribute
++            A valid SVG-D attribute string
+ 
+             @return true, if the string was successfully parsed
+          */
+-        bool importFromSvgD( B2DPolyPolygon& o_rPolyPoly,
+-                             const ::rtl::OUString& 	rSvgDStatement );
++        bool importFromSvgD( B2DPolyPolygon&        o_rPolyPoly,
++                             const ::rtl::OUString& rSvgDAttribute );
++
++        /** Read poly-polygon from SVG.
++
++        	This function imports a poly-polygon from an SVG points
++        	attribute (a plain list of coordinate pairs).
++
++            @param o_rPoly
++            The output polygon. Note that svg:points can only define a
++            single polygon
++
++            @param rSvgPointsAttribute
++            A valid SVG points attribute string
++
++            @return true, if the string was successfully parsed
++         */
++        bool importFromSvgPoints( B2DPolygon&            o_rPoly,
++                                  const ::rtl::OUString& rSvgPointsAttribute );
++
+ 
+ 		// create 3d PolyPolygon from given 2d PolyPolygon. The given fZCoordinate is used to expand the
+ 		// third coordinate.
 --- basegfx/source/polygon/b2dsvgpolypolygon.cxx	2008-02-24 11:25:04.000000000 +0100
 +++ basegfx/source/polygon/b2dsvgpolypolygon.cxx	2008-02-24 11:24:13.000000000 +0100
 @@ -665,6 +665,32 @@

Modified: trunk/patches/svgimport/svg-import-basegfx.diff
==============================================================================
--- trunk/patches/svgimport/svg-import-basegfx.diff	(original)
+++ trunk/patches/svgimport/svg-import-basegfx.diff	Sun Feb 24 11:19:43 2008
@@ -1,3 +1,48 @@
+--- basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
++++ basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+@@ -127,19 +127,37 @@ namespace basegfx
+         /** Read poly-polygon from SVG.
+ 
+         	This function imports a poly-polygon from an SVG-D
+-        	statement. Currently, elliptical arc elements are not yet
++        	attribute. Currently, elliptical arc elements are not yet
+         	supported (and ignored during parsing).
+ 
+             @param o_rPolyPoly
+             The output poly-polygon
+ 
+-            @param rSvgDStatement
+-            A valid SVG-D statement
++            @param rSvgDAttribute
++            A valid SVG-D attribute string
+ 
+             @return true, if the string was successfully parsed
+          */
+-        bool importFromSvgD( B2DPolyPolygon& o_rPolyPoly,
+-                             const ::rtl::OUString& 	rSvgDStatement );
++        bool importFromSvgD( B2DPolyPolygon&        o_rPolyPoly,
++                             const ::rtl::OUString& rSvgDAttribute );
++
++        /** Read poly-polygon from SVG.
++
++        	This function imports a poly-polygon from an SVG points
++        	attribute (a plain list of coordinate pairs).
++
++            @param o_rPoly
++            The output polygon. Note that svg:points can only define a
++            single polygon
++
++            @param rSvgPointsAttribute
++            A valid SVG points attribute string
++
++            @return true, if the string was successfully parsed
++         */
++        bool importFromSvgPoints( B2DPolygon&            o_rPoly,
++                                  const ::rtl::OUString& rSvgPointsAttribute );
++
+ 
+ 		// create 3d PolyPolygon from given 2d PolyPolygon. The given fZCoordinate is used to expand the
+ 		// third coordinate.
 --- basegfx/source/polygon/b2dsvgpolypolygon.cxx	2008-02-24 11:25:04.000000000 +0100
 +++ basegfx/source/polygon/b2dsvgpolypolygon.cxx	2008-02-24 11:24:13.000000000 +0100
 @@ -665,6 +665,32 @@