diff options
| author | László Németh <nemeth@numbertext.org> | 2021-04-19 17:52:17 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2021-04-19 22:24:44 +0200 |
| commit | 6fd2bb9b8967c4945550b0f7b7541aaace8020c1 (patch) | |
| tree | 3abf959f6296a4a1b5f502e64b170bc2ece64e76 /writerfilter/source | |
| parent | cd073a4a945a527cec3080523a0d7ec42bc49b26 (diff) | |
tdf#141548 DOCX import: fix lost text after endnoteRef
First run of the endnote (footnote) can contain not
only the footnoteRef/endnoteRef, but endnote (footnote)
text, too. This text was lost as a regression from
commit 7dd8f8aace536a8e60e87e61ee1d90d61fba15eb
"tdf#120351 DOCX import: fix slow endnote import",
and in the case of the footnotes, from
commit 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357
"tdf#76260 DOCX import: fix slow footnote import".
Change-Id: I9964ee47f456a7632a21ab3b0588d3cb70388011
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114300
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 9d163f2e671e..fddbea557c6c 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3645,7 +3645,9 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) if (pContext && pContext->GetFootnote().is()) { pContext->GetFootnote()->setLabel( sText ); - //otherwise ignore sText + // tdf#141548 don't lose footnote/endnote text of the run with uFtnEdnRef + // (i.e. when footnoteRef/endnoteRef is followed by some text in the same run) + m_pImpl->appendTextPortion( sText, pContext ); } else if (m_pImpl->IsOpenFieldCommand() && !m_pImpl->IsForceGenericFields()) { |