sw/source/core/text/txtfly.cxx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
New commits: commit 56d01e3f9de146f4fc279b8c58f8c1450323f408 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Wed Oct 11 11:15:24 2023 +0100 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Wed Oct 11 18:17:16 2023 +0200 both branches set mpAnchoredObjList the same Change-Id: I0a41bc4cee141b2a375be3d84f67367ef8d7a2c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157820 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index a290ac4d2010..6028af382c7b 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -887,11 +887,11 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList() m_bOn = false; + // #i68520# + mpAnchoredObjList.reset(new SwAnchoredObjList); + if( nCount && bWrapAllowed ) { - // #i68520# - mpAnchoredObjList.reset(new SwAnchoredObjList ); - SwRect const aRect(GetFrameArea()); // Make ourselves a little smaller than we are, // so that 1-Twip-overlappings are ignored (#49532) @@ -980,11 +980,6 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList() m_nMinBottom = nMax; } } - else - { - // #i68520# - mpAnchoredObjList.reset( new SwAnchoredObjList ); - } // #i68520# return mpAnchoredObjList.get();