From e8260df1d67baf807771cd5c740164a227856515 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 20 Oct 2016 11:42:50 +0200
Subject: loplugin:expandablemethodds in sw(part2)

Change-Id: Idc2118899a8063099b66c0f5db40d8402db063d1
Reviewed-on: https://gerrit.libreoffice.org/30083
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sw/source/core/layout/layact.cxx  | 4 ++--
 sw/source/core/layout/pagechg.cxx | 4 ++--
 sw/source/core/layout/ssfrm.cxx   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sw/source/core/layout')

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 54ce00bb4d52..152410bed34f 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -85,8 +85,8 @@
 void SwLayAction::CheckWaitCursor()
 {
     RESCHEDULE
-    if ( !IsWait() && IsWaitAllowed() && IsPaint() &&
-         ((std::clock() - GetStartTicks()) * 1000 / CLOCKS_PER_SEC >= CLOCKS_PER_SEC/2) )
+    if ( !m_pWait && IsWaitAllowed() && IsPaint() &&
+         ((std::clock() - m_nStartTicks) * 1000 / CLOCKS_PER_SEC >= CLOCKS_PER_SEC/2) )
     {
         m_pWait = new SwWait( *m_pRoot->GetFormat()->GetDoc()->GetDocShell(), true );
     }
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 0257f12721e5..8405280e5169 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -828,7 +828,7 @@ void SwPageFrame::Cut()
     {
         while ( pPg )
         {
-            pPg->DecrPhyPageNum();  //inline --nPhyPageNum
+            --pPg->m_nPhyPageNum;
             pPg = static_cast<SwPageFrame*>(pPg->GetNext());
         }
     }
@@ -867,7 +867,7 @@ void SwPageFrame::Paste( SwFrame* pParent, SwFrame* pSibling )
     {
         while ( pPg )
         {
-            pPg->IncrPhyPageNum();  //inline ++nPhyPageNum
+            ++pPg->m_nPhyPageNum;
             pPg->InvalidatePos_();
             pPg->InvalidateLayout();
             pPg = static_cast<SwPageFrame*>(pPg->GetNext());
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index ecab038e80da..1898c05a2d29 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -191,11 +191,11 @@ void SwFrame::SetRightLeftMargins( long nRight, long nLeft)
 /// checks the layout direction and invalidates the lower frames recursively, if necessary.
 void SwFrame::CheckDirChange()
 {
-    bool bOldVert = GetVerticalFlag();
+    bool bOldVert = mbVertical;
     bool bOldRev = IsReverse();
-    bool bOldR2L = GetRightToLeftFlag();
+    bool bOldR2L = mbRightToLeft;
     SetInvalidVert( true );
-    SetInvalidR2L( true );
+    mbInvalidR2L = true;
     bool bChg = bOldR2L != IsRightToLeft();
     bool bOldVertL2R = IsVertLR();
     if( ( IsVertical() != bOldVert ) || bChg || IsReverse() != bOldRev || bOldVertL2R != IsVertLR() )
-- 
cgit v1.2.3