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

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Fri May 14 06:46:38 UTC 2021


 sw/source/core/layout/sectfrm.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2a60c2b7d0f126841420aa6b23dde5b9a795d4fa
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu May 13 21:01:51 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri May 14 08:46:02 2021 +0200

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

diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index a8c585fb30f8..079e7de2b264 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2648,9 +2648,9 @@ void SwSectionFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pN
                           ( bChgEndn != IsEndnAtEnd() ) ||
                           ( bChgMyEndn != IsEndnoteAtMyEnd() );
                 ChgColumns( aCol, rNewCol, bChgFootnote );
-                rInvFlags |= static_cast<SwSectionFrameInvFlags>(0x10);
+                rInvFlags |= SwSectionFrameInvFlags::SetCompletePaint;
             }
-            rInvFlags |= static_cast<SwSectionFrameInvFlags>(0x01);
+            rInvFlags |= SwSectionFrameInvFlags::InvalidateSize;
             bClear = false;
         }
             break;
@@ -2662,7 +2662,7 @@ void SwSectionFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pN
                 if (pOld && pNew)
                 {
                     ChgColumns( *static_cast<const SwFormatCol*>(pOld), *static_cast<const SwFormatCol*>(pNew) );
-                    rInvFlags |= static_cast<SwSectionFrameInvFlags>(0x11);
+                    rInvFlags |= SwSectionFrameInvFlags::InvalidateSize | SwSectionFrameInvFlags::SetCompletePaint;
                 }
             }
             break;
@@ -2676,7 +2676,7 @@ void SwSectionFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pN
                 {
                     const SwFormatCol& rNewCol = GetFormat()->GetCol();
                     ChgColumns( rNewCol, rNewCol, true );
-                    rInvFlags |= static_cast<SwSectionFrameInvFlags>(0x01);
+                    rInvFlags |= SwSectionFrameInvFlags::InvalidateSize;
                 }
             }
             break;
@@ -2691,12 +2691,12 @@ void SwSectionFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pN
                 {
                     const SwFormatCol& rNewCol = GetFormat()->GetCol();
                     ChgColumns( rNewCol, rNewCol, true );
-                    rInvFlags |= static_cast<SwSectionFrameInvFlags>(0x01);
+                    rInvFlags |= SwSectionFrameInvFlags::InvalidateSize;
                 }
             }
             break;
         case RES_COLUMNBALANCE:
-            rInvFlags |= static_cast<SwSectionFrameInvFlags>(0x01);
+            rInvFlags |= SwSectionFrameInvFlags::InvalidateSize;
             break;
 
         case RES_FRAMEDIR :


More information about the Libreoffice-commits mailing list