[Libwpd-cvs] writerperfect/filter OdgExporter.cxx, 1.33, 1.34 OdgExporter.hxx, 1.15, 1.16

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

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

Modified Files:
	OdgExporter.cxx OdgExporter.hxx 
Log Message:
adapting to the head of libwpg

Index: OdgExporter.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- OdgExporter.cxx	10 Dec 2008 12:59:04 -0000	1.33
+++ OdgExporter.cxx	7 Sep 2009 08:10:44 -0000	1.34
@@ -242,7 +242,7 @@
 	mpHandler->endDocument();
 }
 
-void OdgExporter::setStyle(const libwpg::WPGDashArray& dashArray, const libwpg::WPGGradient& gradient, const ::WPXPropertyList & propList)
+void OdgExporter::setStyle(const libwpg::WPGDashArray& dashArray, const ::WPXPropertyListVector& gradient, const ::WPXPropertyList & propList)
 {
 	mxStyle = propList;
 	mxDashArray = dashArray;
@@ -541,8 +541,8 @@
 		sValue.sprintf("%i", (unsigned)(angle*10));
 		pDrawGradientElement->addAttribute("draw:angle", sValue);
 
-		pDrawGradientElement->addAttribute("draw:start-color", mxGradient.stopColor(0).cstr());
-		pDrawGradientElement->addAttribute("draw:end-color", mxGradient.stopColor(1).cstr());
+		pDrawGradientElement->addAttribute("draw:start-color", mxGradient[0]["svg:stop-color"]->getStr().cstr());
+		pDrawGradientElement->addAttribute("draw:end-color", mxGradient[1]["svg:stop-color"]->getStr().cstr());
 		pDrawGradientElement->addAttribute("draw:start-intensity", "100%");
 		pDrawGradientElement->addAttribute("draw:end-intensity", "100%");
 		pDrawGradientElement->addAttribute("draw:border", "0%");

Index: OdgExporter.hxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- OdgExporter.hxx	5 Dec 2008 15:17:45 -0000	1.15
+++ OdgExporter.hxx	7 Sep 2009 08:10:44 -0000	1.16
@@ -46,7 +46,7 @@
 	void startEmbeddedGraphics(const ::WPXPropertyList& /*propList*/) {}
 	void endEmbeddedGraphics() {}
 
-	void setStyle(const libwpg::WPGDashArray& dashArray, const libwpg::WPGGradient& gradient, const ::WPXPropertyList &propList);
+	void setStyle(const libwpg::WPGDashArray& dashArray, const ::WPXPropertyListVector& gradient, const ::WPXPropertyList &propList);
 
 	void drawRectangle(const ::WPXPropertyList &propList);
 	void drawEllipse(const ::WPXPropertyList &propList);
@@ -72,7 +72,7 @@
 
 	::WPXPropertyList mxStyle;
 	libwpg::WPGDashArray mxDashArray;
-	libwpg::WPGGradient mxGradient;
+	::WPXPropertyListVector mxGradient;
 	int miGradientIndex;
 	int miDashIndex;
 	int miGraphicsStyleIndex;