writerfilter/source/dmapper/DomainMapper.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6901a41856a7710fd75f200ea127d55499d942b5
Author: Jan-Marek Glogowski <jan-marek.glogow...@extern.cib.de>
AuthorDate: Thu Feb 20 20:22:10 2020 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Mon Feb 24 18:08:03 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 <glo...@fbihome.de>
(cherry picked from commit 38306ea92560c82b0d70bdc195267549a8bab830)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89143
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 361b576966fe..70cd838d59b5 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3187,6 +3187,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())
@@ -3501,7 +3502,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
