diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2023-08-24 08:34:38 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2023-08-24 10:19:07 +0200 |
commit | 178421a6c719dac9c16f220b76292fec16a53f60 (patch) | |
tree | 1eae6071d42b23ba580cb0b2f74b3db9246c536c /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
parent | bf1e649e6f626268db99d20ae921669ed557c3af (diff) |
tdf#77760 sw floattable: add support for footnotes, DOCX import
This was originally added in commit
2fe248f2b36d541c0d243a620c217058a50a9d5d (tdf#87460 DOCX import: fix
missing endnote in floattable, 2015-06-23), because Writer core only
allows footnotes in floating tables since commit
56da1d30afe48cc4acd79567052a575e81f8c7a0 (tdf#77760 sw floattable: add
support for footnotes, doc model, 2023-08-22).
The DOCX export works already.
The ODT filter also works: there is a mechanism to try to not insert
footnotes in text frames, but the way XMLTextImportHelper::IsInFrame()
is implemented means that it only rejects footnotes directly in text
frames, not in tables-in-textframes, which is the interesting case for
us.
Change-Id: I90a5f0228385b2e3db8d994c6c76064fe595f439
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156024
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index d9faf0c206a4..4b7e91978128 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -9355,7 +9355,6 @@ void DomainMapper_Impl::substream(Id rName, { case NS_ooxml::LN_footnote: case NS_ooxml::LN_endnote: - m_pTableHandler->setHadFootOrEndnote(true); m_bHasFtn = true; break; } |