Update of /cvsroot/libwpd/libwpd2/src/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32573/src/lib
Modified Files:
Tag: fs_refactoring1
WP6HLContentListener.cpp WPXHLListener.cpp
Log Message:
With this one, the lists should be working well again
Index: WP6HLContentListener.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v
retrieving revision 1.78.2.6
retrieving revision 1.78.2.7
diff -C2 -d -r1.78.2.6 -r1.78.2.7
*** WP6HLContentListener.cpp 31 Jul 2005 06:35:50 -0000 1.78.2.6
--- WP6HLContentListener.cpp 1 Aug 2005 08:39:13 -0000 1.78.2.7
***************
*** 972,975 ****
--- 972,976 ----
case WP6_STYLE_GROUP_PARASTYLE_END_OFF:
WPD_DEBUG_MSG(("WordPerfect: Handling a parastyle end (OFF)\n"));
+ m_ps->m_currentListLevel = 0;
m_parseState->m_styleStateSequence.setCurrentState(NORMAL);
break;
***************
*** 1368,1372 ****
m_parseState->m_textAfterDisplayReference.clear();
m_parseState->m_textAfterNumber.clear();
!
// open a new list element, if we're still in the list
if (m_ps->m_currentListLevel > 0)
--- 1369,1373 ----
m_parseState->m_textAfterDisplayReference.clear();
m_parseState->m_textAfterNumber.clear();
! #if 0
// open a new list element, if we're still in the list
if (m_ps->m_currentListLevel > 0)
***************
*** 1374,1377 ****
--- 1375,1379 ----
_openListElement();
}
+ #endif
}
Index: WPXHLListener.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v
retrieving revision 1.61.2.3
retrieving revision 1.61.2.4
diff -C2 -d -r1.61.2.3 -r1.61.2.4
*** WPXHLListener.cpp 31 Jul 2005 06:35:50 -0000 1.61.2.3
--- WPXHLListener.cpp 1 Aug 2005 08:39:17 -0000 1.61.2.4
***************
*** 499,503 ****
--- 499,506 ----
if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened)
if (m_ps->m_currentListLevel == 0)
+ {
+ _flushList();
_openParagraph();
+ }
else
_openListElement();
|
