openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1629834 - /openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
Date Tue, 07 Oct 2014 09:09:31 GMT
Author: orw
Date: Tue Oct  7 09:09:30 2014
New Revision: 1629834

URL: http://svn.apache.org/r1629834
Log:
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


Modified:
    openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx

Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1629834&r1=1629833&r2=1629834&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx (original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx Tue Oct  7 09:09:30
2014
@@ -4520,8 +4520,12 @@ void DomainMapper::lcl_utext(const sal_u
     {
         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
         {
 



Mime
View raw message