diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-21 14:57:26 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-09-21 15:15:49 +0200 |
| commit | b3603e0e0e5dbfbeaa2426c499e8f64be2d15765 (patch) | |
| tree | bda8e7a21059e5884609f510a096e2f34f5c4ee7 /writerfilter/source | |
| parent | 01207ca9851f79dd4aaf2b7a011bea7b8971d9c6 (diff) | |
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.
Change-Id: I5e4a95b4436e1492b64961820702caace0a33e4b
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 0736d692e734..38a99611a7f0 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3523,8 +3523,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 |