diff options
| author | Patrick Jaap <patrick.jaap@tu-dresden.de> | 2019-01-23 10:01:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-05 14:55:01 +0100 |
| commit | 8e3afdb5989d571410350f1d43fcf26492a4eaff (patch) | |
| tree | 047640fa43cd7b491a984612591c22aa229d9fc4 /writerfilter | |
| parent | 8a7a93b3f24b95bfcffc25e58f9e43c7be4cc1f1 (diff) | |
tdf#122878: enable wrap for flys in footer
This patch removes the check for a footer node,
intoduced by
23f698ecee033612ac3a9f5cfd7674b08bb3ccd1
preserving the behaviour for the connected bug reports
i13832 and i24135.
Without this check, the wraping becomes enabled for footer
objects, too.
With this enhencement, the commits
7df33caac85ac90c26e97dedbc201f46dc9e4cb4
d3db6ff43a531ecf1afc858a0a8832353d091644
are directly affected and therefore the unit test is edited.
Change-Id: I093add9e251ac97859a66cb8b8563010ef734c2d
Reviewed-on: https://gerrit.libreoffice.org/67069
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 04fd361b7e36..01c7f59fc314 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -1176,8 +1176,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab m_aTableProperties->getValue(TablePropertyMap::TABLE_WIDTH_TYPE, nTableWidthType); if (m_rDMapper_Impl.GetSectionContext() && nestedTableLevel <= 1 && !m_rDMapper_Impl.IsInHeaderFooter()) m_rDMapper_Impl.m_aPendingFloatingTables.emplace_back(xStart, xEnd, comphelper::containerToSequence(aFrameProperties), nTableWidth, nTableWidthType); - else if (!m_rDMapper_Impl.IsInFooter()) // FIXME: tdf#116989 floating objects anchored - //to footer cannot have proper wrapping + else { // m_xText points to the body text, get the current xText from m_rDMapper_Impl, in case e.g. we would be in a header. uno::Reference<text::XTextAppendAndConvert> xTextAppendAndConvert(m_rDMapper_Impl.GetTopTextAppend(), uno::UNO_QUERY); |