sw/source/core/inc/flyfrms.hxx | 1 + sw/source/core/layout/pagechg.cxx | 5 +++++ 2 files changed, 6 insertions(+)
New commits: commit cb288cdceb053d3d7aee52464fff8b34651eec51 Author: Michael Stahl <[email protected]> AuthorDate: Tue Apr 20 12:45:36 2021 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Wed May 19 10:49:19 2021 +0200 tdf#138785 sw: fix mis-positioned as-char flys when deleting empty page When SwFrame::CheckPageDescs() deletes an empty page in the middle of the document, which happens during SetRedlineFlags() here, the SwFlyInContentFrame::maFrameArea is moved in lcl_MoveAllLowers(), but the SwFlyInContentFrame::m_aRefPoint stays unchanged. Because the formatting occurs only after the redline mode is reset, the position of the SwFlyInContentFrame when it is formatted is exactly the same as its (stale) m_aRefPoint, so the setting of (updated) maFrameArea is skipped in SwAsCharAnchoredObjectPosition::CalcPosition(), so the fly ends up a page above where it should be. So keep m_aRefPoint consistent with maFrameArea in lcl_MoveAllLowers(). (regression from b9ef71476fd70bc13f50ebe80390e0730d1b7afb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114332 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit e656cf2a71e738c282abcd0d610e724b955f274a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114520 Reviewed-by: Thorsten Behrens <[email protected]> (cherry picked from commit c79b92edfb5e650fff76688998cf4f0bbd08d2a4) Change-Id: If1b421daa0d71718d89d9772f5c0d9e367e76845 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115764 Tested-by: Michael Stahl <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index b67d2934315f..04b505ddd548 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -228,6 +228,7 @@ public: //see layact.cxx void AddRefOfst( long nOfst ) { aRef.AdjustY( nOfst ); } + void AddRefOfst(Point const& rOfst) { aRef += rOfst; } // #i26791# virtual void MakeObjPos() override; diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 0f97c40a9da0..02d8ec499e3f 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -2003,6 +2003,11 @@ static void lcl_MoveAllLowerObjs( SwFrame* pFrame, const Point& rOffset ) { SwFlyFrame* pFlyFrame( static_cast<SwFlyFrame*>(pAnchoredObj) ); lcl_MoveAllLowers( pFlyFrame, rOffset ); + // tdf#138785 update position specific to as-char flys + if (pFlyFrame->IsFlyInContentFrame()) + { + static_cast<SwFlyInContentFrame*>(pFlyFrame)->AddRefOfst(rOffset); + } pFlyFrame->NotifyDrawObj(); // --> let the active embedded object be moved SwFrame* pLower = pFlyFrame->Lower(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
