[Libreoffice-commits] core.git: Branch 'aoo/trunk' - writerfilter/source

[Oliver-Rainer Wittmann]

 writerfilter/source/dmapper/DomainMapper.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 37a5b8e281c03bb04148939a510e4836ad6f4cdb
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Tue Oct 7 09:09:30 2014 +0000

    125618: *.docx import: correct detection of paragraph break and line break characters, esp. in context of Chinese text
    
    patch by: Mark Hung <marklh9 at gmail dot com>
    review by: orw

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index e8a9dd2..d2728e9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -4520,8 +4520,12 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
     {
         m_pImpl->getTableManager().utext(data_, len);
 
-        if(len == 1 && ((*data_) == 0x0d || (*data_) == 0x07))
+        if ( len == 1
+             && ( (*(const sal_Unicode*)data_) == 0x0d
+                    || (*(const sal_Unicode*)data_) == 0x07 ) )
+        {
             m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH));
+        }
         else
         {