diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-01 22:00:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-11 16:43:39 +0000 |
| commit | 7b0f4f9e9a9183c870424d68e5fb7aead6aaa96f (patch) | |
| tree | 171e84851424f4b310d19070fc4a65f773ff40fb /writerfilter | |
| parent | 05d81b4eb901fd792091afd67615d8e8ce35a105 (diff) | |
fdo#82512 RTF import: fix position of column break
(cherry picked from commit dcb37dcebcde6188eb58ef7d8d34d08fea4badb8)
Change-Id: Ib0f39c4af7cc32d0f4491f13ea207d90a449a47d
Reviewed-on: https://gerrit.libreoffice.org/12309
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 90ae6e94ae69..7c8ac2073131 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2683,8 +2683,16 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) case 0x07: m_pImpl->getTableManager().text(data_, len); case 0x0d: + { + PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); + if (pContext && m_pImpl->isBreakDeferred(COLUMN_BREAK)) + { + pContext->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); + m_pImpl->clearDeferredBreak(COLUMN_BREAK); + } m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH)); return; + } case 0x13: m_pImpl->PushFieldContext(); return; |