sw/source/filter/ww8/ww8par6.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit 96c4c0fcffc4f0a1f5a49be576646d15d613228e Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Sat Apr 15 20:01:57 2023 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Sat Apr 15 21:47:05 2023 +0200 ofz#58028 Abrt Change-Id: Iaf25521993ddf7269ca34bb3740d00432e615795 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150444 Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 8dce1212c929..688f6d01fb69 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2461,10 +2461,10 @@ bool SwWW8ImplReader::IsDropCap() const namespace { -bool IsFlySplitAllowed() +bool IsFlySplitAllowed(bool bFuzzing) { - bool bRet - = officecfg::Office::Writer::Filter::Import::DOC::ImportFloatingTableAsSplitFly::get(); + bool bRet = bFuzzing || + officecfg::Office::Writer::Filter::Import::DOC::ImportFloatingTableAsSplitFly::get(); if (!bRet) { @@ -2508,7 +2508,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo, const WW8_TablePos *p WW8FlySet aFlySet(*this, m_xWFlyPara.get(), m_xSFlyPara.get(), false); // Always map floating tables to split flys when fly split is allowed. - if (pTabPos && pTabPos->bNoFly && !IsFlySplitAllowed()) + if (pTabPos && pTabPos->bNoFly && !IsFlySplitAllowed(m_bFuzzing)) { m_xSFlyPara->SetFlyFormat(nullptr); } @@ -2518,7 +2518,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo, const WW8_TablePos *p // removal at end of import, but check if that scenario is happening m_aExtraneousParas.remove_if_present(m_pPaM->GetPointNode().GetTextNode()); - if (pTabPos && IsFlySplitAllowed()) + if (pTabPos && IsFlySplitAllowed(m_bFuzzing)) { // Map a positioned table to a split fly. aFlySet.Put(SwFormatFlySplit(true));