[Libwpg-cvs] libwpg/src/conv/raw wpg2raw.cpp,1.13,1.14

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpg/libwpg/src/conv/raw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3768/src/conv/raw

Modified Files:
	wpg2raw.cpp 
Log Message:
removing another libwpg type: WPGPoint

Index: wpg2raw.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- wpg2raw.cpp	25 Nov 2008 11:58:28 -0000	1.13
+++ wpg2raw.cpp	27 Nov 2008 14:15:17 -0000	1.14
@@ -38,8 +38,8 @@
 
 	void startGraphics(const ::WPXPropertyList &propList);
 	void endGraphics();
-	void startLayer(unsigned int id);
-	void endLayer(unsigned int id);
+	void startLayer(const ::WPXPropertyList& propList);
+	void endLayer();
 	void startEmbeddedGraphics(const ::WPXPropertyList& /*propList*/) {}
 	void endEmbeddedGraphics() {}
 
@@ -48,7 +48,7 @@
 	void setFillRule(FillRule rule);
 
 	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
-	void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry, double rotation, const libwpg::WPGPoint& from, const libwpg::WPGPoint& to);
+	void drawEllipse(const ::WPXPropertyList& propList);
 	void drawPolyline(const ::WPXPropertyListVector& vertices);
 	void drawPolygon(const ::WPXPropertyListVector& vertices);
 	void drawPath(const ::WPXPropertyListVector& path);
@@ -117,14 +117,14 @@
 	printf("RawPainter::endGraphics\n");
 }
 
-void RawPainter::startLayer(unsigned int id)
+void RawPainter::startLayer(const ::WPXPropertyList& propList)
 {
-	printf("RawPainter::startLayer %d\n", id);
+	printf("RawPainter::startLayer (%s)\n", getPropString(propList).cstr());
 }
 
-void RawPainter::endLayer(unsigned int id)
+void RawPainter::endLayer()
 {
-	printf("RawPainter::endLayer %d\n", id);
+	printf("RawPainter::endLayer\n");
 }
 
 void RawPainter::setPen(const libwpg::WPGPen& /*pen*/)
@@ -171,10 +171,9 @@
 	printf("  Roundndess: %g %g\n", rx, ry);
 }
 
-void RawPainter::drawEllipse(const libwpg::WPGPoint& /* center */, double rx, double ry, double /* rotation */, const libwpg::WPGPoint& /* from */, const libwpg::WPGPoint& /* to */)
+void RawPainter::drawEllipse(const ::WPXPropertyList& propList)
 {
-	printf("RawPainter::drawEllipse ");
-	printf("  Radius: %g %g\n", rx, ry);
+	printf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
 }
 
 void RawPainter::drawPolyline(const ::WPXPropertyListVector& vertices)