[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/layout/wsfrm.cxx |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 92d026269df0d6eb7a20000aaa5502c0bf2b495e
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Apr 21 21:01:20 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Apr 22 09:05:33 2021 +0200

    Replace magic numbers in SwFrame::UpdateAttrFrame()
    
    By using the same SwFrameInvFlags constants that
    SwFrame::SwClientNotify() already does.
    
    Change-Id: I029006f95758bd91515ecc59ae02b28396a57d0d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114453
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 579ed1f5df47..ca8cc3c8ef9b 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -538,29 +538,32 @@ void SwFrame::UpdateAttrFrame( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
         case RES_LR_SPACE:
         case RES_UL_SPACE:
         case RES_RTL_GUTTER:
-            rInvFlags |= static_cast<SwFrameInvFlags>(0x0B);
+            rInvFlags |= SwFrameInvFlags::InvalidatePrt | SwFrameInvFlags::InvalidateSize
+                         | SwFrameInvFlags::SetCompletePaint;
             break;
 
         case RES_HEADER_FOOTER_EAT_SPACING:
-            rInvFlags |= static_cast<SwFrameInvFlags>(0x03);
+            rInvFlags |= SwFrameInvFlags::InvalidatePrt | SwFrameInvFlags::InvalidateSize;
             break;
 
         case RES_BACKGROUND:
         case RES_BACKGROUND_FULL_SIZE:
-            rInvFlags |= static_cast<SwFrameInvFlags>(0x28);
+            rInvFlags |= SwFrameInvFlags::SetCompletePaint | SwFrameInvFlags::NextSetCompletePaint;
             break;
 
         case RES_KEEP:
-            rInvFlags |= static_cast<SwFrameInvFlags>(0x04);
+            rInvFlags |= SwFrameInvFlags::InvalidatePos;
             break;
 
         case RES_FRM_SIZE:
             ReinitializeFrameSizeAttrFlags();
-            rInvFlags |= static_cast<SwFrameInvFlags>(0x13);
+            rInvFlags |= SwFrameInvFlags::InvalidatePrt | SwFrameInvFlags::InvalidateSize
+                         | SwFrameInvFlags::NextInvalidatePos;
             break;
 
         case RES_FMT_CHG:
-            rInvFlags |= static_cast<SwFrameInvFlags>(0x0F);
+            rInvFlags |= SwFrameInvFlags::InvalidatePrt | SwFrameInvFlags::InvalidateSize
+                         | SwFrameInvFlags::InvalidatePos | SwFrameInvFlags::SetCompletePaint;
             break;
 
         case RES_ROW_SPLIT:
@@ -586,7 +589,8 @@ void SwFrame::UpdateAttrFrame( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             // the new FillStyle has to do the same as previous RES_BACKGROUND
             if(nWhich >= XATTR_FILL_FIRST && nWhich <= XATTR_FILL_LAST)
             {
-                rInvFlags |= static_cast<SwFrameInvFlags>(0x28);
+                rInvFlags
+                    |= SwFrameInvFlags::SetCompletePaint | SwFrameInvFlags::NextSetCompletePaint;
             }
             /* do Nothing */;
     }