rtf importer ignoring imbedded { } sequences

Subject: rtf importer ignoring imbedded { } sequences
From: Matti Picus (matti@picus.org)
Date: Wed Sep 05 2001 - 17:03:25 CDT

The function HandleTableListOveride() was not taking into account that
imbedded {\keyword\filled\with\values} sequences could occur within the
{\listoverride } sequence.

Here is a patch to fix it, which incidentally fixes a subtle bug where '}'
was eaten by ReadKeyword() since ReadKeyword was called even if no '\\'
preceded the keyword.

Matti

cvs -z3 diff -c ie_imp_RTF.cpp (in directory
D:\matti\projects\abi\src\wp\impexp\xp)
Index: ie_imp_RTF.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_RTF.cpp,v
retrieving revision 1.90
diff -c -r1.90 ie_imp_RTF.cpp
*** ie_imp_RTF.cpp 2001/08/30 07:14:51 1.90
--- ie_imp_RTF.cpp 2001/09/05 20:56:49
***************
*** 4533,4539 ****
                 {
                         nesting--;
                 }
! else
                 {
                         if(!ReadKeyword(keyword, &parameter, &paramUsed,
MAX_KEYWORD_LEN))
                         {
--- 4533,4543 ----
                 {
                         nesting--;
                 }
! else if(ch == '{')
! {
! nesting ++;
! }
! else if(ch == '\\')
                 {
                         if(!ReadKeyword(keyword, &parameter, &paramUsed,
MAX_KEYWORD_LEN))
                         {

*****CVS exited normally with code 1*****

This archive was generated by hypermail 2b25 : Wed Sep 05 2001 - 16:11:30 CDT