From 4b313fd5661ca5ac096e60d46691b1a9857877d9 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 18 Oct 2012 16:28:20 +0200 Subject: Merge SvListEntry and SvLBoxEntry into SvTreeListEntry. Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee --- .../extended/accessiblelistboxentry.hxx | 4 +- .../source/extended/accessiblelistbox.cxx | 22 ++++----- .../source/extended/accessiblelistboxentry.cxx | 54 +++++++++++----------- .../source/extended/accessibletablistboxtable.cxx | 8 ++-- 4 files changed, 44 insertions(+), 44 deletions(-) (limited to 'accessibility') diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx index 6941c5a1af38..2027208305eb 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx @@ -47,7 +47,7 @@ namespace com { namespace sun { namespace star { namespace awt { } } } } class SvTreeListBox; -class SvLBoxEntry; +class SvTreeListEntry; //........................................................................ namespace accessibility @@ -119,7 +119,7 @@ namespace accessibility @param _xParent is our parent accessible object */ - AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvLBoxEntry* _pEntry, + AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvTreeListEntry* _pEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent ); diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 4a43b6c235fd..63dc7add5905 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -81,7 +81,7 @@ namespace accessibility { if ( getListBox() && getListBox()->HasFocus() ) { - SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() ); + SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if ( !pEntry ) pEntry = getListBox()->GetCurEntry(); @@ -105,7 +105,7 @@ namespace accessibility NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); if ( getListBox() && getListBox()->HasFocus() ) { - SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() ); + SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if ( pEntry ) { Reference< XAccessible > xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this ); @@ -120,7 +120,7 @@ namespace accessibility case VCLEVENT_ITEM_EXPANDED : case VCLEVENT_ITEM_COLLAPSED : { - SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() ); + SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if ( pEntry ) { AccessibleListBoxEntry* pAccListBoxEntry = @@ -237,7 +237,7 @@ namespace accessibility ::comphelper::OExternalLockGuard aGuard( this ); ensureAlive(); - SvLBoxEntry* pEntry = getListBox()->GetEntry(i); + SvTreeListEntry* pEntry = getListBox()->GetEntry(i); if ( !pEntry ) throw IndexOutOfBoundsException(); @@ -281,7 +281,7 @@ namespace accessibility ensureAlive(); - SvLBoxEntry* pEntry = getListBox()->GetEntry( nChildIndex ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex ); if ( !pEntry ) throw IndexOutOfBoundsException(); @@ -294,7 +294,7 @@ namespace accessibility ensureAlive(); - SvLBoxEntry* pEntry = getListBox()->GetEntry( nChildIndex ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex ); if ( !pEntry ) throw IndexOutOfBoundsException(); @@ -310,7 +310,7 @@ namespace accessibility sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL ); for ( sal_Int32 i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( i ); if ( getListBox()->IsSelected( pEntry ) ) getListBox()->Select( pEntry, sal_False ); } @@ -325,7 +325,7 @@ namespace accessibility sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL ); for ( sal_Int32 i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( i ); if ( !getListBox()->IsSelected( pEntry ) ) getListBox()->Select( pEntry, sal_True ); } @@ -341,7 +341,7 @@ namespace accessibility sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL ); for ( sal_Int32 i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( i ); if ( getListBox()->IsSelected( pEntry ) ) ++nSelCount; } @@ -363,7 +363,7 @@ namespace accessibility sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL ); for ( sal_Int32 i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( i ); if ( getListBox()->IsSelected( pEntry ) ) ++nSelCount; @@ -383,7 +383,7 @@ namespace accessibility ensureAlive(); - SvLBoxEntry* pEntry = getListBox()->GetEntry( nSelectedChildIndex ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( nSelectedChildIndex ); if ( !pEntry ) throw IndexOutOfBoundsException(); diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 16ef81de82e8..e0b5bbb3cb22 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -65,7 +65,7 @@ namespace accessibility // Ctor() and Dtor() // ----------------------------------------------------------------------------- AccessibleListBoxEntry::AccessibleListBoxEntry( SvTreeListBox& _rListBox, - SvLBoxEntry* _pEntry, + SvTreeListEntry* _pEntry, const Reference< XAccessible >& _xParent ) : AccessibleListBoxEntry_BASE ( m_aMutex ), @@ -92,11 +92,11 @@ namespace accessibility Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const { Rectangle aRect; - SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) { aRect = getListBox()->GetBoundingRect( pEntry ); - SvLBoxEntry* pParent = getListBox()->GetParent( pEntry ); + SvTreeListEntry* pParent = getListBox()->GetParent( pEntry ); if ( pParent ) { // position relative to parent entry @@ -112,7 +112,7 @@ namespace accessibility Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen_Impl() const { Rectangle aRect; - SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) { aRect = getListBox()->GetBoundingRect( pEntry ); @@ -173,7 +173,7 @@ namespace accessibility OUString AccessibleListBoxEntry::implGetText() { OUString sRet; - SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) sRet = getListBox()->SearchEntryText( pEntry ); return sRet; @@ -295,7 +295,7 @@ namespace accessibility ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); - SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); sal_Int32 nCount = 0; if ( pEntry ) nCount = getListBox()->GetLevelChildCount( pEntry ); @@ -309,8 +309,8 @@ namespace accessibility ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); - SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); - SvLBoxEntry* pEntry = pParent ? getListBox()->GetEntry( pParent, i ) : NULL; + SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = pParent ? getListBox()->GetEntry( pParent, i ) : NULL; if ( !pEntry ) throw IndexOutOfBoundsException(); @@ -338,7 +338,7 @@ namespace accessibility aParentPath.pop_back(); // get the entry for this shortened access path - SvLBoxEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); OSL_ENSURE( pParentEntry, "AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent entry!" ); if ( pParentEntry ) @@ -454,7 +454,7 @@ namespace accessibility ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); - SvLBoxEntry* pEntry = getListBox()->GetEntry( VCLPoint( _aPoint ) ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( VCLPoint( _aPoint ) ); if ( !pEntry ) throw RuntimeException(); @@ -539,7 +539,7 @@ namespace accessibility throw IndexOutOfBoundsException(); awt::Rectangle aBounds( 0, 0, 0, 0 ); - SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) { ::vcl::ControlLayoutData aLayoutData; @@ -560,7 +560,7 @@ namespace accessibility EnsureIsAlive(); sal_Int32 nIndex = -1; - SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) { ::vcl::ControlLayoutData aLayoutData; @@ -644,7 +644,7 @@ namespace accessibility checkActionIndex_Impl( nIndex ); EnsureIsAlive(); - SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) { if ( getListBox()->IsExpanded( pEntry ) ) @@ -688,8 +688,8 @@ namespace accessibility EnsureIsAlive(); - SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); - SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex ); + SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex ); if ( !pEntry ) throw IndexOutOfBoundsException(); @@ -703,8 +703,8 @@ namespace accessibility EnsureIsAlive(); - SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); - SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex ); + SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex ); if ( !pEntry ) throw IndexOutOfBoundsException(); @@ -718,13 +718,13 @@ namespace accessibility EnsureIsAlive(); - SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( !pParent ) throw RuntimeException(); sal_Int32 nCount = getListBox()->GetLevelChildCount( pParent ); for ( sal_Int32 i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i ); if ( getListBox()->IsSelected( pEntry ) ) getListBox()->Select( pEntry, sal_False ); } @@ -737,13 +737,13 @@ namespace accessibility EnsureIsAlive(); - SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( !pParent ) throw RuntimeException(); sal_Int32 nCount = getListBox()->GetLevelChildCount( pParent ); for ( sal_Int32 i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i ); if ( !getListBox()->IsSelected( pEntry ) ) getListBox()->Select( pEntry, sal_True ); } @@ -758,13 +758,13 @@ namespace accessibility sal_Int32 i, nSelCount = 0, nCount = 0; - SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( !pParent ) throw RuntimeException(); nCount = getListBox()->GetLevelChildCount( pParent ); for ( i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i ); if ( getListBox()->IsSelected( pEntry ) ) ++nSelCount; } @@ -785,13 +785,13 @@ namespace accessibility Reference< XAccessible > xChild; sal_Int32 i, nSelCount = 0, nCount = 0; - SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( !pParent ) throw RuntimeException(); nCount = getListBox()->GetLevelChildCount( pParent ); for ( i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i ); if ( getListBox()->IsSelected( pEntry ) ) ++nSelCount; @@ -812,8 +812,8 @@ namespace accessibility EnsureIsAlive(); - SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); - SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nSelectedChildIndex ); + SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath ); + SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nSelectedChildIndex ); if ( !pEntry ) throw IndexOutOfBoundsException(); diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 1ddaff3ec234..a33c9f1ea774 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -96,7 +96,7 @@ namespace accessibility commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); if ( m_pTabListBox && m_pTabListBox->HasFocus() ) { - SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() ); + SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if ( pEntry ) { sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry ); @@ -136,7 +136,7 @@ namespace accessibility { if ( m_pTabListBox && m_pTabListBox->HasFocus() ) { - SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() ); + SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if ( pEntry ) { sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry ); @@ -161,7 +161,7 @@ namespace accessibility { commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); TabListBoxEventData* pData = static_cast< TabListBoxEventData* >( rVclWindowEvent.GetData() ); - SvLBoxEntry* pEntry = pData != NULL ? pData->m_pEntry : NULL; + SvTreeListEntry* pEntry = pData != NULL ? pData->m_pEntry : NULL; if ( pEntry ) { sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry ); @@ -244,7 +244,7 @@ namespace accessibility if ( m_pTabListBox ) { sal_Int32 nRow = 0; - SvLBoxEntry* pEntry = m_pTabListBox->FirstSelected(); + SvTreeListEntry* pEntry = m_pTabListBox->FirstSelected(); while ( pEntry ) { ++nRow; -- cgit