sw: prefix members of SwTableCursor

Change-Id: Ib53119f01a97f2fb2e277a0b949465e4de9928b7

sw/inc/swcrsr.hxx

@@ -226,10 +226,11 @@ public:
 **/
 class SwCrsrSaveState
 {
-    SwCursor& rCrsr;
+private:
+    SwCursor& m_rCrsr;
 public:
-    SwCrsrSaveState( SwCursor& rC ) : rCrsr( rC ) { rC.SaveState(); }
-    ~SwCrsrSaveState() { rCrsr.RestoreState(); }
+    SwCrsrSaveState( SwCursor& rC ) : m_rCrsr( rC ) { rC.SaveState(); }
+    ~SwCrsrSaveState() { m_rCrsr.RestoreState(); }
 };
 
 // internal, used by SwCursor::SaveState() etc.
@@ -253,12 +254,13 @@ class SwTableCursor : public virtual SwCursor
 {
 
 protected:
-    sal_uLong nTblPtNd, nTblMkNd;
-    sal_Int32 nTblPtCnt;
-    sal_Int32 nTblMkCnt;
+    sal_uLong m_nTblPtNd;
+    sal_uLong m_nTblMkNd;
+    sal_Int32 m_nTblPtCnt;
+    sal_Int32 m_nTblMkCnt;
     SwSelBoxes m_SelectedBoxes;
-    bool bChg : 1;
-    bool bParked : 1;       // Table-cursor was parked.
+    bool m_bChanged : 1;
+    bool m_bParked : 1;       // Table-cursor was parked.
 
     virtual bool IsSelOvrCheck(int eFlags) SAL_OVERRIDE;
 
@@ -286,13 +288,13 @@ public:
     // Has table cursor been changed?
     bool IsCrsrMoved() const
     {
-        return  nTblMkNd != GetMark()->nNode.GetIndex() ||
-                nTblPtNd != GetPoint()->nNode.GetIndex() ||
-                nTblMkCnt != GetMark()->nContent.GetIndex() ||
-                nTblPtCnt != GetPoint()->nContent.GetIndex();
+        return  m_nTblMkNd != GetMark()->nNode.GetIndex() ||
+                m_nTblPtNd != GetPoint()->nNode.GetIndex() ||
+                m_nTblMkCnt != GetMark()->nContent.GetIndex() ||
+                m_nTblPtCnt != GetPoint()->nContent.GetIndex();
     }
 
-    bool IsChgd() const { return bChg; }
+    bool IsChgd() const { return m_bChanged; }
 
     // Park table cursor at start node of boxes.
     void ParkCrsr();

sw/source/core/crsr/swcrsr.cxx

@@ -2111,10 +2111,10 @@ void SwCursor::RestoreSavePos()
 SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
     : SwCursor( rPos, pRing, false )
 {
-    bParked = false;
-    bChg = false;
-    nTblPtNd = 0, nTblMkNd = 0;
-    nTblPtCnt = 0, nTblMkCnt = 0;
+    m_bParked = false;
+    m_bChanged = false;
+    m_nTblPtNd = 0, m_nTblMkNd = 0;
+    m_nTblPtCnt = 0, m_nTblMkCnt = 0;
 }
 
 SwTableCursor::~SwTableCursor() {}
@@ -2151,19 +2151,19 @@ lcl_SeekEntry(const SwSelBoxes& rTmp, SwStartNode const*const pSrch,
 
 SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
 {
-    if( bChg )
+    if (m_bChanged)
     {
-        if( bParked )
+        if (m_bParked)
         {
             // move back into content
             Exchange();
             Move( fnMoveForward );
             Exchange();
             Move( fnMoveForward );
-            bParked = false;
+            m_bParked = false;
         }
 
-        bChg = false;
+        m_bChanged = false;
 
         // create temporary copies so that all boxes that
         // have already cursors can be removed
@@ -2252,13 +2252,13 @@ void SwTableCursor::InsertBox( const SwTableBox& rTblBox )
 {
     SwTableBox* pBox = (SwTableBox*)&rTblBox;
     m_SelectedBoxes.insert(pBox);
-    bChg = true;
+    m_bChanged = true;
 }
 
 void SwTableCursor::DeleteBox(size_t const nPos)
 {
     m_SelectedBoxes.erase(m_SelectedBoxes.begin() + nPos);
-    bChg = true;
+    m_bChanged = true;
 }
 
 bool SwTableCursor::NewTableSelection()
@@ -2322,10 +2322,10 @@ bool SwTableCursor::IsCrsrMovedUpdt()
     if( !IsCrsrMoved() )
         return false;
 
-    nTblMkNd = GetMark()->nNode.GetIndex();
-    nTblPtNd = GetPoint()->nNode.GetIndex();
-    nTblMkCnt = GetMark()->nContent.GetIndex();
-    nTblPtCnt = GetPoint()->nContent.GetIndex();
+    m_nTblMkNd = GetMark()->nNode.GetIndex();
+    m_nTblPtNd = GetPoint()->nNode.GetIndex();
+    m_nTblMkCnt = GetMark()->nContent.GetIndex();
+    m_nTblPtCnt = GetPoint()->nContent.GetIndex();
     return true;
 }
 
@@ -2345,8 +2345,8 @@ void SwTableCursor::ParkCrsr()
     GetMark()->nNode = *pNd;
     GetMark()->nContent.Assign( 0, 0 );
 
-    bChg = true;
-    bParked = true;
+    m_bChanged = true;
+    m_bParked = true;
 }
 
 bool SwTableCursor::HasReadOnlyBoxSel() const

sw/source/core/crsr/viscrs.cxx

@@ -710,7 +710,7 @@ void SwShellTableCrsr::SaveTblBoxCntnt( const SwPosition* pPos )
 void SwShellTableCrsr::FillRects()
 {
     // Calculate the new rectangles. If the cursor is still "parked" do nothing
-    if (m_SelectedBoxes.empty() || bParked || !GetPoint()->nNode.GetIndex())
+    if (m_SelectedBoxes.empty() || m_bParked || !GetPoint()->nNode.GetIndex())
         return;
 
     bool bStart = true;
@@ -779,7 +779,7 @@ void SwShellTableCrsr::FillStartEnd(SwRect& rStart, SwRect& rEnd) const
 bool SwShellTableCrsr::IsInside( const Point& rPt ) const
 {
     // Calculate the new rectangles. If the cursor is still "parked" do nothing
-    if (m_SelectedBoxes.empty() || bParked || !GetPoint()->nNode.GetIndex())
+    if (m_SelectedBoxes.empty() || m_bParked || !GetPoint()->nNode.GetIndex())
         return false;
 
     SwNodes& rNds = GetDoc()->GetNodes();