diff options
author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2019-02-25 08:35:54 +0300 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-03-04 12:32:45 +0100 |
commit | be6261d522d24bd574602fee43715d46ea2710b2 (patch) | |
tree | dd1c9a02422611d8d030cfcee0efdd4e77b99f16 /writerfilter | |
parent | 188fe404ba3157f739ee3e3dd65b42f8013ce39e (diff) |
tdf#121440 writerfilter: do not use imported style for foot/endnotes
Extra style is causing editing problem near footnote/endnote
references. This behavior is a side effect of
eaa9cf6a3069fba3d82c046f0041bfb537d9e648, allowing emission
of these "technical" styles.
Change-Id: I1885b92814746e7b5cd19f3ddd7bc22eb691615e
Reviewed-on: https://gerrit.libreoffice.org/68304
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 691ca4e1a3e510d54894a1e7df7fa4ad9f9cba11)
Reviewed-on: https://gerrit.libreoffice.org/68583
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 82db1031bc88..1ee7cc8600de 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1839,6 +1839,12 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote ) m_aRedlines.push(std::vector< RedlineParamsPtr >()); PropertyMapPtr pTopContext = GetTopContext(); + + // Remove style reference, if any. This reference did appear here as a side effect of tdf#43017 + // Seems it is not required by LO, but causes side effects during editing. So remove it + // for footnotes/endnotes to restore original LO behavior here. + pTopContext->Erase(PROP_CHAR_STYLE_NAME); + uno::Reference< text::XText > xFootnoteText; if (GetTextFactory().is()) xFootnoteText.set( GetTextFactory()->createInstance( |