core.git: Branch 'libreoffice-25-2' - sw/source

[Oliver Specht (via logerrit)]

 sw/source/core/layout/fly.cxx |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit ee83fe311481765d43724fbaab5a47b8ce66ec3f
Author:     Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Tue Mar 4 15:53:01 2025 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Mar 11 14:04:22 2025 +0100

    tdf#165064 fix regression from tdf#161233
    
    Change-Id: I07953d4569542774c8012b879f3894e7da61e0ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182487
    Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Tested-by: Jenkins
    (cherry picked from commit bf557f6c181578e1e89f63e502aae3eed1880af1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182722
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index e3811b134c4c..f174143288e7 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -443,16 +443,6 @@ void SwFlyFrame::InitDrawObj(SwFrame& rAnchorFrame)
         if (!rAnchorFrame.FindFooterOrHeader())
             nHellId = rIDDMA.GetHeaderFooterHellId();
     }
-    bool bNoClippingWithWrapPolygon = 
rIDSA.get(DocumentSettingId::NO_CLIPPING_WITH_WRAP_POLYGON);
-    if (bNoClippingWithWrapPolygon && isOpaque)
-    {
-        if (GetFrameFormat()->GetSurround().IsContour())
-        {
-            GetVirtDrawObj()->SetLayer(nHellId);
-            return;
-        }
-
-    }
     GetVirtDrawObj()->SetLayer( isOpaque ? nHeavenId :nHellId );
 }