diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-21 14:57:26 +0200 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2012-09-21 15:42:04 +0000 |
| commit | 9d3af8d699c95b7433591701666a70554d543b96 (patch) | |
| tree | 6e26e891bc63431653f5554972f4b557c747e748 | |
| parent | 3752aca388adaf633e21a47576c770d73bf7e8d3 (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.
(cherry picked from commit b3603e0e0e5dbfbeaa2426c499e8f64be2d15765)
Change-Id: I5e4a95b4436e1492b64961820702caace0a33e4b
Reviewed-on: https://gerrit.libreoffice.org/665
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
| -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 8634644e6aae..2068b613dac2 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 |