[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

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

New commits:
commit 43d5a03d02d4c1c9756d1080b7fee418e24717a3
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Oct 29 00:24:55 2011 +0200

    Related: fdo#39856 fix RTF import of some special accented chars in tables

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 74f6963..f7ede2a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3384,7 +3384,8 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
     {
         m_pImpl->getTableManager().utext(data_, len);
 
-        if(len == 1 && ((*data_) == 0x0d || (*data_) == 0x07))
+        // RTF always uses text() instead of utext() for run break
+        if(len == 1 && ((*data_) == 0x0d || (*data_) == 0x07) && !IsRTFImport())
             m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH));
         else
         {