[Libreoffice-commits] .: writerfilter/source

Miklos Vajna vmiklos at kemper.freedesktop.org
Wed Feb 29 03:21:39 PST 2012


 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00859026749e005759ce4e7115b746b064cd902b
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Feb 29 12:06:32 2012 +0100

    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.

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f388ec8..7342010 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);


More information about the Libreoffice-commits mailing list