sw: prefix members of SwAccessibleContext

Change-Id: Ie5cb2d9819fcb4b22b596a0ba407043d9d80db7d

6 files changed, 120 insertions, 120 deletions

diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index aee976ede35a..b52f9a476eef 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -127,7 +127,7 @@ bool SwAccessibleCell::_InvalidateMyCursorPos()
     bool bNew = IsSelected();
     bool bOld;
     {
-        osl::MutexGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( m_Mutex );
         bOld = bIsSelected;
         bIsSelected = bNew;
     }
@@ -227,7 +227,7 @@ void SwAccessibleCell::_InvalidateCursorPos()
 
 bool SwAccessibleCell::HasCursor()
 {
-    osl::MutexGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( m_Mutex );
     return bIsSelected;
 }
 
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index dd42c5244e7f..aca8c3568b5b 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -55,27 +55,27 @@ using namespace ::com::sun::star::accessibility;
 
 void SwAccessibleContext::InitStates()
 {
-    bIsShowingState = GetMap() && IsShowing( *(GetMap()) );
+    m_isShowingState = GetMap() && IsShowing( *(GetMap()) );
 
     SwViewShell *pVSh = GetMap()->GetShell();
-    bIsEditableState = pVSh && IsEditable( pVSh );
-    bIsOpaqueState = pVSh && IsOpaque( pVSh );
-    bIsDefuncState = false;
+    m_isEditableState = pVSh && IsEditable( pVSh );
+    m_isOpaqueState = pVSh && IsOpaque( pVSh );
+    m_isDefuncState = false;
 }
 
 void SwAccessibleContext::SetParent( SwAccessibleContext *pParent )
 {
-    osl::MutexGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( m_Mutex );
 
     uno::Reference < XAccessible > xParent( pParent );
-    xWeakParent = xParent;
+    m_xWeakParent = xParent;
 }
 
 uno::Reference< XAccessible > SwAccessibleContext::GetWeakParent() const
 {
-    osl::MutexGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( m_Mutex );
 
-    uno::Reference< XAccessible > xParent( xWeakParent );
+    uno::Reference< XAccessible > xParent( m_xWeakParent );
     return xParent;
 }
 
@@ -278,9 +278,9 @@ void SwAccessibleContext::Scrolled( const SwRect& rOldVisArea )
     bool bIsOldShowingState;
     bool bIsNewShowingState = IsShowing( *(GetMap()) );
     {
-        osl::MutexGuard aGuard( aMutex );
-        bIsOldShowingState = bIsShowingState;
-        bIsShowingState = bIsNewShowingState;
+        osl::MutexGuard aGuard( m_Mutex );
+        bIsOldShowingState = m_isShowingState;
+        m_isShowingState = bIsNewShowingState;
     }
 
     if( bIsOldShowingState != bIsNewShowingState )
@@ -443,8 +443,8 @@ void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent )
         rEvent.Source = xThis;
     }
 
-    if (nClientId)
-        comphelper::AccessibleEventNotifier::addEvent( nClientId, rEvent );
+    if (m_nClientId)
+        comphelper::AccessibleEventNotifier::addEvent( m_nClientId, rEvent );
 }
 
 void SwAccessibleContext::FireVisibleDataEvent()
@@ -475,11 +475,11 @@ void SwAccessibleContext::GetStates(
     SolarMutexGuard aGuard;
 
     // SHOWING
-    if( bIsShowingState )
+    if (m_isShowingState)
         rStateSet.AddState( AccessibleStateType::SHOWING );
 
     // EDITABLE
-    if( bIsEditableState )
+    if (m_isEditableState)
     //Set editable state to graphic and other object when the document is editable
     {
         rStateSet.AddState( AccessibleStateType::EDITABLE );
@@ -490,13 +490,13 @@ void SwAccessibleContext::GetStates(
     rStateSet.AddState( AccessibleStateType::ENABLED );
 
     // OPAQUE
-    if( bIsOpaqueState )
+    if (m_isOpaqueState)
         rStateSet.AddState( AccessibleStateType::OPAQUE );
 
     // VISIBLE
     rStateSet.AddState( AccessibleStateType::VISIBLE );
 
-    if( bIsDefuncState )
+    if (m_isDefuncState)
         rStateSet.AddState( AccessibleStateType::DEFUNC );
 }
 
@@ -504,27 +504,27 @@ bool SwAccessibleContext::IsEditableState()
 {
     bool bRet;
     {
-        osl::MutexGuard aGuard( aMutex );
-        bRet = bIsEditableState;
+        osl::MutexGuard aGuard( m_Mutex );
+        bRet = m_isEditableState;
     }
 
     return bRet;
 }
 
-SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM,
-                                          sal_Int16 nR,
+SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *const pMap,
+                                          sal_Int16 const nRole,
                                           const SwFrm *pF )
-    : SwAccessibleFrame( pM->GetVisArea().SVRect(), pF,
-                         pM->GetShell()->IsPreview() )
-    , pMap( pM )
-    , nClientId(0)
-    , nRole( nR )
-    , bDisposing( false )
-    , bRegisteredAtAccessibleMap( true )
+    : SwAccessibleFrame( pMap->GetVisArea().SVRect(), pF,
+                         pMap->GetShell()->IsPreview() )
+    , m_pMap( pMap )
+    , m_nClientId(0)
+    , m_nRole(nRole)
+    , m_isDisposing( false )
+    , m_isRegisteredAtAccessibleMap( true )
     //Initialize the begin document load and IfAsynLoad to true
-    , bBeginDocumentLoad( true )
+    , m_isBeginDocumentLoad( true )
     , isIfAsynLoad( true )
-    , bIsSeletedInDoc( false)
+    , m_isSelectedInDoc(false)
 {
     InitStates();
 }
@@ -550,10 +550,10 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount()
 
     CHECK_FOR_DEFUNC( XAccessibleContext )
     //Notify the frame is a document
-    if( nRole == AccessibleRole::DOCUMENT_TEXT )
+    if (m_nRole == AccessibleRole::DOCUMENT_TEXT)
         bIsAccDocUse = true;
 
-    return bDisposing ? 0 : GetChildCount( *(GetMap()) );
+    return m_isDisposing ? 0 : GetChildCount( *(GetMap()) );
 }
 
 uno::Reference< XAccessible> SAL_CALL
@@ -565,7 +565,7 @@ uno::Reference< XAccessible> SAL_CALL
     CHECK_FOR_DEFUNC( XAccessibleContext )
 
     //Notify the frame is a document
-    if( nRole == AccessibleRole::DOCUMENT_TEXT )
+    if (m_nRole == AccessibleRole::DOCUMENT_TEXT)
         bIsAccDocUse = true;
 
     const SwAccessibleChild aChild( GetChild( *(GetMap()), nIndex ) );
@@ -582,9 +582,9 @@ uno::Reference< XAccessible> SAL_CALL
     if( aChild.GetSwFrm() )
     {
         ::rtl::Reference < SwAccessibleContext > xChildImpl(
-                GetMap()->GetContextImpl( aChild.GetSwFrm(), !bDisposing )  );
+                GetMap()->GetContextImpl( aChild.GetSwFrm(), !m_isDisposing )  );
         //Send out accessible event when begin load.
-        if( bBeginDocumentLoad && nRole == AccessibleRole::DOCUMENT_TEXT )
+        if (m_isBeginDocumentLoad && m_nRole == AccessibleRole::DOCUMENT_TEXT)
         {
 
             FireStateChangedEvent( AccessibleStateType::FOCUSABLE,true );
@@ -599,7 +599,7 @@ uno::Reference< XAccessible> SAL_CALL
                 // OFFSCREEN again?
                 // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,false );
             }
-            bBeginDocumentLoad = false;
+            m_isBeginDocumentLoad = false;
         }
         if( xChildImpl.is() )
         {
@@ -611,7 +611,7 @@ uno::Reference< XAccessible> SAL_CALL
     {
         ::rtl::Reference < ::accessibility::AccessibleShape > xChildImpl(
                 GetMap()->GetContextImpl( aChild.GetDrawObject(),
-                                          this, !bDisposing )  );
+                                          this, !m_isDisposing) );
         if( xChildImpl.is() )
             xChild = xChildImpl.get();
     }
@@ -631,18 +631,18 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent()
     CHECK_FOR_DEFUNC( XAccessibleContext )
 
     const SwFrm *pUpper = GetParent();
-    OSL_ENSURE( pUpper != 0 || bDisposing, "no upper found" );
+    OSL_ENSURE( pUpper != 0 || m_isDisposing, "no upper found" );
 
     uno::Reference< XAccessible > xAcc;
     if( pUpper )
-        xAcc = GetMap()->GetContext( pUpper, !bDisposing );
+        xAcc = GetMap()->GetContext( pUpper, !m_isDisposing );
 
-    OSL_ENSURE( xAcc.is() || bDisposing, "no parent found" );
+    OSL_ENSURE( xAcc.is() || m_isDisposing, "no parent found" );
 
     // Remember the parent as weak ref.
     {
-        osl::MutexGuard aWeakParentGuard( aMutex );
-        xWeakParent = xAcc;
+        osl::MutexGuard aWeakParentGuard( m_Mutex );
+        m_xWeakParent = xAcc;
     }
 
     return xAcc;
@@ -656,14 +656,14 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent()
     CHECK_FOR_DEFUNC( XAccessibleContext )
 
     const SwFrm *pUpper = GetParent();
-    OSL_ENSURE( pUpper != 0 || bDisposing, "no upper found" );
+    OSL_ENSURE( pUpper != 0 || m_isDisposing, "no upper found" );
 
     sal_Int32 nIndex = -1;
     if( pUpper )
     {
         ::rtl::Reference < SwAccessibleContext > xAccImpl(
-            GetMap()->GetContextImpl( pUpper, !bDisposing )  );
-        OSL_ENSURE( xAccImpl.is() || bDisposing, "no parent found" );
+            GetMap()->GetContextImpl(pUpper, !m_isDisposing) );
+        OSL_ENSURE( xAccImpl.is() || m_isDisposing, "no parent found" );
         if( xAccImpl.is() )
             nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrm()) );
     }
@@ -674,7 +674,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent()
 sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole()
         throw (uno::RuntimeException, std::exception)
 {
-    return nRole;
+    return m_nRole;
 }
 
 OUString SAL_CALL SwAccessibleContext::getAccessibleDescription()
@@ -687,7 +687,7 @@ OUString SAL_CALL SwAccessibleContext::getAccessibleDescription()
 OUString SAL_CALL SwAccessibleContext::getAccessibleName()
         throw (uno::RuntimeException, std::exception)
 {
-    return sName;
+    return m_sName;
 }
 
 uno::Reference< XAccessibleRelationSet> SAL_CALL
@@ -710,7 +710,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ::utl::AccessibleStateSetHelper *pStateSet =
         new ::utl::AccessibleStateSetHelper;
 
-    if( bIsSeletedInDoc )
+    if (m_isSelectedInDoc)
         pStateSet->AddState( AccessibleStateType::SELECTED );
 
     uno::Reference<XAccessibleStateSet> xStateSet( pStateSet );
@@ -735,9 +735,9 @@ void SAL_CALL SwAccessibleContext::addAccessibleEventListener(
     if (xListener.is())
     {
         SolarMutexGuard aGuard;
-        if (!nClientId)
-            nClientId = comphelper::AccessibleEventNotifier::registerClient( );
-        comphelper::AccessibleEventNotifier::addEventListener( nClientId, xListener );
+        if (!m_nClientId)
+            m_nClientId = comphelper::AccessibleEventNotifier::registerClient( );
+        comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener );
     }
 }
 
@@ -748,15 +748,15 @@ void SAL_CALL SwAccessibleContext::removeAccessibleEventListener(
     if (xListener.is())
     {
         SolarMutexGuard aGuard;
-        sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( nClientId, xListener );
+        sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId, xListener );
         if ( !nListenerCount )
         {
             // no listeners anymore
             // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
             // and at least to us not firing any events anymore, in case somebody calls
             // NotifyAccessibleEvent, again
-            comphelper::AccessibleEventNotifier::revokeClient( nClientId );
-            nClientId = 0;
+            comphelper::AccessibleEventNotifier::revokeClient( m_nClientId );
+            m_nClientId = 0;
         }
     }
 }
@@ -1052,7 +1052,7 @@ void SwAccessibleContext::Dispose( bool bRecursive )
     OSL_ENSURE( GetMap()->GetVisArea() == GetVisArea(),
                 "invalid vis area for dispose" );
 
-    bDisposing = true;
+    m_isDisposing = true;
 
     // dispose children
     if( bRecursive )
@@ -1076,22 +1076,22 @@ void SwAccessibleContext::Dispose( bool bRecursive )
     // set defunc state (its not required to broadcast a state changed
     // event if the object is disposed afterwards)
     {
-        osl::MutexGuard aDefuncStateGuard( aMutex );
-        bIsDefuncState = true;
+        osl::MutexGuard aDefuncStateGuard( m_Mutex );
+        m_isDefuncState = true;
     }
 
     // broadcast dispose event
-    if ( nClientId )
+    if (m_nClientId)
     {
-        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, *this );
-        nClientId =  0;
+        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( m_nClientId, *this );
+        m_nClientId =  0;
     }
 
     RemoveFrmFromAccessibleMap();
     ClearFrm();
-    pMap = 0;
+    m_pMap = nullptr;
 
-    bDisposing = false;
+    m_isDisposing = false;
 }
 
 void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
@@ -1144,9 +1144,9 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
     bool bIsOldShowingState;
     bool bIsNewShowingState = IsShowing( *(GetMap()) );
     {
-        osl::MutexGuard aShowingStateGuard( aMutex );
-        bIsOldShowingState = bIsShowingState;
-        bIsShowingState = bIsNewShowingState;
+        osl::MutexGuard aShowingStateGuard( m_Mutex );
+        bIsOldShowingState = m_isShowingState;
+        m_isShowingState = bIsNewShowingState;
     }
 
     if( bIsOldShowingState != bIsNewShowingState )
@@ -1292,9 +1292,9 @@ void SwAccessibleContext::InvalidateStates( AccessibleStates _nStates )
                 bool bIsOldEditableState;
                 bool bIsNewEditableState = IsEditable( pVSh );
                 {
-                    osl::MutexGuard aGuard( aMutex );
-                    bIsOldEditableState = bIsEditableState;
-                    bIsEditableState = bIsNewEditableState;
+                    osl::MutexGuard aGuard( m_Mutex );
+                    bIsOldEditableState = m_isEditableState;
+                    m_isEditableState = bIsNewEditableState;
                 }
 
                 if( bIsOldEditableState != bIsNewEditableState )
@@ -1306,9 +1306,9 @@ void SwAccessibleContext::InvalidateStates( AccessibleStates _nStates )
                 bool bIsOldOpaqueState;
                 bool bIsNewOpaqueState = IsOpaque( pVSh );
                 {
-                    osl::MutexGuard aGuard( aMutex );
-                    bIsOldOpaqueState = bIsOpaqueState;
-                    bIsOpaqueState = bIsNewOpaqueState;
+                    osl::MutexGuard aGuard( m_Mutex );
+                    bIsOldOpaqueState = m_isOpaqueState;
+                    m_isOpaqueState = bIsNewOpaqueState;
                 }
 
                 if( bIsOldOpaqueState != bIsNewOpaqueState )
@@ -1438,7 +1438,7 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId,
 
 void SwAccessibleContext::RemoveFrmFromAccessibleMap()
 {
-    if( bRegisteredAtAccessibleMap && GetFrm() && GetMap() )
+    if (m_isRegisteredAtAccessibleMap && GetFrm() && GetMap())
         GetMap()->RemoveContext( GetFrm() );
 }
 
@@ -1489,12 +1489,12 @@ void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< vcl::Win
     }
 }
 
-bool SwAccessibleContext::SetSelectedState(bool bSeleted)
+bool SwAccessibleContext::SetSelectedState(bool const bSelected)
 {
-    if(bIsSeletedInDoc != bSeleted)
+    if (m_isSelectedInDoc != bSelected)
     {
-        bIsSeletedInDoc = bSeleted;
-        FireStateChangedEvent( AccessibleStateType::SELECTED, bSeleted );
+        m_isSelectedInDoc = bSelected;
+        FireStateChangedEvent( AccessibleStateType::SELECTED, bSelected );
         return true;
     }
     return false;
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index a609f5ccb04a..43ec362d8a6b 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -59,57 +59,57 @@ class SwAccessibleContext :
     friend class SwAccessibleSelectionHelper;
 
 protected:
-    mutable ::osl::Mutex aListenerMutex;
-    mutable ::osl::Mutex aMutex;
+    mutable ::osl::Mutex m_ListenerMutex;
+    mutable ::osl::Mutex m_Mutex;
 
 private:
-    OUString sName;  // immutable outside constructor
+    OUString m_sName;  // immutable outside constructor
 
     // The parent if it has been retrieved. This is always an
     // SwAccessibleContext. (protected by Mutex)
     ::com::sun::star::uno::WeakReference <
-        ::com::sun::star::accessibility::XAccessible > xWeakParent;
+        ::com::sun::star::accessibility::XAccessible > m_xWeakParent;
 
-    SwAccessibleMap *pMap;  // must be protected by solar mutex
+    SwAccessibleMap *m_pMap; // must be protected by solar mutex
 
-    sal_uInt32 nClientId;   // client id in the AccessibleEventNotifier queue
-    sal_Int16 nRole;        // immutable outside constructor
+    sal_uInt32 m_nClientId;  // client id in the AccessibleEventNotifier queue
+    sal_Int16 m_nRole;        // immutable outside constructor
 
     // The current states (protected by mutex)
-    bool bIsShowingState : 1;
-    bool bIsEditableState : 1;
-    bool bIsOpaqueState : 1;
-    bool bIsDefuncState : 1;
+    bool m_isShowingState : 1;
+    bool m_isEditableState : 1;
+    bool m_isOpaqueState : 1;
+    bool m_isDefuncState : 1;
 
     // Are we currently disposing that object (protected by solar mutex)?
-    bool bDisposing : 1;
+    bool m_isDisposing : 1;
 
     // #i85634# - boolean, indicating if the accessible context is
     // in general registered at the accessible map.
-    bool bRegisteredAtAccessibleMap;
+    bool m_isRegisteredAtAccessibleMap;
 
     void InitStates();
     //Add a member to identify the first time that document load
-    bool bBeginDocumentLoad;
+    bool m_isBeginDocumentLoad;
 
 protected:
-    void SetName( const OUString& rName ) { sName = rName; }
+    void SetName( const OUString& rName ) { m_sName = rName; }
     inline sal_Int16 GetRole() const
     {
-        return nRole;
+        return m_nRole;
     }
     //Add a member to identify if the document is Asyn load.
     bool isIfAsynLoad;
     //This flag is used to mark the object's selected state.
-    bool   bIsSeletedInDoc;
+    bool   m_isSelectedInDoc;
     void SetParent( SwAccessibleContext *pParent );
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetWeakParent() const;
 
-    bool IsDisposing() const { return bDisposing; }
+    bool IsDisposing() const { return m_isDisposing; }
 
     vcl::Window *GetWindow();
-    SwAccessibleMap *GetMap() { return pMap; }
-    const SwAccessibleMap *GetMap() const { return pMap; }
+    SwAccessibleMap *GetMap() { return m_pMap; }
+    const SwAccessibleMap *GetMap() const { return m_pMap; }
 
     /** convenience method to get the SwViewShell through accessibility map */
     inline SwViewShell* GetShell()
@@ -166,7 +166,7 @@ protected:
     virtual void _InvalidateFocus();
 
 public:
-    void SetMap(SwAccessibleMap *pM){pMap = pM;}
+    void SetMap(SwAccessibleMap *const pMap) { m_pMap = pMap; }
     void FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventObject& rEvent );
 
 protected:
@@ -190,14 +190,14 @@ protected:
     // #i85634#
     inline void NotRegisteredAtAccessibleMap()
     {
-        bRegisteredAtAccessibleMap = false;
+        m_isRegisteredAtAccessibleMap = false;
     }
     void RemoveFrmFromAccessibleMap();
 
     virtual ~SwAccessibleContext();
 
 public:
-    SwAccessibleContext( SwAccessibleMap *pMap, sal_Int16 nRole,
+    SwAccessibleContext( SwAccessibleMap *m_pMap, sal_Int16 nRole,
                          const SwFrm *pFrm );
 
     // XAccessible
@@ -362,7 +362,7 @@ public:
     // #i88070# - get all additional accessible children
     void GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren );
 
-    const OUString& GetName() const { return sName; }
+    const OUString& GetName() const { return m_sName; }
 
     virtual bool HasCursor();   // required by map to remember that object
 
@@ -378,7 +378,7 @@ public:
 
     //This method is used to updated the selected state and fire the selected state changed event.
     virtual bool SetSelectedState(bool bSeleted);
-    bool  IsSeletedInDoc(){  return bIsSeletedInDoc; }
+    bool  IsSeletedInDoc() { return m_isSelectedInDoc; }
 
     static OUString GetResource( sal_uInt16 nResId,
                                         const OUString *pArg1 = 0,
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index 9682e9401206..d5bb32af6ae3 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -146,7 +146,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos()
     bool bOldSelected;
 
     {
-        osl::MutexGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( m_Mutex );
         bOldSelected = bIsSelected;
         bIsSelected = bNewSelected;
     }
@@ -192,7 +192,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
         bool bSelected;
 
         {
-            osl::MutexGuard aGuard( aMutex );
+            osl::MutexGuard aGuard( m_Mutex );
             bSelected = bIsSelected;
         }
         assert(bSelected && "focus object should be selected");
@@ -204,7 +204,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
 
 bool SwAccessibleFrameBase::HasCursor()
 {
-    osl::MutexGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( m_Mutex );
     return bIsSelected;
 }
 
@@ -377,12 +377,12 @@ SwFlyFrm* SwAccessibleFrameBase::getFlyFrm() const
 
 bool SwAccessibleFrameBase::SetSelectedState( bool )
 {
-    bool bParaSeleted = GetSelectedState() || IsSelected();
+    bool bParaSelected = GetSelectedState() || IsSelected();
 
-    if(bIsSeletedInDoc != bParaSeleted)
+    if (m_isSelectedInDoc != bParaSelected)
     {
-        bIsSeletedInDoc = bParaSeleted;
-        FireStateChangedEvent( AccessibleStateType::SELECTED, bParaSeleted );
+        m_isSelectedInDoc = bParaSelected;
+        FireStateChangedEvent( AccessibleStateType::SELECTED, bParaSelected );
         return true;
     }
     return false;
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 11a8bddf55ee..46d6e0d69dea 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -71,7 +71,7 @@ void SwAccessiblePage::_InvalidateCursorPos()
     bool bOldSelected;
 
     {
-        osl::MutexGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( m_Mutex );
         bOldSelected = bIsSelected;
         bIsSelected = bNewSelected;
     }
@@ -100,7 +100,7 @@ void SwAccessiblePage::_InvalidateFocus()
         bool bSelected;
 
         {
-            osl::MutexGuard aGuard( aMutex );
+            osl::MutexGuard aGuard( m_Mutex );
             bSelected = bIsSelected;
         }
         OSL_ENSURE( bSelected, "focus object should be selected" );
@@ -132,7 +132,7 @@ SwAccessiblePage::~SwAccessiblePage()
 
 bool SwAccessiblePage::HasCursor()
 {
-    osl::MutexGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( m_Mutex );
     return bIsSelected;
 }
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 99a77d143a10..87580385fe97 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -425,7 +425,7 @@ void SwAccessibleParagraph::_InvalidateContent( bool bVisibleDataFired )
     nHeadingLevel = GetRealHeadingLevel();
     bool bOldIsHeading;
     {
-        osl::MutexGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( m_Mutex );
         bOldIsHeading = bIsHeading;
         if( bIsHeading != bNewIsHeading )
             bIsHeading = bNewIsHeading;
@@ -445,7 +445,7 @@ void SwAccessibleParagraph::_InvalidateContent( bool bVisibleDataFired )
         OUString sNewDesc( GetDescription() );
         OUString sOldDesc;
         {
-            osl::MutexGuard aGuard( aMutex );
+            osl::MutexGuard aGuard( m_Mutex );
             sOldDesc = sDesc;
             if( sDesc != sNewDesc )
                 sDesc = sNewDesc;
@@ -470,7 +470,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos()
     sal_Int32 nNew = GetCaretPos();
     sal_Int32 nOld;
     {
-        osl::MutexGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( m_Mutex );
         nOld = nOldCaretPos;
         nOldCaretPos = nNew;
     }
@@ -520,7 +520,7 @@ void SwAccessibleParagraph::_InvalidateFocus()
     {
         sal_Int32 nPos;
         {
-            osl::MutexGuard aGuard( aMutex );
+            osl::MutexGuard aGuard( m_Mutex );
             nPos = nOldCaretPos;
         }
         OSL_ENSURE( nPos != -1, "focus object should be selected" );
@@ -568,7 +568,7 @@ SwAccessibleParagraph::~SwAccessibleParagraph()
 
 bool SwAccessibleParagraph::HasCursor()
 {
-    osl::MutexGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( m_Mutex );
     return nOldCaretPos != -1;
 }
 
@@ -933,7 +933,7 @@ OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription()
 
     CHECK_FOR_DEFUNC( XAccessibleContext );
 
-    osl::MutexGuard aGuard2( aMutex );
+    osl::MutexGuard aGuard2( m_Mutex );
     if( sDesc.isEmpty() )
         sDesc = GetDescription();
 
@@ -1287,7 +1287,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition()
 
     sal_Int32 nRet = GetCaretPos();
     {
-        osl::MutexGuard aOldCaretPosGuard( aMutex );
+        osl::MutexGuard aOldCaretPosGuard( m_Mutex );
         OSL_ENSURE( nRet == nOldCaretPos, "caret pos out of sync" );
         nOldCaretPos = nRet;
     }