From: Fridrich S. <str...@us...> - 2010-06-08 13:47:16
|
Update of /cvsroot/libwpg/libwpg/src/conv/raw In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8337/src/conv/raw Modified Files: wpg2raw.cpp Log Message: Starting to support some text elements embedded in WPG documents Index: wpg2raw.cpp =================================================================== RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- wpg2raw.cpp 6 Jun 2010 22:14:09 -0000 1.25 +++ wpg2raw.cpp 8 Jun 2010 13:47:08 -0000 1.26 @@ -43,14 +43,15 @@ void startEmbeddedGraphics(const ::WPXPropertyList& propList); void endEmbeddedGraphics(); - void setStyle(const ::WPXPropertyListVector& gradient, const ::WPXPropertyList &propList); + void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector& gradient); void drawRectangle(const ::WPXPropertyList &propList); void drawEllipse(const ::WPXPropertyList& propList); void drawPolyline(const ::WPXPropertyListVector& vertices); void drawPolygon(const ::WPXPropertyListVector& vertices); void drawPath(const ::WPXPropertyListVector& path); - void drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData); + void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData); + void drawTextLine(const ::WPXPropertyList &propList, const ::WPXString &str); }; WPXString getPropString(const WPXPropertyList &propList) @@ -134,9 +135,9 @@ printf("RawPainter::endEmbeddedGraphics \n"); } -void RawPainter::setStyle(const ::WPXPropertyListVector& gradient, const ::WPXPropertyList &propList) +void RawPainter::setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector& gradient) { - printf("RawPainter::setStyle(gradient: (%s), %s)\n", getPropString(gradient).cstr(), getPropString(propList).cstr()); + printf("RawPainter::setStyle(%s, gradient: (%s))\n", getPropString(propList).cstr(), getPropString(gradient).cstr()); } void RawPainter::drawRectangle(const ::WPXPropertyList &propList) @@ -164,11 +165,17 @@ printf("RawPainter::drawPath (%s)\n", getPropString(path).cstr()); } -void RawPainter::drawImageObject(const ::WPXPropertyList& propList, const ::WPXBinaryData& /*binaryData*/) +void RawPainter::drawGraphicObject(const ::WPXPropertyList& propList, const ::WPXBinaryData& /*binaryData*/) { - printf("RawPainter::drawImageObject (%s)\n", getPropString(propList).cstr()); + printf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr()); } +void RawPainter::drawTextLine(const ::WPXPropertyList &propList, const ::WPXString &str) +{ + printf("RawPainter::drawTextLine (%s, text: (%s))\n", getPropString(propList).cstr(), str.cstr()); +} + + namespace { int printUsage() |