[Libwpd-cvs] writerperfect/filter OdgExporter.cxx,1.29,1.30

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

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

Modified Files:
	OdgExporter.cxx 
Log Message:
adapting to the removal of WPGColor.h from libwpg's API

Index: OdgExporter.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- OdgExporter.cxx	3 Dec 2008 23:10:04 -0000	1.29
+++ OdgExporter.cxx	4 Dec 2008 23:19:26 -0000	1.30
@@ -522,7 +522,7 @@
 		mGraphicsStrokeDashStyles.push_back(new TagCloseElement("draw:stroke-dash"));
 	}
 
-	if(mxBrush.style == libwpg::WPGBrush::Gradient)
+	if(mxBrush.style == "gradient")
 	{
 		TagOpenElement *pDrawGradientElement = new TagOpenElement("draw:gradient");
 		pDrawGradientElement->addAttribute("draw:style", "linear");
@@ -564,7 +564,7 @@
 		sValue = doubleToString(mxPen.width); sValue.append("in");
 		pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-width", sValue);
 
-		pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-color", mxPen.foreColor.getColorString().cstr());
+		pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-color", mxPen.foreColor.cstr());
 
 		if(!mxPen.solid)
 		{
@@ -576,16 +576,16 @@
 	else
 		pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "none");
 
-	if(mxBrush.style == libwpg::WPGBrush::NoBrush)
+	if(mxBrush.style == "none")
 		pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "none");
 
-	if(mxBrush.style == libwpg::WPGBrush::Solid)
+	if(mxBrush.style == "solid")
 	{
 		pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "solid");
-		pStyleGraphicsPropertiesElement->addAttribute("draw:fill-color", mxBrush.foreColor.getColorString().cstr());
+		pStyleGraphicsPropertiesElement->addAttribute("draw:fill-color", mxBrush.foreColor.cstr());
 	}
 
-	if(mxBrush.style == libwpg::WPGBrush::Gradient)
+	if(mxBrush.style == "gradient")
 	{
 		pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "gradient");
 		sValue.sprintf("Gradient_%i", miGradientIndex-1);