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

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

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

Modified Files:
	HtmlDocumentGenerator.cpp HtmlDocumentGenerator.h 
Log Message:
Working around a crash in std::cout << on DOS

Index: HtmlDocumentGenerator.h
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/HtmlDocumentGenerator.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- HtmlDocumentGenerator.h	3 Dec 2008 05:28:07 -0000	1.5
+++ HtmlDocumentGenerator.h	4 Sep 2009 14:50:10 -0000	1.6
@@ -93,8 +93,8 @@
 
 private:
 	bool m_ignore;
-	std::ostream *m_pOutputStream;
-	std::ostringstream m_footNotesStream, m_endNotesStream, m_commentsStream, m_textBoxesStream, m_dummyStream;
+	std::ostringstream *m_pOutputStream;
+	std::ostringstream m_footNotesStream, m_endNotesStream, m_commentsStream, m_textBoxesStream, m_documentBodyStream, 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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- HtmlDocumentGenerator.cpp	3 Dec 2008 12:30:38 -0000	1.6
+++ HtmlDocumentGenerator.cpp	4 Sep 2009 14:50:09 -0000	1.7
@@ -34,7 +34,7 @@
 
 HtmlDocumentGenerator::HtmlDocumentGenerator() :
 	m_ignore(false),
-	m_pOutputStream(&std::cout),
+	m_pOutputStream(NULL),
 	m_footNotesCount(0),
 	m_endNotesCount(0),
 	m_commentsCount(0),
@@ -42,6 +42,7 @@
 	m_commentNumber(1),
 	m_textBoxNumber(1)
 {
+	m_pOutputStream = &m_documentBodyStream;
 }
 
 HtmlDocumentGenerator::~HtmlDocumentGenerator()
@@ -102,6 +103,8 @@
 	}
 	*m_pOutputStream << "</body>" << std::endl;
 	*m_pOutputStream << "</html>" << std::endl;
+	
+	printf("%s", m_pOutputStream->str().c_str());
 }
 
 void HtmlDocumentGenerator::openHeader(const WPXPropertyList & /* propList */)
@@ -297,7 +300,7 @@
 		if (!(--m_footNotesCount))
 		{
 			*m_pOutputStream << "<p/>" << std::endl;
-			m_pOutputStream = &std::cout;
+			m_pOutputStream = &m_documentBodyStream;
 		}
 	}
 }
@@ -329,7 +332,7 @@
 		if (!(--m_endNotesCount))
 		{
 			*m_pOutputStream << "<p/>" << std::endl;
-			m_pOutputStream = &std::cout;
+			m_pOutputStream = &m_documentBodyStream;
 		}
 	}
 }
@@ -357,7 +360,7 @@
 		if (!(--m_commentsCount))
 		{
 			*m_pOutputStream << "<p/>" << std::endl;
-			m_pOutputStream = &std::cout;
+			m_pOutputStream = &m_documentBodyStream;
 		}
 	}
 }
@@ -386,7 +389,7 @@
 		if (!(--m_textBoxesCount))
 		{
 			*m_pOutputStream << "<p/>" << std::endl;
-			m_pOutputStream = &std::cout;
+			m_pOutputStream = &m_documentBodyStream;
 		}
 	}
 }