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

[thorstenb svn gnome org]

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

Log:
	* patches/dev300/svg-import-basegfx.diff: ...and fixed
	non-applying patch



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:37:41 2008
@@ -43,6 +43,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 11:01:43 -0000
 @@ -33,7 +33,9 @@
@@ -283,7 +284,7 @@
                          }
                          break;
                      }
-@@ -667,7 +845,33 @@ namespace basegfx
+@@ -667,6 +845,32 @@ namespace basegfx
              return true;
          }
  
@@ -316,17 +317,14 @@
          ::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:
+@@ -484,6 +484,14 @@ 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);