According to Matti Picus <[EMAIL PROTECTED]>:
> I am resubmitting this patch for testing. My previous patch was apparently
> received after someone else modified the file, so I'm a bit paranoid about
> making sure this works. I did the following (in a cygwin bash console,
> running on win2000):
>
> rm ie_imp_RTF.cpp
> cvs update ie_imp_RTF.cpp
> {edit file to add my super duper changes}
> cvs diff -c ie_imp_RTF.cpp > bug1211.patch
> rm ie_imp_RTF.cpp
> cvs update ie_imp_RTF.cpp
> patch < bug1211.patch
> {test that I fixed what I wanted to fix}
cvs update does merge changes.
> The RTF importer, specifically NextToken, was not ignoring leading spaces
> properly. While the RTF grammar does not explicitly allow spaces between
> keywords, it does not forbid them. This patch fixes bug 1211 by:
> 1. Use NextToken() and a UT_StringPtrMap hash within the font table parsing
> since I decided that is the proper way to do things. Anyone want to debate
> this :) ?
Sounds good for me.
> 2. Fix NextToken() to ignore leading spaces (spaces before keywords)
Oops. My fault, I wrote that.
> The patched file was tested against the RTF files in the test directory, as
> well as bug1207.rtf which really relates to bug 1211.
Committed
CVS: Modified Files:
CVS: ie_imp_RTF.cpp
Hub
