sw/source/core/layout/wsfrm.cxx | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
New commits:
commit b24861a988fc2311cd873aa74d63afac9c5859ab
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu May 27 20:33:24 2021 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri May 28 09:00:16 2021 +0200
Replace magic numbers in SwContentFrame::UpdateAttr_()
By using the same SwContentFrameInvFlags constants that
SwContentFrame::SwClientNotify() already does.
Change-Id: Ic22d53c886bb9d28d0250ed5e43d804417d516f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116271
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 90f80ba4be31..27c9c6f5049d 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2416,13 +2416,20 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem*
pOld, const SfxPoolItem* pN
switch ( nWhich )
{
case RES_FMT_CHG:
- rInvFlags = static_cast<SwContentFrameInvFlags>(0xFF);
+ rInvFlags = SwContentFrameInvFlags::SetCompletePaint
+ | SwContentFrameInvFlags::InvalidatePos
+ | SwContentFrameInvFlags::InvalidateSize
+ | SwContentFrameInvFlags::InvalidateSectPrt
+ | SwContentFrameInvFlags::InvalidateNextPrt
+ | SwContentFrameInvFlags::InvalidatePrevPrt
+ | SwContentFrameInvFlags::InvalidateNextPos
+ | SwContentFrameInvFlags::SetNextCompletePaint;
[[fallthrough]];
case RES_PAGEDESC: //attribute changes (on/off)
if ( IsInDocBody() && !IsInTab() )
{
- rInvFlags |= static_cast<SwContentFrameInvFlags>(0x02);
+ rInvFlags |= SwContentFrameInvFlags::InvalidatePos;
SwPageFrame *pPage = FindPageFrame();
if ( !GetPrev() )
CheckPageDescs( pPage );
@@ -2466,7 +2473,7 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem*
pOld, const SfxPoolItem* pN
GetIndNext()->InvalidateObjs();
}
Prepare( PrepareHint::ULSpaceChanged ); //TextFrame has to
correct line spacing.
- rInvFlags |= static_cast<SwContentFrameInvFlags>(0x80);
+ rInvFlags |= SwContentFrameInvFlags::SetNextCompletePaint;
[[fallthrough]];
}
case RES_LR_SPACE:
@@ -2476,17 +2483,17 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem*
pOld, const SfxPoolItem* pN
Prepare( PrepareHint::FixSizeChanged );
SwModify aMod;
SwFrame::SwClientNotify(aMod, sw::LegacyModifyHint(pOld,
pNew));
- rInvFlags |= static_cast<SwContentFrameInvFlags>(0x30);
+ rInvFlags |= SwContentFrameInvFlags::InvalidateNextPrt |
SwContentFrameInvFlags::InvalidatePrevPrt;
break;
}
case RES_BREAK:
{
- rInvFlags |= static_cast<SwContentFrameInvFlags>(0x42);
+ rInvFlags |= SwContentFrameInvFlags::InvalidatePos |
SwContentFrameInvFlags::InvalidateNextPos;
const IDocumentSettingAccess& rIDSA =
GetUpper()->GetFormat()->getIDocumentSettingAccess();
if( rIDSA.get(DocumentSettingId::PARA_SPACE_MAX) ||
rIDSA.get(DocumentSettingId::PARA_SPACE_MAX_AT_PAGES) )
{
- rInvFlags |= static_cast<SwContentFrameInvFlags>(0x1);
+ rInvFlags |= SwContentFrameInvFlags::SetCompletePaint;
SwFrame* pNxt = FindNext();
if( pNxt )
{
@@ -2511,7 +2518,7 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem*
pOld, const SfxPoolItem* pN
// OD 2004-02-26 #i25029#
case RES_PARATR_CONNECT_BORDER:
{
- rInvFlags |= static_cast<SwContentFrameInvFlags>(0x01);
+ rInvFlags |= SwContentFrameInvFlags::SetCompletePaint;
if ( IsTextFrame() )
{
InvalidateNextPrtArea();
@@ -2534,11 +2541,11 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem*
pOld, const SfxPoolItem* pN
case RES_CHRATR_ESCAPEMENT:
case RES_CHRATR_CONTOUR:
case RES_PARATR_NUMRULE:
- rInvFlags |= static_cast<SwContentFrameInvFlags>(0x01);
+ rInvFlags |= SwContentFrameInvFlags::SetCompletePaint;
break;
case RES_FRM_SIZE:
- rInvFlags |= static_cast<SwContentFrameInvFlags>(0x01);
+ rInvFlags |= SwContentFrameInvFlags::SetCompletePaint;
[[fallthrough]];
default:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
