sw: prefix members of SwCrsrMoveState

Change-Id: Iad3c970b263b8ee847cf6a7d2e05c5336cad9b26

3 files changed, 43 insertions, 43 deletions

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index ca3a46a89a44..8e5a44e02999 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -741,7 +741,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
     Point & rAktCrsrPt = pCrsr->GetPtPos();
     SwCrsrMoveState aTmpState( IsTableMode() ? MV_TBLSEL :
                                     bOnlyText ?  MV_SETONLYTEXT : MV_NONE );
-    aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
+    aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
 
     SwTextNode * pTextNd = pCrsr->GetNode().GetTextNode();
 
@@ -750,11 +750,11 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
         !pCrsr->HasMark() &&
         pTextNd->HasVisibleNumberingOrBullet() )
     {
-        aTmpState.bInFrontOfLabel = true; // #i27615#
+        aTmpState.m_bInFrontOfLabel = true; // #i27615#
     }
     else
     {
-        aTmpState.bInFrontOfLabel = false;
+        aTmpState.m_bInFrontOfLabel = false;
     }
 
     int bRet = CRSR_POSOLD |
@@ -762,11 +762,11 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
                     ? 0 : CRSR_POSCHG );
 
     const bool bOldInFrontOfLabel = IsInFrontOfLabel();
-    const bool bNewInFrontOfLabel = aTmpState.bInFrontOfLabel;
+    const bool bNewInFrontOfLabel = aTmpState.m_bInFrontOfLabel;
 
-    pCrsr->SetCrsrBidiLevel( aTmpState.nCursorBidiLevel );
+    pCrsr->SetCrsrBidiLevel( aTmpState.m_nCursorBidiLevel );
 
-    if( MV_RIGHTMARGIN == aTmpState.eState )
+    if( MV_RIGHTMARGIN == aTmpState.m_eState )
         m_eMvState = MV_RIGHTMARGIN;
     // is the new position in header or footer?
     SwFrm* pFrm = lcl_IsInHeaderFooter( aPos.nNode, aPt );
@@ -976,7 +976,7 @@ bool SwCrsrShell::ChgCurrPam(
     Point aPt( rPt );
 
     SwCrsrMoveState aTmpState( MV_NONE );
-    aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
+    aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
     if ( !GetLayout()->GetCrsrOfst( &aPtPos, aPt, &aTmpState ) && bTstHit )
         return false;
 
@@ -1338,7 +1338,7 @@ void SwCrsrShell::UpdateCrsrPos()
     if( isInHiddenTextFrm(pShellCrsr) )
     {
         SwCrsrMoveState aTmpState( MV_NONE );
-        aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
+        aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
         GetLayout()->GetCrsrOfst( pShellCrsr->GetPoint(), pShellCrsr->GetPtPos(),
                                      &aTmpState );
         pShellCrsr->DeleteMark();
@@ -1537,11 +1537,11 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             }
 
             SwCrsrMoveState aTmpState( MV_NONE );
-            aTmpState.bRealHeight = true;
+            aTmpState.m_bRealHeight = true;
             if( !pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint(), &aTmpState ) )
             {
                 Point aCentrPt( m_aCharRect.Center() );
-                aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
+                aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
                 pTableFrm->GetCrsrOfst( m_pTableCrsr->GetPoint(), aCentrPt, &aTmpState );
                 bool const bResult =
                     pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint() );
@@ -1577,7 +1577,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             if( m_bSVCrsrVis )
             {
                 m_aCrsrHeight.setX(0);
-                m_aCrsrHeight.setY(aTmpState.aRealHeight.getY() < 0 ?
+                m_aCrsrHeight.setY(aTmpState.m_aRealHeight.getY() < 0 ?
                                   -m_aCharRect.Width() : m_aCharRect.Height());
                 m_pVisCrsr->Show(); // show again
             }
@@ -1747,17 +1747,17 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         } while( bAgainst );
 
         SwCrsrMoveState aTmpState( m_eMvState );
-        aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
-        aTmpState.bRealHeight = true;
-        aTmpState.bRealWidth = IsOverwriteCrsr();
-        aTmpState.nCursorBidiLevel = pShellCrsr->GetCrsrBidiLevel();
+        aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
+        aTmpState.m_bRealHeight = true;
+        aTmpState.m_bRealWidth = IsOverwriteCrsr();
+        aTmpState.m_nCursorBidiLevel = pShellCrsr->GetCrsrBidiLevel();
 
         // #i27615#,#i30453#
         SwSpecialPos aSpecialPos;
         aSpecialPos.nExtendRange = SwSPExtendRange::BEFORE;
         if (pShellCrsr->IsInFrontOfLabel())
         {
-            aTmpState.pSpecialPos = &aSpecialPos;
+            aTmpState.m_pSpecialPos = &aSpecialPos;
         }
 
         ++mnStartAction; // tdf#91602 prevent recursive Action!
@@ -1770,11 +1770,11 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         --mnStartAction;
 
         if( !pShellCrsr->HasMark() )
-            m_aCrsrHeight = aTmpState.aRealHeight;
+            m_aCrsrHeight = aTmpState.m_aRealHeight;
         else
         {
             m_aCrsrHeight.setX(0);
-            m_aCrsrHeight.setY(aTmpState.aRealHeight.getY() < 0 ?
+            m_aCrsrHeight.setY(aTmpState.m_aRealHeight.getY() < 0 ?
                               -m_aCharRect.Width() : m_aCharRect.Height());
         }
 
@@ -2364,8 +2364,8 @@ bool SwCrsrShell::SetVisCrsr( const Point &rPt )
     Point aPt( rPt );
     SwPosition aPos( *m_pCurCrsr->GetPoint() );
     SwCrsrMoveState aTmpState( MV_SETONLYTEXT );
-    aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
-    aTmpState.bRealHeight = true;
+    aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
+    aTmpState.m_bRealHeight = true;
 
     const bool bRet = GetLayout()->GetCrsrOfst( &aPos, aPt /*, &aTmpState*/ );
 
@@ -2401,8 +2401,8 @@ bool SwCrsrShell::SetVisCrsr( const Point &rPt )
     }
 
     {
-        if( aTmpState.bRealHeight )
-            m_aCrsrHeight = aTmpState.aRealHeight;
+        if( aTmpState.m_bRealHeight )
+            m_aCrsrHeight = aTmpState.m_aRealHeight;
         else
         {
             m_aCrsrHeight.setX(0);
@@ -2985,7 +2985,7 @@ bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
         if( !pCNd || !pCNd->getLayoutFrm( GetLayout(), 0, 0, false) )
         {
             SwCrsrMoveState aTmpState( MV_NONE );
-            aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
+            aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
             GetLayout()->GetCrsrOfst( m_pCurCrsr->GetPoint(), m_pCurCrsr->GetPtPos(),
                                         &aTmpState );
         }
@@ -3100,7 +3100,7 @@ short SwCrsrShell::GetTextDirection( const Point* pPt ) const
     if( pPt )
     {
         SwCrsrMoveState aTmpState( MV_NONE );
-        aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
+        aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
 
         GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
     }
@@ -3464,7 +3464,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
     Point aPt( rPt );
     SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
     SwSpecialPos aSpecialPos;
-    eTmpState.pSpecialPos = &aSpecialPos;
+    eTmpState.m_pSpecialPos = &aSpecialPos;
     SwTextNode *pNode;
     const SwWrongList *pSmartTagList;
 
@@ -3484,7 +3484,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             if ( pSubList )
             {
                 pSmartTagList = pSubList;
-                nCurrent = eTmpState.pSpecialPos->nCharOfst;
+                nCurrent = eTmpState.m_pSpecialPos->nCharOfst;
             }
 
             lcl_FillRecognizerData( rSmartTagTypes, rStringKeyMaps, *pSmartTagList, nCurrent );
@@ -3530,7 +3530,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             rContent = nWordStart;
             SwRect aStartRect;
             SwCrsrMoveState aState;
-            aState.bRealWidth = true;
+            aState.m_bRealWidth = true;
             SwContentNode* pContentNode = pCrsr->GetContentNode();
             SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
 
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 34d6dfb6b1b4..7158630c303d 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1131,13 +1131,13 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
         SwContentFrm *pFrm(0);
         SwTextAttr* pTextAttr;
         SwCrsrMoveState aTmpState;
-        aTmpState.bFieldInfo = true;
-        aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rContentAtPos.eContentAtPos );
-        aTmpState.bContentCheck = (SwContentAtPos::SW_CONTENT_CHECK & rContentAtPos.eContentAtPos) != 0;
-        aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
+        aTmpState.m_bFieldInfo = true;
+        aTmpState.m_bExactOnly = !( SwContentAtPos::SW_OUTLINE & rContentAtPos.eContentAtPos );
+        aTmpState.m_bContentCheck = (SwContentAtPos::SW_CONTENT_CHECK & rContentAtPos.eContentAtPos) != 0;
+        aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
 
         SwSpecialPos aSpecialPos;
-        aTmpState.pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos ) ?
+        aTmpState.m_pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos ) ?
                                 &aSpecialPos : 0;
 
         const bool bCrsrFoundExact = GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
@@ -1164,20 +1164,20 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
         else if( pTextNd
                  && SwContentAtPos::SW_NUMLABEL & rContentAtPos.eContentAtPos)
         {
-            bRet = aTmpState.bInNumPortion;
+            bRet = aTmpState.m_bInNumPortion;
             rContentAtPos.aFnd.pNode = pTextNd;
 
-            Size aSizeLogic(aTmpState.nInNumPostionOffset, 0);
+            Size aSizeLogic(aTmpState.m_nInNumPostionOffset, 0);
             Size aSizePixel = GetWin()->LogicToPixel(aSizeLogic);
             rContentAtPos.nDist = aSizePixel.Width();
         }
         else if( bCrsrFoundExact && pTextNd )
         {
-            if( !aTmpState.bPosCorr )
+            if( !aTmpState.m_bPosCorr )
             {
                 if ( !bRet
                      && SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos
-                     && !aTmpState.bFootnoteNoInfo )
+                     && !aTmpState.m_bFootnoteNoInfo )
                 {
                     const SwWrongList* pSmartTagList = pTextNd->GetSmartTags();
                     sal_Int32 nCurrent = aPos.nContent.GetIndex();
@@ -1190,7 +1190,7 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         const SwWrongList* pSubList = pSmartTagList->SubList( nIndex );
                         if ( pSubList )
                         {
-                            nCurrent = aTmpState.pSpecialPos->nCharOfst;
+                            nCurrent = aTmpState.m_pSpecialPos->nCharOfst;
 
                             if ( pSubList->InWrongWord( nCurrent, nLen ) )
                                 bRet = true;
@@ -1221,7 +1221,7 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                 if ( !bRet
                      && ( SwContentAtPos::SW_FIELD | SwContentAtPos::SW_CLICKFIELD ) & rContentAtPos.eContentAtPos
-                     && !aTmpState.bFootnoteNoInfo )
+                     && !aTmpState.m_bFootnoteNoInfo )
                 {
                     pTextAttr = pTextNd->GetFieldTextAttrAt( aPos.nContent.GetIndex() );
                     const SwField* pField = pTextAttr != NULL
@@ -1288,7 +1288,7 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                 if( !bRet && SwContentAtPos::SW_FTN & rContentAtPos.eContentAtPos )
                 {
-                    if( aTmpState.bFootnoteNoInfo )
+                    if( aTmpState.m_bFootnoteNoInfo )
                     {
                         // over the footnote's char
                         bRet = true;
@@ -1341,7 +1341,7 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                 if( !bRet
                     && ( SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK ) & rContentAtPos.eContentAtPos
-                    && !aTmpState.bFootnoteNoInfo )
+                    && !aTmpState.m_bFootnoteNoInfo )
                 {
                     pTextAttr = 0;
                     if( SwContentAtPos::SW_TOXMARK & rContentAtPos.eContentAtPos )
@@ -1407,7 +1407,7 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                 if ( !bRet
                      && SwContentAtPos::SW_INETATTR & rContentAtPos.eContentAtPos
-                     && !aTmpState.bFootnoteNoInfo )
+                     && !aTmpState.m_bFootnoteNoInfo )
                 {
                     pTextAttr = pTextNd->GetTextAttrAt(
                             aPos.nContent.GetIndex(), RES_TXTATR_INETFMT);
@@ -1493,7 +1493,7 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             pF = pF->GetUpper();
                     }
 
-                    if( aTmpState.bPosCorr )
+                    if( aTmpState.m_bPosCorr )
                     {
                         if( pF && !pF->Frm().IsInside( aPt ))
                             pF = 0;
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 188399bcae66..e675a20e0aeb 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1851,7 +1851,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
                 // try to position the cursor at half of the char-rect's height
                 pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
                 SwCrsrMoveState eTmpState( MV_UPDOWN );
-                eTmpState.bSetInReadOnly = bInReadOnly;
+                eTmpState.m_bSetInReadOnly = bInReadOnly;
                 SwRect aTmpRect;
                 pFrm->GetCharRect( aTmpRect, *GetPoint(), &eTmpState );
                 if ( pFrm->IsVertical() )