summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-02-29 12:06:32 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-02-29 12:21:48 +0100
commit00859026749e005759ce4e7115b746b064cd902b (patch)
tree0a452272d15a8292e1c0fbf34ad838f1d0e2499d
parent3f9f18c53d9876106b274769dec9d0e3916feb8f (diff)
fdo#46662 fix RTF import of numbering levelnumbers
To handle stateful encodings, we process hex characters in one go for a run. Levelnumbers of numberings should be an exception, since there the special characters (here: 0x7, which is table cell end) have no special meaning.
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f388ec88e0ed..73420102e9bb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -760,7 +760,7 @@ int RTFDocumentImpl::resolveChars(char ch)
if (m_aStates.top().nInternalState != INTERNAL_HEX && !Strm().IsEof())
Strm().SeekRel(-1);
- if (m_aStates.top().nInternalState == INTERNAL_HEX)
+ if (m_aStates.top().nInternalState == INTERNAL_HEX && m_aStates.top().nDestinationState != DESTINATION_LEVELNUMBERS)
{
if (!bSkipped)
m_aHexBuffer.append(ch);