mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#42465 fix RTF import of unicode characters with backwards compatibility

Browse Source
This commit is contained in:
Miklos Vajna
2012-02-22 17:06:18 +01:00
parent 0389b77a3c
commit 0915f1b3d7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@@ -732,6 +732,7 @@ int RTFDocumentImpl::resolveChars(char ch)
OStringBuffer aBuf;
bool bUnicodeChecked = false;
bool bSkipped = false;
while(!Strm().IsEof() && ch != '{' && ch != '}' && ch != '\\')
{
if (ch != 0x0d && ch != 0x0a)
@@ -746,7 +747,10 @@ int RTFDocumentImpl::resolveChars(char ch)
aBuf.append(ch);
}
else
{
bSkipped = true;
m_aStates.top().nCharsToSkip--;
}
}
// read a single char if we're in hex mode
if (m_aStates.top().nInternalState == INTERNAL_HEX)
@@ -758,7 +762,8 @@ int RTFDocumentImpl::resolveChars(char ch)
if (m_aStates.top().nInternalState == INTERNAL_HEX)
{
m_aHexBuffer.append(ch);
if (!bSkipped)
m_aHexBuffer.append(ch);
return 0;
}