core.git: sw/source

[Xisco Fauli (via logerrit)]

 sw/source/core/layout/fly.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 61cb7921a09cffb4f95b36985ecd8acc083b8138
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Jan 10 09:34:27 2025 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jan 10 11:26:17 2025 +0100

    sw: silence C6011 warning
    
    C: 
/cygwin64/home/tdf/jenkins/workspace/gerrit_windows/sw/source/core/layout/fly.cxx(1337):
 error C2220: the following warning is treated as an error
    C:     Change-Id: If50b0dfb63fe241c46577fa0f7afce1597ec73cb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180063
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Jenkins

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 60317b17ec28..6464432dcc7b 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1309,19 +1309,20 @@ void SwFlyFrame::UpdateAttrForFormatChange( SwFormat 
*pOldFormat, SwFormat *pNew
             nId = rIDDMA.GetHeavenId();
         GetVirtDrawObj()->SetLayer( nId );
 
-        if ( Lower() )
+        SwFrame* pFrame = Lower();
+        if ( pFrame )
         {
             // Delete contour in the Node if necessary
-            if( Lower()->IsNoTextFrame() &&
+            if( pFrame->IsNoTextFrame() &&
                  !GetFormat()->GetSurround().IsContour() )
             {
-                SwNoTextNode *pNd = 
static_cast<SwNoTextNode*>(static_cast<SwNoTextFrame*>(Lower())->GetNode());
+                SwNoTextNode *pNd = 
static_cast<SwNoTextNode*>(static_cast<SwNoTextFrame*>(pFrame)->GetNode());
                 if ( pNd->HasContour() )
                     pNd->SetContour( nullptr );
             }
-            else if( !Lower()->IsColumnFrame() )
+            else if( !pFrame->IsColumnFrame() )
             {
-                SwFrame* pFrame = GetLastLower();
+                pFrame = GetLastLower();
                 if( pFrame->IsTextFrame() && 
static_cast<SwTextFrame*>(pFrame)->IsUndersized() )
                     pFrame->Prepare( PrepareHint::AdjustSizeWithoutFormatting 
);
             }