[Libwpd-cvs] writerperfect/filter OdgExporter.cxx, 1.24, 1.25 OdgExporter.hxx, 1.11, 1.12

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

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

Modified Files:
	OdgExporter.cxx OdgExporter.hxx 
Log Message:
adapting to the fact that WPGBitmap is not in public api anymore

Index: OdgExporter.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- OdgExporter.cxx	27 Nov 2008 21:43:28 -0000	1.24
+++ OdgExporter.cxx	28 Nov 2008 11:53:38 -0000	1.25
@@ -458,29 +458,6 @@
 	mBodyElements.push_back(new TagCloseElement("draw:path"));
 }
 
-void OdgExporter::drawBitmap(const ::WPXPropertyList &propList, const libwpg::WPGBitmap& bitmap)
-{
-	TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame");
-	pDrawFrameElement->addAttribute("svg:x", propList["svg:x"]->getStr());
-	pDrawFrameElement->addAttribute("svg:y", propList["svg:y"]->getStr());
-	pDrawFrameElement->addAttribute("svg:width", propList["svg:width"]->getStr());
-	pDrawFrameElement->addAttribute("svg:height", propList["svg:height"]->getStr());
-	mBodyElements.push_back(pDrawFrameElement);
-	
-	mBodyElements.push_back(new TagOpenElement("draw:image"));
-	
-	mBodyElements.push_back(new TagOpenElement("office:binary-data"));
-	
-	::WPXString base64Binary = bitmap.getDIB().getBase64Data();
-	mBodyElements.push_back(new CharDataElement(base64Binary.cstr()));
-	
-	mBodyElements.push_back(new TagCloseElement("office:binary-data"));
-	
-	mBodyElements.push_back(new TagCloseElement("draw:image"));
-	
-	mBodyElements.push_back(new TagCloseElement("draw:frame"));
-}
-
 void OdgExporter::drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData)
 {
 	if (!propList["libwpg:mime-type"] && propList["libwpg:mime-type"]->getStr().len() <= 0)

Index: OdgExporter.hxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- OdgExporter.hxx	27 Nov 2008 21:43:28 -0000	1.11
+++ OdgExporter.hxx	28 Nov 2008 11:53:38 -0000	1.12
@@ -56,7 +56,6 @@
 	void drawPolyline(const ::WPXPropertyListVector& vertices);
 	void drawPolygon(const ::WPXPropertyListVector& vertices);
 	void drawPath(const ::WPXPropertyListVector& path);
-	void drawBitmap(const ::WPXPropertyList &propList, const libwpg::WPGBitmap& bitmap);
 	void drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData);
 
 private: