https://bugs.documentfoundation.org/show_bug.cgi?id=149424
--- Comment #14 from Julien Nabet <[email protected]> --- (In reply to Timur from comment #12) > Here is a bibisect in 6.2. Julien please verify. > > source sha:7ed962571df02d1d7b286e7af534fadd717a8003 > prev sha:66f633086e2cf0c814df04627bff810d08e73329 > > author Patrick Jaap <[email protected]> 2019-01-23 > committer Miklos Vajna <[email protected]> 2019-02-11 > 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. Trying to revert this with: diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 88f0687de8c1..d51a686bed4a 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -799,6 +799,7 @@ bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // #i13832#, #i24135# wrap around objects in page header ( !pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) && nullptr != ( pHeader = pTmp->FindFooterOrHeader() ) && + !pHeader->IsFooterFrame() && m_pCurrFrame->IsInDocBody()))) { if( pHeader || RndStdIds::FLY_AT_FLY == rNewA.GetAnchorId() ) diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index d0c42576202e..b4ef84d70cc1 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -1186,6 +1186,7 @@ void DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag rParaProp.m_rPropertySet->setPropertyValue( "FillStyle", uno::Any(drawing::FillStyle_SOLID) ); } } + else if (!m_rDMapper_Impl.IsInHeaderFooter()) // FIXME: tdf#116989 floating objects anchored else { // apply style setting only on text portions without direct modification of it it still doesn't work for 149424 UNA-AGOSTO.doc and 149424 UNA-CIGA.doc but seems to work for 149424 UNA-EI.doc At least, it opens and doesn't lag too much when scrolling even if there are these kind of logs: warn:sw.core:42443:42443:sw/source/core/view/vdraw.cxx:246: Trying to move anchor from invalid page - fix layouting! warn:legacy.osl:42443:42443:vcl/source/outdev/bitmap.cxx:249: CopyBits with zero or negative width or height -- You are receiving this mail because: You are the assignee for the bug.
