[Libwpg-cvs] libwpg/src/conv/raw wpg2raw.cpp,1.17,1.18

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

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

Modified Files:
	wpg2raw.cpp 
Log Message:
joining all the style related callback into one since we are calling them together

Index: wpg2raw.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- wpg2raw.cpp	28 Nov 2008 11:53:03 -0000	1.17
+++ wpg2raw.cpp	28 Nov 2008 12:25:45 -0000	1.18
@@ -43,9 +43,7 @@
 	void startEmbeddedGraphics(const ::WPXPropertyList& /*propList*/) {}
 	void endEmbeddedGraphics() {}
 
-	void setPen(const libwpg::WPGPen& pen);
-	void setBrush(const libwpg::WPGBrush& brush);
-	void setFillRule(const ::WPXPropertyList &propList);
+	void setStyle(const libwpg::WPGPen& pen, const libwpg::WPGBrush& brush, const ::WPXPropertyList &propList);
 
 	void drawRectangle(const ::WPXPropertyList &propList);
 	void drawEllipse(const ::WPXPropertyList& propList);
@@ -126,14 +124,9 @@
 	printf("RawPainter::endLayer\n");
 }
 
-void RawPainter::setPen(const libwpg::WPGPen& /*pen*/)
-{
-	printf("RawPainter::setPen\n");
-}
-
-void RawPainter::setBrush(const libwpg::WPGBrush& brush)
+void RawPainter::setStyle(const libwpg::WPGPen& pen, const libwpg::WPGBrush& brush, const ::WPXPropertyList &propList)
 {
-	printf("RawPainter::setBrush\n");
+	printf("RawPainter::setStyle(%s)\n", getPropString(propList).cstr());
 
 	printf("  Brush style: ");
 	switch(brush.style)
@@ -158,11 +151,6 @@
 			brush.gradient.stopColor(c).green, brush.gradient.stopColor(c).blue);
 }
 
-void RawPainter::setFillRule(const ::WPXPropertyList &propList)
-{
-	printf("RawPainter::setFillRule (%s)\n", getPropString(propList).cstr());
-}
-
 void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
 {
 	printf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());