sw/source/core/access/accframebase.cxx | 14 +++++++------- sw/source/core/access/accframebase.hxx | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit f51ad2f3e840efc26e4eeec6491972bca1e4d58a Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon Jul 24 18:43:39 2017 +0200 sw: prefix members of SwAccessibleFrameBase Change-Id: Ia0e59c028ec3ca98c39b3097043b512d476faae6 Reviewed-on: https://gerrit.libreoffice.org/40375 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index 53572cbd1deb..ea619e72b333 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -82,7 +82,7 @@ void SwAccessibleFrameBase::GetStates( if( IsSelected() ) { rStateSet.AddState( AccessibleStateType::SELECTED ); - assert(bIsSelected && "bSelected out of sync"); + assert(m_bIsSelected && "bSelected out of sync"); ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); @@ -128,14 +128,14 @@ SwAccessibleFrameBase::SwAccessibleFrameBase( sal_Int16 nInitRole, const SwFlyFrame* pFlyFrame ) : SwAccessibleContext( pInitMap, nInitRole, pFlyFrame ), - bIsSelected( false ) + m_bIsSelected( false ) { const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat(); const_cast< SwFrameFormat * >( pFrameFormat )->Add( this ); SetName( pFrameFormat->GetName() ); - bIsSelected = IsSelected(); + m_bIsSelected = IsSelected(); } void SwAccessibleFrameBase::InvalidateCursorPos_() @@ -145,8 +145,8 @@ void SwAccessibleFrameBase::InvalidateCursorPos_() { osl::MutexGuard aGuard( m_Mutex ); - bOldSelected = bIsSelected; - bIsSelected = bNewSelected; + bOldSelected = m_bIsSelected; + m_bIsSelected = bNewSelected; } if( bNewSelected ) @@ -191,7 +191,7 @@ void SwAccessibleFrameBase::InvalidateFocus_() { osl::MutexGuard aGuard( m_Mutex ); - bSelected = bIsSelected; + bSelected = m_bIsSelected; } assert(bSelected && "focus object should be selected"); @@ -203,7 +203,7 @@ void SwAccessibleFrameBase::InvalidateFocus_() bool SwAccessibleFrameBase::HasCursor() { osl::MutexGuard aGuard( m_Mutex ); - return bIsSelected; + return m_bIsSelected; } SwAccessibleFrameBase::~SwAccessibleFrameBase() diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx index ea6a1ba55097..d8e26442171c 100644 --- a/sw/source/core/access/accframebase.hxx +++ b/sw/source/core/access/accframebase.hxx @@ -29,7 +29,7 @@ class SwFlyFrame; class SwAccessibleFrameBase : public SwAccessibleContext, public SwClient { - bool bIsSelected; // protected by base class mutex + bool m_bIsSelected; // protected by base class mutex bool IsSelected(); protected: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits