diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-10-07 09:09:30 +0000 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <orw@apache.org> | 2014-10-07 09:09:30 +0000 |
| commit | 37a5b8e281c03bb04148939a510e4836ad6f4cdb (patch) | |
| tree | a53837b9be2911d86fcccb3b0386804d11821db5 | |
| parent | 36cc153d32bc262c2285d333a1369f6ca36a7fba (diff) | |
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
Notes
Notes:
prefer: b3603e0e0e5dbfbeaa2426c499e8f64be2d15765
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index e8a9dd290bbb..d2728e981c56 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -4520,8 +4520,12 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) { 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 { |