Improve rtf import filter to handle Chinese suffixes of numbered lists.

Currently rtftok doesn't handle multibyte string as destination
text very well. For example, RTF files created by MSO 2010 Traditional
Chinese version use CP950 (aka BIG5) for unicode to ansi conversion.
When a Chinsese numbered list was picked, the Chinese dot ( unicode
0x3001, big5 0xa142 ), was used by default as a list number suffix.
However when it is imported , only a single B (0x42) were left.
The theory of the patch is to collect both hex string and normal
character with m_aHexBuffer, and convert it into OUString as late
as possible. It allows prefixes and suffixes to be imported from
RTF files created by MSO 2010 TC correctly.

Reviewed on:
	https://gerrit.libreoffice.org/12435

Conflicts:
	sw/qa/extras/rtfimport/rtfimport.cxx

Change-Id: I63062da39bf36ea27ec11e5d0eb1d1abf5018d96

1 files changed, 3 insertions, 4 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e51e23376262..a7045db36b39 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1005,8 +1005,6 @@ int RTFDocumentImpl::resolveChars(char ch)
         return 0;
     }
 
-    if (m_aStates.top().nInternalState != INTERNAL_HEX)
-        checkUnicode(/*bUnicode =*/ false, /*bHex =*/ true);
 
     OStringBuffer aBuf;
 
@@ -1096,9 +1094,10 @@ int RTFDocumentImpl::resolveChars(char ch)
         // set components back to zero
         m_aStates.top().aCurrentColor = RTFColorTableEntry();
     }
-    else if (!aOUStr.isEmpty())
-        text(aOUStr);
+    else if (!aStr.isEmpty())
+        m_aHexBuffer.append(aStr);
 
+    checkUnicode(/*bUnicode =*/ false, /*bHex =*/ true);
     return 0;
 }