Index: abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp =================================================================== RCS file: /cvsroot/abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp,v retrieving revision 1.12 diff -u -r1.12 ie_imp_OpenWriter.cpp --- abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp 21 Aug 2004 18:27:16 -0000 1.12 +++ abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp 23 Aug 2004 12:06:12 -0000 @@ -824,6 +824,7 @@ UT_UCS4String m_charData; bool m_bAcceptingText; bool m_bInSection; + bool m_bSectionHasPara; UT_UTF8String m_curStyleName; @@ -838,8 +839,8 @@ public: OpenWriter_ContentStream_Listener ( IE_Imp_OpenWriter * importer ) - : OpenWriter_Stream_Listener ( importer ), m_bAcceptingText(false), m_bInSection(false), m_imgCnt(0), - m_row(0), m_col(0), m_cel(0) + : OpenWriter_Stream_Listener ( importer ), m_bAcceptingText(false), m_bInSection(false), m_bSectionHasPara(false), + m_imgCnt(0), m_row(0), m_col(0), m_cel(0) { } @@ -900,6 +901,7 @@ else getDocument()->appendStrux(PTX_Block, NULL); m_bAcceptingText = true; + m_bSectionHasPara = true; } else if (!UT_strcmp(name, "text:span")) { @@ -957,6 +959,12 @@ getDocument()->appendStrux(PTX_Section, NULL); m_bInSection = true; } + // FIXME rob: workaround for #6725 "AbiWord Crashes Importing OpenWriter 1.1 Document Containing Table" + if (!m_bSectionHasPara) + { + getDocument()->appendStrux(PTX_Block, NULL); + m_bSectionHasPara = true; + } _openTable (atts); } else if (!UT_strcmp(name, "table:table-column"))