ooo-build r12474 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue May  6 11:04:59 2008
New Revision: 12474
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12474&view=rev

Log:
	* patches/dev300/svg-import-basegfx.diff: improved unit test for
	the now-upstream fix - just to be on the safe side



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

Modified: trunk/patches/dev300/svg-import-basegfx.diff
==============================================================================
--- trunk/patches/dev300/svg-import-basegfx.diff	(original)
+++ trunk/patches/dev300/svg-import-basegfx.diff	Tue May  6 11:04:59 2008
@@ -1,5 +1,5 @@
 --- basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx	24 Apr 2008 15:04:45 -0000	1.18
-+++ basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx	6 May 2008 09:59:47 -0000
++++ basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx	6 May 2008 11:01:43 -0000
 @@ -111,19 +111,37 @@ namespace basegfx
          /** Read poly-polygon from SVG.
  
@@ -44,7 +44,7 @@
  		// create 3d PolyPolygon from given 2d PolyPolygon. The given fZCoordinate is used to expand the
  		// third coordinate.
 --- basegfx/source/polygon/b2dsvgpolypolygon.cxx	24 Apr 2008 15:07:05 -0000	1.9
-+++ basegfx/source/polygon/b2dsvgpolypolygon.cxx	6 May 2008 09:59:47 -0000
++++ basegfx/source/polygon/b2dsvgpolypolygon.cxx	6 May 2008 11:01:43 -0000
 @@ -33,7 +33,9 @@
  
  #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -316,3 +316,24 @@
          ::rtl::OUString exportToSvgD(
  			const B2DPolyPolygon& rPolyPolygon,
  			bool bUseRelativeCoordinates, 
+--- basegfx/test/basegfx2d.cxx	24 Apr 2008 15:08:36 -0000	1.12
++++ basegfx/test/basegfx2d.cxx	6 May 2008 11:01:43 -0000
+@@ -484,7 +484,19 @@ public:
+         
+         CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", 
+                                nCount==18);
++
++        fprintf(stderr,"string is: %s\n",
++                rtl::OUStringToOString(aExport,
++                                       RTL_TEXTENCODING_UTF8 ).getStr() );
++
++        const B2DPolygon aRect( 
++            tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));
++        aExport = tools::exportToSvgD( B2DPolyPolygon(aRect), false, false);
++
++		const char* sExportStringRect = "M0 0H4000V4000H0Z";
++		CPPUNIT_ASSERT_MESSAGE("exporting to rectangle svg-d string", 
++                               !aExport.compareToAscii(sExportStringRect));
+     }
+ 
+     // Change the following lines only, if you add, remove or rename