[Libwpd-cvs] libwpd2/src/conv/html HtmlDocumentGenerator.cpp, 1.7, 1.8 HtmlDocumentGenerator.h, 1.6, 1.7

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

Update of /cvsroot/libwpd/libwpd2/src/conv/html
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3500/src/conv/html

Modified Files:
	HtmlDocumentGenerator.cpp HtmlDocumentGenerator.h 
Log Message:
No need to work around anymore, a CVS version of DJGPP is compiling std::cout << correctly

Index: HtmlDocumentGenerator.h
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/HtmlDocumentGenerator.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- HtmlDocumentGenerator.h	4 Sep 2009 14:50:10 -0000	1.6
+++ HtmlDocumentGenerator.h	10 Sep 2009 20:01:25 -0000	1.7
@@ -93,8 +93,8 @@
 
 private:
 	bool m_ignore;
-	std::ostringstream *m_pOutputStream;
-	std::ostringstream m_footNotesStream, m_endNotesStream, m_commentsStream, m_textBoxesStream, m_documentBodyStream, m_dummyStream;
+	std::ostream *m_pOutputStream;
+	std::ostringstream m_footNotesStream, m_endNotesStream, m_commentsStream, m_textBoxesStream, m_dummyStream;
 	unsigned m_footNotesCount, m_endNotesCount, m_commentsCount, m_textBoxesCount;
 	unsigned m_commentNumber, m_textBoxNumber;
 

Index: HtmlDocumentGenerator.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/HtmlDocumentGenerator.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- HtmlDocumentGenerator.cpp	4 Sep 2009 14:50:09 -0000	1.7
+++ HtmlDocumentGenerator.cpp	10 Sep 2009 20:01:25 -0000	1.8
@@ -34,7 +34,7 @@
 
 HtmlDocumentGenerator::HtmlDocumentGenerator() :
 	m_ignore(false),
-	m_pOutputStream(NULL),
+	m_pOutputStream(&std::cout),
 	m_footNotesCount(0),
 	m_endNotesCount(0),
 	m_commentsCount(0),
@@ -42,7 +42,6 @@
 	m_commentNumber(1),
 	m_textBoxNumber(1)
 {
-	m_pOutputStream = &m_documentBodyStream;
 }
 
 HtmlDocumentGenerator::~HtmlDocumentGenerator()
@@ -103,8 +102,6 @@
 	}
 	*m_pOutputStream << "</body>" << std::endl;
 	*m_pOutputStream << "</html>" << std::endl;
-	
-	printf("%s", m_pOutputStream->str().c_str());
 }
 
 void HtmlDocumentGenerator::openHeader(const WPXPropertyList & /* propList */)
@@ -300,7 +297,7 @@
 		if (!(--m_footNotesCount))
 		{
 			*m_pOutputStream << "<p/>" << std::endl;
-			m_pOutputStream = &m_documentBodyStream;
+			m_pOutputStream = &std::cout;
 		}
 	}
 }
@@ -332,7 +329,7 @@
 		if (!(--m_endNotesCount))
 		{
 			*m_pOutputStream << "<p/>" << std::endl;
-			m_pOutputStream = &m_documentBodyStream;
+			m_pOutputStream = &std::cout;
 		}
 	}
 }
@@ -360,7 +357,7 @@
 		if (!(--m_commentsCount))
 		{
 			*m_pOutputStream << "<p/>" << std::endl;
-			m_pOutputStream = &m_documentBodyStream;
+			m_pOutputStream = &std::cout;
 		}
 	}
 }
@@ -389,7 +386,7 @@
 		if (!(--m_textBoxesCount))
 		{
 			*m_pOutputStream << "<p/>" << std::endl;
-			m_pOutputStream = &m_documentBodyStream;
+			m_pOutputStream = &std::cout;
 		}
 	}
 }