[Libreoffice-commits] core.git: writerfilter/source

[Jan-Marek Glogowski (via logerrit)]

 writerfilter/source/dmapper/DomainMapper.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 38306ea92560c82b0d70bdc195267549a8bab830
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Thu Feb 20 20:22:10 2020 +0100
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sat Feb 22 02:03:07 2020 +0100

    tdf#130817 RTF doesn't set custom footnote state
    
    RTFDocumentImpl::dispatchDestination detects the custom footnote
    and even sets NS_ooxml::LN_CT_FtnEdnRef_customMarkFollows in the
    character attributes of the context, but that is at least not
    handled in the DomainMapper later on, so we can't check for
    m_pImpl->IsInCustomFootnote() here.
    
    Change-Id: I26c02ea16d0e75ed5bfde0cda9e0c6a2d30261a0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89240
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 0787b96fc1cd..bc4a830bb733 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3182,6 +3182,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
         if (pContext && pContext->GetFootnote().is() && m_pImpl->IsInCustomFootnote())
         {
             pContext->GetFootnote()->setLabel(sText);
+            m_pImpl->EndCustomFootnote();
             //otherwise ignore sText
         }
         else if (m_pImpl->IsOpenFieldCommand() && !m_pImpl->IsForceGenericFields())
@@ -3496,7 +3497,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
                 m_pImpl->clearDeferredBreaks();
             }
 
-            if (pContext && pContext->GetFootnote().is() && m_pImpl->IsInCustomFootnote())
+            if (pContext && pContext->GetFootnote().is())
             {
                 pContext->GetFootnote()->setLabel( sText );
                 //otherwise ignore sText