[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapper.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9d3af8d699c95b7433591701666a70554d543b96
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Sep 21 14:57:26 2012 +0200

    fdo#55187 fix DOCX import of unicode 0xNN0d when it's a separate run
    
    E.g. 0x010d was parsed as a newline character... This also makes the RTF
    workaround from fdo#39856 unnecessary.
    
    (cherry picked from commit b3603e0e0e5dbfbeaa2426c499e8f64be2d15765)
    
    Change-Id: I5e4a95b4436e1492b64961820702caace0a33e4b
    Reviewed-on: https://gerrit.libreoffice.org/665
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 8634644..2068b61 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3447,8 +3447,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
     {
         m_pImpl->getTableManager().utext(data_, len);
 
-        // RTF always uses text() instead of utext() for run break
-        if(len == 1 && ((*data_) == 0x0d || (*data_) == 0x07) && !IsRTFImport())
+        if(len == 1 && (sText[0] == 0x0d || sText[0] == 0x07))
         {
             bool bSingleParagraph = m_pImpl->GetIsFirstParagraphInSection() && m_pImpl->GetIsLastParagraphInSection();
             // If the paragraph contains only the section properties and it has