[Libwpg-cvs] libwpg/src/conv/raw wpg2raw.cpp,1.26,1.27

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

Update of /cvsroot/libwpg/libwpg/src/conv/raw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29065/src/conv/raw

Modified Files:
	wpg2raw.cpp 
Log Message:
Some more steps towards parsing of embedded text

Index: wpg2raw.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- wpg2raw.cpp	8 Jun 2010 13:47:08 -0000	1.26
+++ wpg2raw.cpp	10 Jun 2010 18:48:06 -0000	1.27
@@ -51,7 +51,13 @@
 	void drawPolygon(const ::WPXPropertyListVector& vertices);
 	void drawPath(const ::WPXPropertyListVector& path);
 	void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData);
-	void drawTextLine(const ::WPXPropertyList &propList, const ::WPXString &str);
+	void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
+	void endTextObject();
+	void startTextLine(const ::WPXPropertyList &propList);
+	void endTextLine();
+	void startTextSpan(const ::WPXPropertyList &propList);
+	void endTextSpan();
+	void insertText(const ::WPXString &str);
 };
 
 WPXString getPropString(const WPXPropertyList &propList)
@@ -170,9 +176,39 @@
 	printf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
 }
 
-void RawPainter::drawTextLine(const ::WPXPropertyList &propList, const ::WPXString &str)
+void RawPainter::startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path)
 {
-	printf("RawPainter::drawTextLine (%s, text: (%s))\n", getPropString(propList).cstr(), str.cstr());
+	printf("RawPainter::startTextObject (%s, path: (%s))\n", getPropString(propList).cstr(), getPropString(path).cstr());
+}
+
+void RawPainter::endTextObject()
+{
+	printf("RawPainter::endTextObject\n");
+}
+
+void RawPainter::startTextLine(const ::WPXPropertyList &propList)
+{
+	printf("RawPainter::startTextLine (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::endTextLine()
+{
+	printf("RawPainter::endTextLine\n");
+}
+
+void RawPainter::startTextSpan(const ::WPXPropertyList &propList)
+{
+	printf("RawPainter::startTextSpan (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::endTextSpan()
+{
+	printf("RawPainter::endTextSpan\n");
+}
+
+void RawPainter::insertText(const ::WPXString &str)
+{
+	printf("RawPainter::insertText (%s)\n", str.cstr());
 }