commit 950464e95723d153e571c657cbceb15a77373075
author Michael Stahl <michael.stahl@allotropia.de> Wed Nov 15 19:41:49 2023 +0100
committer Xisco Fauli <xiscofauli@libreoffice.org> Thu Nov 30 10:21:58 2023 +0100
tree d58e2d6c4ecd8c1ead75440205d0b4b9014a63d0
parent bcbc024757b569e1c8999ac4f897bd7f0ee8781b

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>
(cherry picked from commit 15f54c82d136e6fee3a65494f3b5271857b5d6b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159564
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

writerfilter/source/dmapper/DomainMapper.cxx

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index cdb2212a..f1be653 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2434,8 +2434,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();
            }
@@ -3625,8 +3625,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();
    }
@@ -3917,14 +3917,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);
                    }
                    ResetStyleProperties();
                    finishParagraph();
                    assert(!"paragraph break is handled by utext() now");
                    return;
                }
                case cFieldStart: