diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-15 19:41:49 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-16 17:19:17 +0100 |
| commit | 15f54c82d136e6fee3a65494f3b5271857b5d6b8 (patch) | |
| tree | 5765b940b3af6ded078a94105f05fac76be628c4 /writerfilter | |
| parent | 17eaebee279772b6062ae3448012133897fc71bb (diff) | |
writerfilter: remove DomainMapper::text() handling of paragraph break
Convert all remaining callers to utext().
Change-Id: Ie1fdf22e9e474289df2c72eadc236ec6b270df4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159485
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 8cf91bcf859f..20462e20e45d 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2437,8 +2437,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) lcl_startParagraphGroup(); m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_PAGE_BEFORE)); lcl_startCharacterGroup(); - sal_uInt8 const sBreak[] = { 0xd }; - lcl_text(sBreak, 1); + sal_Unicode const sBreak[] = { 0x0d }; + lcl_utext(reinterpret_cast<sal_uInt8 const*>(sBreak), 1); lcl_endCharacterGroup(); lcl_endParagraphGroup(); } @@ -3627,8 +3627,8 @@ void DomainMapper::lcl_endSectionGroup() // style, so force a dummy paragraph. lcl_startParagraphGroup(); lcl_startCharacterGroup(); - sal_uInt8 const sBreak[] = { 0xd }; - lcl_text(sBreak, 1); + sal_Unicode const sBreak[] = { 0x0d }; + lcl_utext(reinterpret_cast<sal_uInt8 const*>(sBreak), 1); lcl_endCharacterGroup(); lcl_endParagraphGroup(); } @@ -3919,13 +3919,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) return; case 0x0d: { - PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); - if (pContext && m_pImpl->isBreakDeferred(COLUMN_BREAK)) - { - pContext->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_COLUMN_BEFORE)); - m_pImpl->clearDeferredBreak(COLUMN_BREAK); - } - finishParagraph(); + assert(!"paragraph break is handled by utext() now"); return; } case cFieldStart: |