Index: ie_imp_RTF.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_RTF.cpp,v
retrieving revision 1.22
diff -r1.22 ie_imp_RTF.cpp
560c560
< 	if (!ReadCharFromFile(&ch))
---
> 	if (!ReadCharFromFileWithCRLF(&ch))
576c576
< 		if (!ReadCharFromFile(&ch))
---
> 		if (!ReadCharFromFileWithCRLF(&ch))
585c585
< 		if (!ReadCharFromFile(&ch))
---
> 		if (!ReadCharFromFileWithCRLF(&ch))
596c596
< 			if (!ReadCharFromFile(&ch))
---
> 			if (!ReadCharFromFileWithCRLF(&ch))
606,607c606,607
< 	// If the delimeter was non-space then this character is part of the following text!
< 	if (ch != ' ')
---
> 	// If the delimeter was non-whitespace then this character is part of the following text!
> 	if ((ch != ' ') && (ch != 10) && (ch != 13))
616c616,617
< UT_Bool IE_Imp_RTF::ReadCharFromFile(unsigned char* pCh)
---
> // Reads a character from the file. Doesn't ignore CR and LF
> UT_Bool IE_Imp_RTF::ReadCharFromFileWithCRLF(unsigned char* pCh)
617a619,621
> 	
> 	UT_Bool ok = UT_FALSE;
> 
620c624
< 		while (fread(pCh, 1, sizeof(unsigned char), m_pImportFile) > 0)
---
> 		if (fread(pCh, 1, sizeof(unsigned char), m_pImportFile) > 0)
622,629c626,627
< 			// line feed and cr should be ignored in RTF files
< 			if (*pCh != 10  &&  *pCh != 13)
< 			{
< 				return UT_TRUE;
< 			}
< 		}
< 
< 		return UT_FALSE;
---
> 			ok = UT_TRUE;
> 		}		
633c631
< 		while (m_pCurrentCharInPasteBuffer < m_pPasteBuffer+m_lenPasteBuffer)
---
> 		if (m_pCurrentCharInPasteBuffer < m_pPasteBuffer+m_lenPasteBuffer)
636,641c634
< 			
< 			// line feed and cr should be ignored in RTF files
< 			if (*pCh != 10  &&  *pCh != 13)
< 			{
< 				return UT_TRUE;
< 			}
---
> 			ok = UT_TRUE;
643,644d635
< 
< 		return UT_FALSE;
645a637,653
> 
> 	return ok;
> }
> 
> // Reads a character from the file ignoring CR and LF
> UT_Bool IE_Imp_RTF::ReadCharFromFile(unsigned char* pCh)
> {
> 	// line feed and cr should be ignored in RTF files
> 	do
> 	{
> 		if (ReadCharFromFileWithCRLF(pCh) == UT_FALSE) {
> 			return UT_FALSE;
> 		}
> 	} while (*pCh == 10  ||  *pCh == 13);
> 	
> 	return UT_TRUE;
> 
1703a1712,1716
> 
> 
> 
> 
> 
Index: ie_imp_RTF.h
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_RTF.h,v
retrieving revision 1.15
diff -r1.15 ie_imp_RTF.h
201a202
>   UT_Bool ReadCharFromFileWithCRLF(unsigned char* pCh);
265a267
>