helpcontent2 | 2 +- sw/source/core/access/acccell.cxx | 26 +++++++++++++------------- sw/source/core/access/acccell.hxx | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 9bd6f00dfe8f71bc9de693bdcd65377ee1e891d0 Author: Gabor Kelemen <[email protected]> Date: Sat Jan 21 13:41:14 2017 +0100 Updated core Project: help bc9f4bf8de06b5575f87eac6e26f8df6ba84ffad 'Insert Sheet' and 'Insert Sheet from File' moved ...to the Sheet menu from Insert Change-Id: Ia46ab0331940f0485a59c199af6521f42d95f05f Reviewed-on: https://gerrit.libreoffice.org/33406 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Gabor Kelemen <[email protected]> diff --git a/helpcontent2 b/helpcontent2 index 7e4c92e..bc9f4bf 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7e4c92e9870eb09ffd836d976ce413133781af2f +Subproject commit bc9f4bf8de06b5575f87eac6e26f8df6ba84ffad commit 311a4eb36e96ca4b0f206e17686260f27c2f1902 Author: Miklos Vajna <[email protected]> Date: Mon Jan 23 09:12:12 2017 +0100 sw: prefix members of SwAccessibleCell Change-Id: I444cd7fc523170bb7e1ee8a8041ca5a5df302226 diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 694a560..5a732e4 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -92,7 +92,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) 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 ); } @@ -101,14 +101,14 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap, const SwCellFrame *pCellFrame ) : SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrame ) - , aSelectionHelper( *this ) - , bIsSelected( false ) + , m_aSelectionHelper( *this ) + , m_bIsSelected( false ) { SolarMutexGuard aGuard; OUString sBoxName( pCellFrame->GetTabBox()->GetName() ); SetName( sBoxName ); - bIsSelected = IsSelected(); + m_bIsSelected = IsSelected(); css::uno::Reference<css::accessibility::XAccessible> xTableReference( getAccessibleParent()); @@ -127,8 +127,8 @@ bool SwAccessibleCell::InvalidateMyCursorPos() bool bOld; { osl::MutexGuard aGuard( m_Mutex ); - bOld = bIsSelected; - bIsSelected = bNew; + bOld = m_bIsSelected; + m_bIsSelected = bNew; } if( bNew ) { @@ -227,7 +227,7 @@ void SwAccessibleCell::InvalidateCursorPos_() bool SwAccessibleCell::HasCursor() { osl::MutexGuard aGuard( m_Mutex ); - return bIsSelected; + return m_bIsSelected; } SwAccessibleCell::~SwAccessibleCell() @@ -453,14 +453,14 @@ void SwAccessibleCell::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { - aSelectionHelper.selectAccessibleChild(nChildIndex); + m_aSelectionHelper.selectAccessibleChild(nChildIndex); } sal_Bool SwAccessibleCell::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { - return aSelectionHelper.isAccessibleChildSelected(nChildIndex); + return m_aSelectionHelper.isAccessibleChildSelected(nChildIndex); } void SwAccessibleCell::clearAccessibleSelection( ) @@ -471,27 +471,27 @@ void SwAccessibleCell::clearAccessibleSelection( ) void SwAccessibleCell::selectAllAccessibleChildren( ) throw ( uno::RuntimeException, std::exception ) { - aSelectionHelper.selectAllAccessibleChildren(); + m_aSelectionHelper.selectAllAccessibleChildren(); } sal_Int32 SwAccessibleCell::getSelectedAccessibleChildCount( ) throw ( uno::RuntimeException, std::exception ) { - return aSelectionHelper.getSelectedAccessibleChildCount(); + return m_aSelectionHelper.getSelectedAccessibleChildCount(); } uno::Reference<XAccessible> SwAccessibleCell::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { - return aSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex); + return m_aSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex); } void SwAccessibleCell::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { - aSelectionHelper.deselectAccessibleChild(nSelectedChildIndex); + m_aSelectionHelper.deselectAccessibleChild(nSelectedChildIndex); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 45551dc..bb4cdb2 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -34,8 +34,8 @@ class SwAccessibleCell : public SwAccessibleContext, public css::accessibility::XAccessibleExtendedAttributes { // Implementation for XAccessibleSelection interface - SwAccessibleSelectionHelper aSelectionHelper; - bool bIsSelected; // protected by base class mutex + SwAccessibleSelectionHelper m_aSelectionHelper; + bool m_bIsSelected; // protected by base class mutex bool IsSelected(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
