[Libwpd-cvs] writerperfect/filter OdgExporter.cxx, 1.25, 1.26 OdgExporter.hxx, 1.12, 1.13

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

Update of /cvsroot/libwpd/writerperfect/filter
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28528/filter

Modified Files:
	OdgExporter.cxx OdgExporter.hxx 
Log Message:
adapting to the new setStyle callback

Index: OdgExporter.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- OdgExporter.cxx	28 Nov 2008 11:53:38 -0000	1.25
+++ OdgExporter.cxx	28 Nov 2008 12:26:16 -0000	1.26
@@ -242,13 +242,9 @@
 	mpHandler->endDocument();
 }
 
-void OdgExporter::setPen(const libwpg::WPGPen& pen)
+void OdgExporter::setStyle(const libwpg::WPGPen& pen, const libwpg::WPGBrush& brush, const ::WPXPropertyList & /*propList*/)
 {
 	mxPen = pen;
-}
-
-void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
-{
 	mxBrush = brush;
 }
 

Index: OdgExporter.hxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- OdgExporter.hxx	28 Nov 2008 11:53:38 -0000	1.12
+++ OdgExporter.hxx	28 Nov 2008 12:26:16 -0000	1.13
@@ -47,9 +47,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);