diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-18 16:28:20 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-19 11:45:36 +0200 |
| commit | 4b313fd5661ca5ac096e60d46691b1a9857877d9 (patch) | |
| tree | 59ba989a24fe1d21562f9a3c8a465b124028c62a | |
| parent | d47508e036fd30f410798f37d25039bb25528f60 (diff) | |
Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.
Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee
220 files changed, 3126 insertions, 3123 deletions
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; diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 8ca38127b4df..1619261e7d78 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -191,17 +191,17 @@ class WatchTreeListBox : public SvHeaderTabListBox String aEditingRes; protected: - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); - bool ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult ); - SbxBase* ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement ); + bool ImplBasicEntryEdited( SvTreeListEntry* pEntry, const String& rResult ); + SbxBase* ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement ); public: WatchTreeListBox( Window* pParent, WinBits nWinBits ); ~WatchTreeListBox(); - void RequestingChildren( SvLBoxEntry * pParent ); + void RequestingChildren( SvTreeListEntry * pParent ); void UpdateWatches( bool bBasicStopped = false ); using SvTabListBox::SetTabs; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 914a916fcb0e..134533cd9245 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1363,7 +1363,7 @@ void WatchWindow::AddWatch( const String& rVName ) OUString aWatchStr_( aVar ); aWatchStr_ += OUString( "\t\t" ); - SvLBoxEntry* pNewEntry = aTreeListBox.InsertEntry( aWatchStr_, 0, true, LIST_APPEND ); + SvTreeListEntry* pNewEntry = aTreeListBox.InsertEntry( aWatchStr_, 0, true, LIST_APPEND ); pNewEntry->SetUserData( pWatchItem ); aTreeListBox.Select(pNewEntry, true); @@ -1375,7 +1375,7 @@ void WatchWindow::AddWatch( const String& rVName ) bool WatchWindow::RemoveSelectedWatch() { - SvLBoxEntry* pEntry = aTreeListBox.GetCurEntry(); + SvTreeListEntry* pEntry = aTreeListBox.GetCurEntry(); if ( pEntry ) { aTreeListBox.GetModel()->Remove( pEntry ); @@ -1406,7 +1406,7 @@ IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton ) IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl) { - SvLBoxEntry* pCurEntry = aTreeListBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aTreeListBox.GetCurEntry(); if ( pCurEntry && pCurEntry->GetUserData() ) aXEdit.SetText( ((WatchItem*)pCurEntry->GetUserData())->maName ); @@ -1724,7 +1724,7 @@ WatchTreeListBox::WatchTreeListBox( Window* pParent, WinBits nWinBits ) WatchTreeListBox::~WatchTreeListBox() { // Destroy user data - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { delete (WatchItem*)pEntry->GetUserData(); @@ -1746,7 +1746,7 @@ void WatchTreeListBox::SetTabs() } } -void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent ) +void WatchTreeListBox::RequestingChildren( SvTreeListEntry * pParent ) { if( !StarBASIC::IsRunning() ) return; @@ -1754,7 +1754,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent ) if( GetChildCount( pParent ) > 0 ) return; - SvLBoxEntry* pEntry = pParent; + SvTreeListEntry* pEntry = pParent; WatchItem* pItem = (WatchItem*)pEntry->GetUserData(); SbxDimArray* pArray = pItem->mpArray; @@ -1780,7 +1780,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent ) pItem->maMemberList.push_back(String(pVar->GetName())); String const& rName = pItem->maMemberList.back(); - SvLBoxEntry* pChildEntry = SvTreeListBox::InsertEntry( rName, pEntry ); + SvTreeListEntry* pChildEntry = SvTreeListBox::InsertEntry( rName, pEntry ); pChildEntry->SetUserData(new WatchItem(rName)); } if( nPropCount > 0 ) @@ -1828,7 +1828,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent ) aDisplayName += aIndexStr; pChildItem->maDisplayName = aDisplayName; - SvLBoxEntry* pChildEntry = SvTreeListBox::InsertEntry( aDisplayName, pEntry ); + SvTreeListEntry* pChildEntry = SvTreeListBox::InsertEntry( aDisplayName, pEntry ); nElementCount++; pChildEntry->SetUserData( pChildItem ); } @@ -1839,7 +1839,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent ) } } -SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement ) +SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement ) { SbxBase* pSBX = NULL; rbArrayElement = false; @@ -1847,7 +1847,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra WatchItem* pItem = (WatchItem*)pEntry->GetUserData(); String aVName( pItem->maName ); - SvLBoxEntry* pParentEntry = GetParent( pEntry ); + SvTreeListEntry* pParentEntry = GetParent( pEntry ); WatchItem* pParentItem = pParentEntry ? (WatchItem*)pParentEntry->GetUserData() : NULL; if( pParentItem ) { @@ -1879,7 +1879,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra return pSBX; } -sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) +sal_Bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { WatchItem* pItem = (WatchItem*)pEntry->GetUserData(); @@ -1904,7 +1904,7 @@ sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) return bEdit; } -sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText ) +sal_Bool WatchTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { WatchItem* pItem = (WatchItem*)pEntry->GetUserData(); String aVName( pItem->maName ); @@ -1920,7 +1920,7 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNe return aResult != aEditingRes && ImplBasicEntryEdited(pEntry, aResult); } -bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult ) +bool WatchTreeListBox::ImplBasicEntryEdited( SvTreeListEntry* pEntry, const String& rResult ) { bool bArrayElement; SbxBase* pSBX = ImplGetSBXForEntry( pEntry, bArrayElement ); @@ -1953,12 +1953,12 @@ bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& namespace { -void implCollapseModifiedObjectEntry( SvLBoxEntry* pParent, WatchTreeListBox* pThis ) +void implCollapseModifiedObjectEntry( SvTreeListEntry* pParent, WatchTreeListBox* pThis ) { pThis->Collapse( pParent ); SvLBoxTreeList* pModel = pThis->GetModel(); - SvLBoxEntry* pDeleteEntry; + SvTreeListEntry* pDeleteEntry; while( (pDeleteEntry = pThis->SvTreeListBox::GetEntry( pParent, 0 )) != NULL ) { implCollapseModifiedObjectEntry( pDeleteEntry, pThis ); @@ -1998,7 +1998,7 @@ String implCreateTypeStringForDimArray( WatchItem* pItem, SbxDataType eType ) return aRetStr; } -void implEnableChildren( SvLBoxEntry* pEntry, bool bEnable ) +void implEnableChildren( SvTreeListEntry* pEntry, bool bEnable ) { if( bEnable ) { @@ -2023,7 +2023,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped ) SbxError eOld = SbxBase::GetError(); setBasicWatchMode( true ); - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { WatchItem* pItem = (WatchItem*)pEntry->GetUserData(); diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 8ef1a92fe785..feac68eaaa6d 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -198,7 +198,7 @@ TreeListBox::~TreeListBox () m_aNotifier.dispose(); // destroy user data - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { delete static_cast<Entry*>(pEntry->GetUserData()); @@ -218,7 +218,7 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL SetUpdateMode(false); // level 1: BasicManager (application, document, ...) - SvLBoxEntry* pDocumentRootEntry = FindRootEntry( rDocument, eLocation ); + SvTreeListEntry* pDocumentRootEntry = FindRootEntry( rDocument, eLocation ); if ( pDocumentRootEntry && IsExpanded( pDocumentRootEntry ) ) ImpCreateLibEntries( pDocumentRootEntry, rDocument, eLocation ); if ( !pDocumentRootEntry ) @@ -239,7 +239,7 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL SetUpdateMode(true); } -void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ) +void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ) { // get a sorted list of library names Sequence< OUString > aLibNames( rDocument.getLibraryNames() ); @@ -283,7 +283,7 @@ void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const Sc nId = bLoaded ? RID_IMG_DLGLIB : RID_IMG_DLGLIBNOTLOADED; else nId = bLoaded ? RID_IMG_MODLIB : RID_IMG_MODLIBNOTLOADED; - SvLBoxEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY ); + SvTreeListEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY ); if ( pLibRootEntry ) { SetEntryBitmaps( pLibRootEntry, Image( IDEResId( nId ) ) ); @@ -303,7 +303,7 @@ void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const Sc } } -void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) +void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) { // modules if ( nMode & BROWSEMODE_MODULES ) @@ -326,7 +326,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri for ( sal_Int32 i = 0 ; i < nModCount ; i++ ) { OUString aModName = pModNames[ i ]; - SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE ); + SvTreeListEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE ); if ( !pModuleEntry ) pModuleEntry = AddEntry( aModName, @@ -345,7 +345,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri for ( sal_Int32 j = 0 ; j < nCount ; j++ ) { OUString aName = pNames[ j ]; - SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD ); + SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD ); if ( !pEntry ) pEntry = AddEntry( aName, @@ -382,7 +382,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri for ( sal_Int32 i = 0 ; i < nDlgCount ; i++ ) { OUString aDlgName = pDlgNames[ i ]; - SvLBoxEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG ); + SvTreeListEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG ); if ( !pDialogEntry ) pDialogEntry = AddEntry( aDlgName, @@ -400,7 +400,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri } } -void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) +void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) { std::vector<std::pair<EntryType, OUString> > aEntries; @@ -414,7 +414,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, c { EntryType eType = iter->first; OUString aEntryName = iter->second; - SvLBoxEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType ); + SvTreeListEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType ); if( pLibSubRootEntry ) { SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ) ); @@ -433,7 +433,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, c } } -void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) +void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) { uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, rLibName ); if( !xLib.is() ) @@ -486,7 +486,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn } } OUString aEntryName(aEntryNameBuf.makeStringAndClear()); - SvLBoxEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE ); + SvTreeListEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE ); if ( !pModuleEntry ) pModuleEntry = AddEntry( aEntryName, @@ -505,7 +505,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn for ( sal_Int32 j = 0 ; j < nCount ; j++ ) { OUString aName = pNames[ j ]; - SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD ); + SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD ); if ( !pEntry ) pEntry = AddEntry( aName, @@ -523,10 +523,10 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn } } -SvLBoxEntry* TreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText ) +SvTreeListEntry* TreeListBox::ImpFindEntry( SvTreeListEntry* pParent, const OUString& rText ) { sal_uLong nRootPos = 0; - SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos ); + SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos ); while ( pEntry ) { if ( rText.equals(GetEntryText( pEntry )) ) @@ -590,8 +590,8 @@ void TreeListBox::UpdateEntries() EntryDescriptor aCurDesc( GetEntryDescriptor( FirstSelected() ) ); // removing the invalid entries - SvLBoxEntry* pLastValid = 0; - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pLastValid = 0; + SvTreeListEntry* pEntry = First(); while ( pEntry ) { if ( IsValidEntry( pEntry ) ) @@ -607,7 +607,7 @@ void TreeListBox::UpdateEntries() } // Removes the entry from the tree. -void TreeListBox::RemoveEntry (SvLBoxEntry* pEntry) +void TreeListBox::RemoveEntry (SvTreeListEntry* pEntry) { // removing the associated user data delete static_cast<Entry*>(pEntry->GetUserData()); @@ -619,7 +619,7 @@ void TreeListBox::RemoveEntry (SvLBoxEntry* pEntry) void TreeListBox::RemoveEntry (ScriptDocument const& rDocument) { // finding the entry of rDocument - for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry)) + for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry)) if (rDocument == GetEntryDescriptor(pEntry).GetDocument()) { RemoveEntry(pEntry); @@ -627,9 +627,9 @@ void TreeListBox::RemoveEntry (ScriptDocument const& rDocument) } } -SvLBoxEntry* TreeListBox::CloneEntry( SvLBoxEntry* pSource ) +SvTreeListEntry* TreeListBox::CloneEntry( SvTreeListEntry* pSource ) { - SvLBoxEntry* pNew = SvTreeListBox::CloneEntry( pSource ); + SvTreeListEntry* pNew = SvTreeListBox::CloneEntry( pSource ); Entry* pUser = static_cast<Entry*>(pSource->GetUserData()); DBG_ASSERT( pUser, "User-Daten?!" ); @@ -640,10 +640,10 @@ SvLBoxEntry* TreeListBox::CloneEntry( SvLBoxEntry* pSource ) return pNew; } -SvLBoxEntry* TreeListBox::FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType ) +SvTreeListEntry* TreeListBox::FindEntry( SvTreeListEntry* pParent, const OUString& rText, EntryType eType ) { sal_uLong nRootPos = 0; - SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos ); + SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos ); while ( pEntry ) { Entry* pBasicEntry = static_cast<Entry*>(pEntry->GetUserData()); @@ -662,7 +662,7 @@ long TreeListBox::ExpandingHdl() bool bOK = true; if ( GetModel()->GetDepth( GetHdlEntry() ) == 1 ) { - SvLBoxEntry* pCurEntry = GetCurEntry(); + SvTreeListEntry* pCurEntry = GetCurEntry(); EntryDescriptor aDesc( GetEntryDescriptor( pCurEntry ) ); ScriptDocument aDocument( aDesc.GetDocument() ); OSL_ENSURE( aDocument.isAlive(), "TreeListBox::ExpandingHdl: no document, or document is dead!" ); @@ -692,7 +692,7 @@ long TreeListBox::ExpandingHdl() return bOK; } -bool TreeListBox::IsEntryProtected( SvLBoxEntry* pEntry ) +bool TreeListBox::IsEntryProtected( SvTreeListEntry* pEntry ) { bool bProtected = false; if ( pEntry && ( GetModel()->GetDepth( pEntry ) == 1 ) ) @@ -718,15 +718,15 @@ bool TreeListBox::IsEntryProtected( SvLBoxEntry* pEntry ) } SAL_WNODEPRECATED_DECLARATIONS_PUSH -SvLBoxEntry* TreeListBox::AddEntry( +SvTreeListEntry* TreeListBox::AddEntry( OUString const& rText, const Image& rImage, - SvLBoxEntry* pParent, + SvTreeListEntry* pParent, bool bChildrenOnDemand, std::auto_ptr<Entry> aUserData ) { - SvLBoxEntry* p = InsertEntry( + SvTreeListEntry* p = InsertEntry( rText, rImage, rImage, pParent, bChildrenOnDemand, LIST_APPEND, aUserData.release() // XXX possible leak ); @@ -734,7 +734,7 @@ SvLBoxEntry* TreeListBox::AddEntry( } SAL_WNODEPRECATED_DECLARATIONS_POP -void TreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage ) +void TreeListBox::SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage ) { SetExpandedEntryBmp( pEntry, rImage ); SetCollapsedEntryBmp( pEntry, rImage ); @@ -809,7 +809,7 @@ void TreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& r void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) { - SvLBoxEntry* pCurEntry = 0; + SvTreeListEntry* pCurEntry = 0; EntryDescriptor aDesc = rDesc; if ( aDesc.GetType() == OBJ_TYPE_UNKNOWN ) { @@ -822,7 +822,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) ScriptDocument aDocument = aDesc.GetDocument(); OSL_ENSURE( aDocument.isValid(), "TreeListBox::SetCurrentEntry: invalid document!" ); LibraryLocation eLocation = aDesc.GetLocation(); - SvLBoxEntry* pRootEntry = FindRootEntry( aDocument, eLocation ); + SvTreeListEntry* pRootEntry = FindRootEntry( aDocument, eLocation ); if ( pRootEntry ) { pCurEntry = pRootEntry; @@ -830,7 +830,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) if ( !aLibName.isEmpty() ) { Expand( pRootEntry ); - SvLBoxEntry* pLibEntry = FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY ); + SvTreeListEntry* pLibEntry = FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY ); if ( pLibEntry ) { pCurEntry = pLibEntry; @@ -838,7 +838,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) if( !aLibSubName.isEmpty() ) { Expand( pLibEntry ); - SvLBoxEntry* pLibSubEntry = ImpFindEntry( pLibEntry, aLibSubName ); + SvTreeListEntry* pLibSubEntry = ImpFindEntry( pLibEntry, aLibSubName ); if( pLibSubEntry ) { pCurEntry = pLibSubEntry; @@ -851,7 +851,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) EntryType eType = OBJ_TYPE_MODULE; if ( aDesc.GetType() == OBJ_TYPE_DIALOG ) eType = OBJ_TYPE_DIALOG; - SvLBoxEntry* pEntry = FindEntry( pCurEntry, aName, eType ); + SvTreeListEntry* pEntry = FindEntry( pCurEntry, aName, eType ); if ( pEntry ) { pCurEntry = pEntry; @@ -859,7 +859,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) if ( !aMethodName.isEmpty() ) { Expand( pEntry ); - SvLBoxEntry* pSubEntry = FindEntry( pEntry, aMethodName, OBJ_TYPE_METHOD ); + SvTreeListEntry* pSubEntry = FindEntry( pEntry, aMethodName, OBJ_TYPE_METHOD ); if ( pSubEntry ) { pCurEntry = pSubEntry; diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index 1c0de301f33f..45ce1a3ac64c 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -31,7 +31,7 @@ #include "basobj.hxx" class SbModule; -class SvLBoxEntry; +class SvTreeListEntry; class SbxVariable; namespace basctl @@ -178,20 +178,20 @@ private: sal_uInt16 nMode; DocumentEventNotifier m_aNotifier; - void SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage ); + void SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); protected: - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual void ExpandedHdl(); - virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource ); + virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ); virtual long ExpandingHdl(); - void ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ); - void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); - void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); - void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); - SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText ); + void ImpCreateLibEntries( SvTreeListEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ); + void ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + void ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + void ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + SvTreeListEntry* ImpFindEntry( SvTreeListEntry* pParent, const OUString& rText ); // DocumentEventListener virtual void onDocumentCreated( const ScriptDocument& _rDocument ); @@ -212,27 +212,27 @@ public: void ScanAllEntries(); void UpdateEntries(); - bool IsEntryProtected( SvLBoxEntry* pEntry ); + bool IsEntryProtected( SvTreeListEntry* pEntry ); void SetMode( sal_uInt16 nM ) { nMode = nM; } sal_uInt16 GetMode() const { return nMode; } - SbModule* FindModule( SvLBoxEntry* pEntry ); - SbxVariable* FindVariable( SvLBoxEntry* pEntry ); - SvLBoxEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); - SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType ); + SbModule* FindModule( SvTreeListEntry* pEntry ); + SbxVariable* FindVariable( SvTreeListEntry* pEntry ); + SvTreeListEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); + SvTreeListEntry* FindEntry( SvTreeListEntry* pParent, const OUString& rText, EntryType eType ); - EntryDescriptor GetEntryDescriptor( SvLBoxEntry* pEntry ); + EntryDescriptor GetEntryDescriptor( SvTreeListEntry* pEntry ); ItemType ConvertType (EntryType eType); - bool IsValidEntry( SvLBoxEntry* pEntry ); + bool IsValidEntry( SvTreeListEntry* pEntry ); - SvLBoxEntry* AddEntry( + SvTreeListEntry* AddEntry( const OUString& rText, const Image& rImage, - SvLBoxEntry* pParent, bool bChildrenOnDemand, + SvTreeListEntry* pParent, bool bChildrenOnDemand, std::auto_ptr<Entry> aUserData ); - void RemoveEntry (SvLBoxEntry*); + void RemoveEntry (SvTreeListEntry*); void RemoveEntry (ScriptDocument const&); OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 17c66a7cbe40..d201081dd30a 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -38,10 +38,10 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -typedef std::deque< SvLBoxEntry* > EntryArray; +typedef std::deque< SvTreeListEntry* > EntryArray; -void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry ) +void TreeListBox::RequestingChildren( SvTreeListEntry* pEntry ) { EntryDescriptor aDesc = GetEntryDescriptor(pEntry); ScriptDocument aDocument = aDesc.GetDocument(); @@ -133,12 +133,12 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry ) void TreeListBox::ExpandedHdl() { - SvLBoxEntry* pEntry = GetHdlEntry(); + SvTreeListEntry* pEntry = GetHdlEntry(); DBG_ASSERT( pEntry, "Was wurde zugeklappt?" ); if ( !IsExpanded( pEntry ) && pEntry->HasChildrenOnDemand() ) { - SvLBoxEntry* pChild = FirstChild( pEntry ); + SvTreeListEntry* pChild = FirstChild( pEntry ); while ( pChild ) { GetModel()->Remove( pChild ); // does also call the DTOR @@ -163,7 +163,7 @@ void TreeListBox::ScanAllEntries() } } -SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry ) +SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry ) { if ( !pEntry ) return 0; @@ -199,7 +199,7 @@ SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry ) { for ( size_t n = 0; n < aEntries.size(); n++ ) { - SvLBoxEntry* pLE = aEntries[n]; + SvTreeListEntry* pLE = aEntries[n]; DBG_ASSERT( pLE, "Can not find entry in array" ); Entry* pBE = static_cast<Entry*>(pLE->GetUserData()); DBG_ASSERT( pBE, "The data in the entry not found!" ); @@ -260,7 +260,7 @@ SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry ) return pVar; } -EntryDescriptor TreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry ) +EntryDescriptor TreeListBox::GetEntryDescriptor( SvTreeListEntry* pEntry ) { ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() ); LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN; @@ -306,7 +306,7 @@ EntryDescriptor TreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry ) { for ( size_t n = 0; n < aEntries.size(); n++ ) { - SvLBoxEntry* pLE = aEntries[n]; + SvTreeListEntry* pLE = aEntries[n]; DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" ); Entry* pBE = static_cast<Entry*>(pLE->GetUserData()); DBG_ASSERT( pBE, "Keine Daten im Eintrag gefunden!" ); @@ -376,7 +376,7 @@ ItemType TreeListBox::ConvertType (EntryType eType) } } -bool TreeListBox::IsValidEntry( SvLBoxEntry* pEntry ) +bool TreeListBox::IsValidEntry( SvTreeListEntry* pEntry ) { bool bIsValid = false; @@ -431,16 +431,16 @@ bool TreeListBox::IsValidEntry( SvLBoxEntry* pEntry ) return bIsValid; } -SbModule* TreeListBox::FindModule( SvLBoxEntry* pEntry ) +SbModule* TreeListBox::FindModule( SvTreeListEntry* pEntry ) { return dynamic_cast<SbModule*>(FindVariable(pEntry)); } -SvLBoxEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ) +SvTreeListEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ) { OSL_ENSURE( rDocument.isValid(), "basctl::TreeListBox::FindRootEntry: invalid document!" ); sal_uLong nRootPos = 0; - SvLBoxEntry* pRootEntry = GetEntry( nRootPos ); + SvTreeListEntry* pRootEntry = GetEntry( nRootPos ); while ( pRootEntry ) { DBG_ASSERT( static_cast<Entry*>(pRootEntry->GetUserData())->GetType() == OBJ_TYPE_DOCUMENT, "Kein Shelleintrag?" ); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 9bc56e994098..3e07dfd86ac3 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -135,7 +135,7 @@ void MacroChooser::StoreMacroDescription() { EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(aBasicBox.FirstSelected()); String aMethodName; - SvLBoxEntry* pEntry = aMacroBox.FirstSelected(); + SvTreeListEntry* pEntry = aMacroBox.FirstSelected(); if ( pEntry ) aMethodName = aMacroBox.GetEntryText( pEntry ); else @@ -170,9 +170,9 @@ void MacroChooser::RestoreMacroDescription() if ( aLastMacro.Len() ) { // find entry in macro box - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; sal_uLong nPos = 0; - SvLBoxEntry* pE = aMacroBox.GetEntry( nPos ); + SvTreeListEntry* pE = aMacroBox.GetEntry( nPos ); while ( pE ) { if ( aMacroBox.GetEntryText( pE ) == aLastMacro ) @@ -199,7 +199,7 @@ short MacroChooser::Execute() aRunButton.GrabFocus(); // #104198 Check if "wrong" document is active - SvLBoxEntry* pSelectedEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pSelectedEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pSelectedEntry ) ); const ScriptDocument& rSelectedDoc( aDesc.GetDocument() ); @@ -208,15 +208,15 @@ short MacroChooser::Execute() { // Search for the right entry sal_uLong nRootPos = 0; - SvLBoxEntry* pRootEntry = aBasicBox.GetEntry( nRootPos ); + SvTreeListEntry* pRootEntry = aBasicBox.GetEntry( nRootPos ); while( pRootEntry ) { EntryDescriptor aCmpDesc( aBasicBox.GetEntryDescriptor( pRootEntry ) ); const ScriptDocument& rCmpDoc( aCmpDesc.GetDocument() ); if ( rCmpDoc.isDocument() && rCmpDoc.isActive() ) { - SvLBoxEntry* pEntry = pRootEntry; - SvLBoxEntry* pLastValid = pEntry; + SvTreeListEntry* pEntry = pRootEntry; + SvTreeListEntry* pLastValid = pEntry; while ( pEntry ) { pLastValid = pEntry; @@ -267,7 +267,7 @@ SbMethod* MacroChooser::GetMacro() SbModule* pModule = aBasicBox.FindModule( aBasicBox.GetCurEntry() ); if ( pModule ) { - SvLBoxEntry* pEntry = aMacroBox.FirstSelected(); + SvTreeListEntry* pEntry = aMacroBox.FirstSelected(); if ( pEntry ) { String aMacroName( aMacroBox.GetEntryText( pEntry ) ); @@ -315,7 +315,7 @@ void MacroChooser::DeleteMacro() String aModName = pModule->GetName(); OSL_VERIFY( aDocument.updateModule( aLibName, aModName, aSource ) ); - SvLBoxEntry* pEntry = aMacroBox.FirstSelected(); + SvTreeListEntry* pEntry = aMacroBox.FirstSelected(); DBG_ASSERT( pEntry, "DeleteMacro: Entry ?!" ); aMacroBox.GetModel()->Remove( pEntry ); bForceStoreBasic = true; @@ -325,7 +325,7 @@ void MacroChooser::DeleteMacro() SbMethod* MacroChooser::CreateMacro() { SbMethod* pMethod = 0; - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry); ScriptDocument aDocument( aDesc.GetDocument() ); OSL_ENSURE( aDocument.isAlive(), "MacroChooser::CreateMacro: no document!" ); @@ -380,7 +380,7 @@ SbMethod* MacroChooser::CreateMacro() return pMethod; } -void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry ) +void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry ) { // the edit would be killed by the highlight otherwise: @@ -394,9 +394,9 @@ void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry ) void MacroChooser::CheckButtons() { - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry); - SvLBoxEntry* pMacroEntry = aMacroBox.FirstSelected(); + SvTreeListEntry* pMacroEntry = aMacroBox.FirstSelected(); SbMethod* pMethod = GetMacro(); // check, if corresponding libraries are readonly @@ -532,7 +532,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox ) if ( aMacroBox.GetEntryCount() ) { - SvLBoxEntry* pEntry = aMacroBox.GetEntry( 0 ); + SvTreeListEntry* pEntry = aMacroBox.GetEntry( 0 ); DBG_ASSERT( pEntry, "Entry ?!" ); aMacroBox.SetCurEntry( pEntry ); } @@ -551,19 +551,19 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit ) // select the module in which the macro is put at Neu (new), // if BasicManager or Lib is selecting - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); if ( pCurEntry ) { sal_uInt16 nDepth = aBasicBox.GetModel()->GetDepth( pCurEntry ); if ( ( nDepth == 1 ) && ( aBasicBox.IsEntryProtected( pCurEntry ) ) ) { // then put to the respective Std-Lib... - SvLBoxEntry* pManagerEntry = aBasicBox.GetModel()->GetParent( pCurEntry ); + SvTreeListEntry* pManagerEntry = aBasicBox.GetModel()->GetParent( pCurEntry ); pCurEntry = aBasicBox.GetModel()->FirstChild( pManagerEntry ); } if ( nDepth < 2 ) { - SvLBoxEntry* pNewEntry = pCurEntry; + SvTreeListEntry* pNewEntry = pCurEntry; while ( pCurEntry && ( nDepth < 2 ) ) { pCurEntry = aBasicBox.FirstChild( pCurEntry ); @@ -581,7 +581,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit ) bool bFound = false; for ( sal_uInt16 n = 0; n < aMacroBox.GetEntryCount(); n++ ) { - SvLBoxEntry* pEntry = aMacroBox.GetEntry( n ); + SvTreeListEntry* pEntry = aMacroBox.GetEntry( n ); DBG_ASSERT( pEntry, "Entry ?!" ); if ( aMacroBox.GetEntryText( pEntry ).CompareIgnoreCaseToAscii( aEdtText ) == COMPARE_EQUAL ) { @@ -592,7 +592,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit ) } if ( !bFound ) { - SvLBoxEntry* pEntry = aMacroBox.FirstSelected(); + SvTreeListEntry* pEntry = aMacroBox.FirstSelected(); // if the entry exists ->Select ->Desription... if ( pEntry ) aMacroBox.Select( pEntry, false ); @@ -654,7 +654,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) } else if ( ( pButton == &aEditButton ) || ( pButton == &aNewDelButton ) ) { - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry); ScriptDocument aDocument( aDesc.GetDocument() ); DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" ); @@ -673,7 +673,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLib, aMod, aSub, String() ); if ( pButton == &aEditButton ) { - SvLBoxEntry* pEntry = aMacroBox.FirstSelected(); + SvTreeListEntry* pEntry = aMacroBox.FirstSelected(); if ( pEntry ) aInfoItem.SetMethod( aMacroBox.GetEntryText( pEntry ) ); StoreMacroDescription(); @@ -728,7 +728,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) else if ( pButton == &aAssignButton ) { - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry); ScriptDocument aDocument( aDesc.GetDocument() ); DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" ); @@ -750,14 +750,14 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) } else if ( pButton == &aNewLibButton ) { - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry); ScriptDocument aDocument( aDesc.GetDocument() ); createLibImpl( static_cast<Window*>( this ), aDocument, NULL, &aBasicBox ); } else if ( pButton == &aNewModButton ) { - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry); ScriptDocument aDocument( aDesc.GetDocument() ); String aLibName( aDesc.GetLibName() ); @@ -793,7 +793,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) void MacroChooser::UpdateFields() { - SvLBoxEntry* pMacroEntry = aMacroBox.GetCurEntry(); + SvTreeListEntry* pMacroEntry = aMacroBox.GetCurEntry(); String aEmptyStr; aMacroNameEdit.SetText( aEmptyStr ); diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index 083cb2ef532a..4262882aecf6 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -80,7 +80,7 @@ private: DECL_LINK( ButtonHdl, Button * ); void CheckButtons(); - void SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry ); + void SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry ); void UpdateFields(); void EnableButton( Button& rButton, bool bEnable ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 4986ad2dad37..a972bf5c5fa2 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -119,15 +119,15 @@ public: class LibLBoxString : public SvLBoxString { public: - LibLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) : + LibLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) : SvLBoxString( pEntry, nFlags, rTxt ) {} - virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry ); }; //---------------------------------------------------------------------------- -void LibLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) +void LibLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry ) { // Change text color if library is read only: bool bReadOnly = false; @@ -180,7 +180,7 @@ CheckBox::~CheckBox() delete pCheckButton; // delete user data - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { delete static_cast<LibUserData*>(pEntry->GetUserData()); @@ -216,19 +216,19 @@ void CheckBox::SetMode (ObjectMode::Mode e) //---------------------------------------------------------------------------- -SvLBoxEntry* CheckBox::DoInsertEntry( const String& rStr, sal_uLong nPos ) +SvTreeListEntry* CheckBox::DoInsertEntry( const String& rStr, sal_uLong nPos ) { return SvTabListBox::InsertEntryToColumn( rStr, nPos, 0 ); } //---------------------------------------------------------------------------- -SvLBoxEntry* CheckBox::FindEntry( const String& rName ) +SvTreeListEntry* CheckBox::FindEntry( const String& rName ) { sal_uLong nCount = GetEntryCount(); for ( sal_uLong i = 0; i < nCount; i++ ) { - SvLBoxEntry* pEntry = GetEntry( i ); + SvTreeListEntry* pEntry = GetEntry( i ); DBG_ASSERT( pEntry, "pEntry?!" ); if ( rName.CompareIgnoreCaseToAscii( GetEntryText( pEntry, 0 ) ) == COMPARE_EQUAL ) return pEntry; @@ -242,7 +242,7 @@ void CheckBox::CheckEntryPos( sal_uLong nPos ) { if ( nPos < GetEntryCount() ) { - SvLBoxEntry* pEntry = GetEntry( nPos ); + SvTreeListEntry* pEntry = GetEntry( nPos ); if ( GetCheckButtonState( pEntry ) != SV_BUTTON_CHECKED ) SetCheckButtonState( pEntry, SvButtonState(SV_BUTTON_CHECKED) ); @@ -260,7 +260,7 @@ bool CheckBox::IsChecked( sal_uLong nPos ) const //---------------------------------------------------------------------------- -void CheckBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind ) +void CheckBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind ) { SvTabListBox::InitEntry( pEntry, rTxt, rImg1, rImg2, eButtonKind ); @@ -279,7 +279,7 @@ void CheckBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, const Imag //---------------------------------------------------------------------------- -sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) +sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { if (eMode != ObjectMode::Module) return false; @@ -327,7 +327,7 @@ sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) //---------------------------------------------------------------------------- -sal_Bool CheckBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewName ) +sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName ) { bool bValid = rNewName.getLength() <= 30 && IsValidSbxName(rNewName); OUString aOldName( GetEntryText( pEntry, 0 ) ); @@ -558,7 +558,7 @@ LibPage::~LibPage() void LibPage::CheckButtons() { - SvLBoxEntry* pCur = aLibBox.GetCurEntry(); + SvTreeListEntry* pCur = aLibBox.GetCurEntry(); if ( pCur ) { OUString aLibName = aLibBox.GetEntryText( pCur, 0 ); @@ -656,7 +656,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton ) SFX_APP()->ExecuteSlot( aRequest ); SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) ); - SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry(); DBG_ASSERT( pCurEntry, "Entry?!" ); String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName ); @@ -681,7 +681,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton ) } else if ( pButton == &aPasswordButton ) { - SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry(); OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); // load module library (if not loaded) @@ -748,7 +748,7 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg ) { long nRet = 0; - SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry(); OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); Reference< script::XLibraryContainerPassword > xPasswd( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); @@ -899,7 +899,7 @@ void LibPage::InsertLib() if ( !( ( xModLibContImport.is() && xModLibContImport->hasByName( aLibName ) && xModLibContImport->isLibraryLink( aLibName ) ) || ( xDlgLibContImport.is() && xDlgLibContImport->hasByName( aLibName ) && xDlgLibContImport->isLibraryLink( aLibName ) ) ) ) { - SvLBoxEntry* pEntry = pLibDlg->GetLibBox().DoInsertEntry( aLibName ); + SvTreeListEntry* pEntry = pLibDlg->GetLibBox().DoInsertEntry( aLibName ); sal_uInt16 nPos = (sal_uInt16) pLibDlg->GetLibBox().GetModel()->GetAbsPos( pEntry ); pLibDlg->GetLibBox().CheckEntryPos(nPos); } @@ -928,7 +928,7 @@ void LibPage::InsertLib() { if ( pLibDlg->GetLibBox().IsChecked( nLib ) ) { - SvLBoxEntry* pEntry = pLibDlg->GetLibBox().GetEntry( nLib ); + SvTreeListEntry* pEntry = pLibDlg->GetLibBox().GetEntry( nLib ); DBG_ASSERT( pEntry, "Entry?!" ); OUString aLibName( pLibDlg->GetLibBox().GetEntryText( pEntry, 0 ) ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); @@ -1001,7 +1001,7 @@ void LibPage::InsertLib() if ( bRemove ) { // remove listbox entry - SvLBoxEntry* pEntry_ = aLibBox.FindEntry( aLibName ); + SvTreeListEntry* pEntry_ = aLibBox.FindEntry( aLibName ); if ( pEntry_ ) aLibBox.SvTreeListBox::GetModel()->Remove( pEntry_ ); @@ -1141,7 +1141,7 @@ void LibPage::InsertLib() } } - SvLBoxEntry* pFirstNew = aLibBox.GetEntry( nNewPos ); + SvTreeListEntry* pFirstNew = aLibBox.GetEntry( nNewPos ); if ( pFirstNew ) aLibBox.SetCurEntry( pFirstNew ); } @@ -1158,7 +1158,7 @@ void LibPage::InsertLib() void LibPage::Export( void ) { - SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry(); String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); // Password verification @@ -1417,7 +1417,7 @@ void LibPage::ExportAsBasic( const String& aLibName ) void LibPage::DeleteCurrent() { - SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry(); String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); // check, if library is link @@ -1518,7 +1518,7 @@ void LibPage::SetCurLib() ImpInsertLibEntry( aLibName, i ); } - SvLBoxEntry* pEntry_ = aLibBox.FindEntry( OUString( "Standard" ) ); + SvTreeListEntry* pEntry_ = aLibBox.FindEntry( OUString( "Standard" ) ); if ( !pEntry_ ) pEntry_ = aLibBox.GetEntry( 0 ); aLibBox.SetCurEntry( pEntry_ ); @@ -1528,7 +1528,7 @@ void LibPage::SetCurLib() //---------------------------------------------------------------------------- -SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos ) +SvTreeListEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos ) { // check, if library is password protected bool bProtected = false; @@ -1543,7 +1543,7 @@ SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos } } - SvLBoxEntry* pNewEntry = aLibBox.DoInsertEntry( rLibName, nPos ); + SvTreeListEntry* pNewEntry = aLibBox.DoInsertEntry( rLibName, nPos ); pNewEntry->SetUserData( new LibUserData(m_aCurDocument) ); if (bProtected) @@ -1620,7 +1620,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, if( pLibBox ) { - SvLBoxEntry* pEntry = pLibBox->DoInsertEntry( aLibName ); + SvTreeListEntry* pEntry = pLibBox->DoInsertEntry( aLibName ); pEntry->SetUserData( new LibUserData( rDocument ) ); pLibBox->SetCurEntry( pEntry ); } @@ -1638,8 +1638,8 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, if( pBasicBox ) { - SvLBoxEntry* pEntry = pBasicBox->GetCurEntry(); - SvLBoxEntry* pRootEntry = NULL; + SvTreeListEntry* pEntry = pBasicBox->GetCurEntry(); + SvTreeListEntry* pRootEntry = NULL; while( pEntry ) { pRootEntry = pEntry; @@ -1649,7 +1649,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, sal_uInt16 nMode = pBasicBox->GetMode(); bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES ); sal_uInt16 nId = bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB; - SvLBoxEntry* pNewLibEntry = pBasicBox->AddEntry( + SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry( aLibName, Image( IDEResId( nId ) ), pRootEntry, false, @@ -1659,7 +1659,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, if( pNewLibEntry ) { - SvLBoxEntry* pEntry_ = pBasicBox->AddEntry( + SvTreeListEntry* pEntry_ = pBasicBox->AddEntry( aModName, Image( IDEResId( RID_IMG_MODULE ) ), pNewLibEntry, false, diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 337063dc4b7f..cfbea3e86b0e 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -59,7 +59,7 @@ ExtTreeListBox::ExtTreeListBox (Window* pParent, ResId const& rRes) : ExtTreeListBox::~ExtTreeListBox () { } -sal_Bool ExtTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) +sal_Bool ExtTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { bool bRet = false; @@ -85,7 +85,7 @@ sal_Bool ExtTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) return bRet; } -sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText ) +sal_Bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { if ( !IsValidSbxName(rNewText) ) { @@ -133,7 +133,7 @@ sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewT } -DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry ) +DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* pEntry ) { DragDropMode nMode_ = SV_DRAGDROP_NONE; @@ -173,14 +173,14 @@ DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntr } -sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry ) +sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry ) { // don't drop on a BasicManager (nDepth == 0) sal_uInt16 nDepth = pEntry ? GetModel()->GetDepth( pEntry ) : 0; bool bValid = nDepth != 0; // don't drop in the same library - SvLBoxEntry* pSelected = FirstSelected(); + SvTreeListEntry* pSelected = FirstSelected(); if ( ( nDepth == 1 ) && ( pEntry == GetParent( pSelected ) ) ) bValid = false; else if ( ( nDepth == 2 ) && ( GetParent( pEntry ) == GetParent( pSelected ) ) ) @@ -237,15 +237,15 @@ sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry ) return bValid; } -sal_Bool ExtTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ) +sal_Bool ExtTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) { return NotifyCopyingMoving( pTarget, pEntry, rpNewParent, rNewChildPos, true ); } -sal_Bool ExtTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ) +sal_Bool ExtTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) { // return false; // how do I copy an SBX?! return NotifyCopyingMoving( pTarget, pEntry, @@ -311,8 +311,8 @@ void Shell::CopyDialogResources( } -sal_Bool ExtTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove ) +sal_Bool ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove ) { (void)pEntry; DBG_ASSERT( pEntry, "Kein Eintrag?" ); // ASS is ok here, should not be reached @@ -606,7 +606,7 @@ void ObjectPage::DeactivatePage() void ObjectPage::CheckButtons() { // enable/disable edit button - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry); ScriptDocument aDocument( aDesc.GetDocument() ); OUString aLibName( aDesc.GetLibName() ); @@ -679,7 +679,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) SFX_APP()->ExecuteSlot( aRequest ); SfxDispatcher* pDispatcher = GetDispatcher(); - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); DBG_ASSERT( pCurEntry, "Entry?!" ); if ( aBasicBox.GetModel()->GetDepth( pCurEntry ) >= 2 ) { @@ -702,7 +702,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) { DBG_ASSERT( aBasicBox.GetModel()->GetDepth( pCurEntry ) == 1, "Kein LibEntry?!" ); ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() ); - SvLBoxEntry* pParentEntry = aBasicBox.GetParent( pCurEntry ); + SvTreeListEntry* pParentEntry = aBasicBox.GetParent( pCurEntry ); if ( pParentEntry ) { DocumentEntry* pDocumentEntry = (DocumentEntry*)pParentEntry->GetUserData(); @@ -735,7 +735,7 @@ bool ObjectPage::GetSelection( ScriptDocument& rDocument, OUString& rLibName ) { bool bRet = false; - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry); rDocument = aDesc.GetDocument(); rLibName = aDesc.GetLibName(); @@ -827,18 +827,18 @@ void ObjectPage::NewDialog() pDispatcher->Execute( SID_BASICIDE_SBXINSERTED, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L ); LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName ); - SvLBoxEntry* pRootEntry = aBasicBox.FindRootEntry( aDocument, eLocation ); + SvTreeListEntry* pRootEntry = aBasicBox.FindRootEntry( aDocument, eLocation ); if ( pRootEntry ) { if ( !aBasicBox.IsExpanded( pRootEntry ) ) aBasicBox.Expand( pRootEntry ); - SvLBoxEntry* pLibEntry = aBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY ); + SvTreeListEntry* pLibEntry = aBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY ); DBG_ASSERT( pLibEntry, "Libeintrag nicht gefunden!" ); if ( pLibEntry ) { if ( !aBasicBox.IsExpanded( pLibEntry ) ) aBasicBox.Expand( pLibEntry ); - SvLBoxEntry* pEntry = aBasicBox.FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG ); + SvTreeListEntry* pEntry = aBasicBox.FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG ); if ( !pEntry ) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -862,7 +862,7 @@ void ObjectPage::NewDialog() void ObjectPage::DeleteCurrent() { - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry(); DBG_ASSERT( pCurEntry, "Kein aktueller Eintrag!" ); EntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) ); ScriptDocument aDocument( aDesc.GetDocument() ); @@ -981,22 +981,22 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, pDispatcher->Execute( SID_BASICIDE_SBXINSERTED, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L ); LibraryLocation eLocation = rDocument.getLibraryLocation( aLibName ); - SvLBoxEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation ); + SvTreeListEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation ); if ( pRootEntry ) { if ( !rBasicBox.IsExpanded( pRootEntry ) ) rBasicBox.Expand( pRootEntry ); - SvLBoxEntry* pLibEntry = rBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY ); + SvTreeListEntry* pLibEntry = rBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY ); DBG_ASSERT( pLibEntry, "Libeintrag nicht gefunden!" ); if ( pLibEntry ) { if ( !rBasicBox.IsExpanded( pLibEntry ) ) rBasicBox.Expand( pLibEntry ); - SvLBoxEntry* pSubRootEntry = pLibEntry; + SvTreeListEntry* pSubRootEntry = pLibEntry; if( pBasic && rDocument.isInVBAMode() ) { // add the new module in the "Modules" entry - SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES ); + SvTreeListEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES ); if( pLibSubEntry ) { if( !rBasicBox.IsExpanded( pLibSubEntry ) ) @@ -1005,7 +1005,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, } } - SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE ); + SvTreeListEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE ); if ( !pEntry ) { SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 1179a9cc839e..156f0ad66058 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -104,18 +104,18 @@ public: class ExtTreeListBox : public TreeListBox { protected: - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); - virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* pEntry ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* pEntry ); + virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* pEntry ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ); - sal_Bool NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove ); + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); + sal_Bool NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove ); public: ExtTreeListBox( Window* pParent, const ResId& rRes ); @@ -134,15 +134,15 @@ public: CheckBox( Window* pParent, const ResId& rResId ); ~CheckBox(); - SvLBoxEntry* DoInsertEntry( const String& rStr, sal_uLong nPos = LISTBOX_APPEND ); - SvLBoxEntry* FindEntry( const String& rName ); + SvTreeListEntry* DoInsertEntry( const String& rStr, sal_uLong nPos = LISTBOX_APPEND ); + SvTreeListEntry* FindEntry( const String& rName ); void CheckEntryPos( sal_uLong nPos ); bool IsChecked( sal_uLong nPos ) const; - virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText ); + virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } @@ -259,7 +259,7 @@ protected: void FillListBox(); void InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); void SetCurLib(); - SvLBoxEntry* ImpInsertLibEntry( const String& rLibName, sal_uLong nPos ); + SvTreeListEntry* ImpInsertLibEntry( const String& rLibName, sal_uLong nPos ); virtual void ActivatePage(); virtual void DeactivatePage(); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 080ad76c8f24..bb5ef2ae63a2 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -77,7 +77,7 @@ void lcl_UpdateCurrentRange( SvTabListBox & rOutListBox, const OUString & rRole, const OUString & rRange ) { - SvLBoxEntry * pEntry = rOutListBox.FirstSelected(); + SvTreeListEntry * pEntry = rOutListBox.FirstSelected(); if( pEntry ) rOutListBox.SetEntryText( lcl_GetRoleLBEntry( rRole, rRange ), pEntry ); } @@ -106,7 +106,7 @@ bool lcl_UpdateCurrentSeriesName( OUString lcl_GetSelectedRole( const SvTabListBox & rRoleListBox, bool bUITranslated = false ) { OUString aResult; - SvLBoxEntry * pEntry = rRoleListBox.FirstSelected(); + SvTreeListEntry * pEntry = rRoleListBox.FirstSelected(); if( pEntry ) aResult = OUString( rRoleListBox.GetEntryText( pEntry, bUITranslated ? 1 : 0 )); @@ -116,7 +116,7 @@ OUString lcl_GetSelectedRole( const SvTabListBox & rRoleListBox, bool bUITransla OUString lcl_GetSelectedRolesRange( const SvTabListBox & rRoleListBox ) { OUString aResult; - SvLBoxEntry * pEntry = rRoleListBox.FirstSelected(); + SvTreeListEntry * pEntry = rRoleListBox.FirstSelected(); if( pEntry ) aResult = OUString( rRoleListBox.GetEntryText( pEntry, 2 )); return aResult; @@ -459,7 +459,7 @@ void DataSourceTabPage::fillSeriesListBox() xSelected.set( pEntry->m_xDataSeries ); bool bHasSelectedEntry = (pEntry != 0); - SvLBoxEntry * pSelectedEntry = 0; + SvTreeListEntry * pSelectedEntry = 0; m_apLB_SERIES->Clear(); ::std::vector< DialogModel::tSeriesWithChartTypeByName > aSeries( @@ -511,7 +511,7 @@ void DataSourceTabPage::fillRoleListBox() SeriesEntry * pSeriesEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); bool bHasSelectedEntry = (pSeriesEntry != 0); - SvLBoxEntry * pRoleEntry = m_aLB_ROLE.FirstSelected(); + SvTreeListEntry * pRoleEntry = m_aLB_ROLE.FirstSelected(); sal_uLong nRoleIndex = SAL_MAX_UINT32; if( pRoleEntry ) nRoleIndex = m_aLB_ROLE.GetModel()->GetAbsPos( pRoleEntry ); @@ -549,14 +549,14 @@ void DataSourceTabPage::fillRoleListBox() void DataSourceTabPage::updateControlState() { - SvLBoxEntry * pSeriesEntry = m_apLB_SERIES->FirstSelected(); + SvTreeListEntry * pSeriesEntry = m_apLB_SERIES->FirstSelected(); bool bHasSelectedSeries = (pSeriesEntry != 0); bool bHasValidRole = false; bool bHasRangeChooser = m_rDialogModel.getRangeSelectionHelper()->hasRangeSelection(); if( bHasSelectedSeries ) { - SvLBoxEntry * pRoleEntry = m_aLB_ROLE.FirstSelected(); + SvTreeListEntry * pRoleEntry = m_aLB_ROLE.FirstSelected(); bHasValidRole = (pRoleEntry != 0); } @@ -601,7 +601,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl) IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl) { m_rDialogModel.startControllerLockTimer(); - SvLBoxEntry * pEntry = m_aLB_ROLE.FirstSelected(); + SvTreeListEntry * pEntry = m_aLB_ROLE.FirstSelected(); if( pEntry ) { OUString aRange( m_aEDT_RANGE.GetText()); @@ -712,10 +712,10 @@ IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl) fillSeriesListBox(); // note the box was cleared and refilled, so pEntry is invalid now - SvLBoxEntry * pSelEntry = m_apLB_SERIES->FirstSelected(); + SvTreeListEntry * pSelEntry = m_apLB_SERIES->FirstSelected(); if( pSelEntry ) { - SvLBoxEntry * pNextEntry = m_apLB_SERIES->Next( pSelEntry ); + SvTreeListEntry * pNextEntry = m_apLB_SERIES->Next( pSelEntry ); if( pNextEntry ) m_apLB_SERIES->Select( pNextEntry ); } diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index fe1f1fd07e20..602831e464ce 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -39,7 +39,7 @@ SeriesListBox::SeriesListBox( Window* pParent, const ResId & rResId ) : SeriesListBox::~SeriesListBox() {} -SvLBoxEntry* SeriesListBox::CreateEntry() const +SvTreeListEntry* SeriesListBox::CreateEntry() const { return new SeriesEntry(); } diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx index c2f0b798aaf0..47142817410f 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx @@ -31,7 +31,7 @@ namespace chart { -class SeriesEntry : public ::SvLBoxEntry +class SeriesEntry : public ::SvTreeListEntry { public: virtual ~SeriesEntry(); @@ -53,7 +53,7 @@ public: explicit SeriesListBox( Window* pParent, const ResId & rResId ); ~SeriesListBox( ); - virtual SvLBoxEntry* CreateEntry() const; + virtual SvTreeListEntry* CreateEntry() const; }; } // namespace chart diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 1bfbfd48853f..0d6eb9e4a5ab 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -622,18 +622,18 @@ static long AccCfgTabs[] = class SfxAccCfgLBoxString_Impl : public SvLBoxString { public: - SfxAccCfgLBoxString_Impl( SvLBoxEntry* pEntry, + SfxAccCfgLBoxString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText ); virtual ~SfxAccCfgLBoxString_Impl(); virtual void Paint( - const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry); + const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvTreeListEntry* pEntry); }; //----------------------------------------------- -SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl( SvLBoxEntry* pEntry, +SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText ) : SvLBoxString(pEntry, nFlags, sText) @@ -646,7 +646,7 @@ SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl() } void SfxAccCfgLBoxString_Impl::Paint( - const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry) + const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvTreeListEntry* pEntry) { if (!pEntry) return; @@ -663,7 +663,7 @@ void SfxAccCfgLBoxString_Impl::Paint( } //----------------------------------------------- -void SfxAccCfgTabListBox_Impl::InitEntry( SvLBoxEntry* pEntry , +void SfxAccCfgTabListBox_Impl::InitEntry( SvTreeListEntry* pEntry , const XubString& sText , const Image& aImage1, const Image& aImage2, @@ -692,7 +692,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey) (nCode1 != KEY_PAGEDOWN) ) { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while (pEntry) { TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); @@ -798,7 +798,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage() { // free memory - remove all dynamic user data - SvLBoxEntry* pEntry = aEntriesBox.First(); + SvTreeListEntry* pEntry = aEntriesBox.First(); while (pEntry) { TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); @@ -876,7 +876,7 @@ void SfxAcceleratorConfigPage::InitAccCfg() This is needed as we have to paint disabled entries by ourself. No support for that in the original SvTabListBox! */ -void SfxAcceleratorConfigPage::CreateCustomItems( SvLBoxEntry* pEntry, +void SfxAcceleratorConfigPage::CreateCustomItems( SvTreeListEntry* pEntry, const String& sCol1 , const String& sCol2 ) { @@ -921,7 +921,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler if (!sKey.Len()) continue; TAccInfo* pEntry = new TAccInfo(i1, nListPos, aKey); - SvLBoxEntry* pLBEntry = aEntriesBox.InsertEntryToColumn(sKey, 0L, LIST_APPEND, 0xFFFF); + SvTreeListEntry* pLBEntry = aEntriesBox.InsertEntryToColumn(sKey, 0L, LIST_APPEND, 0xFFFF); pLBEntry->SetUserData(pEntry); } @@ -944,7 +944,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler aEntriesBox.SetEntryText(sLabel, nPos, nCol); - SvLBoxEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos); + SvTreeListEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos); TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData(); pEntry->m_bIsConfigurable = sal_True; @@ -964,7 +964,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler continue; // Hardcoded function mapped so no ID possible and mark entry as not changeable - SvLBoxEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos); + SvTreeListEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos); TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData(); pEntry->m_bIsConfigurable = sal_False; @@ -981,7 +981,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele // Go through the list from the bottom to the top ... // because logical accelerator must be preferred instead of // physical ones! - SvLBoxEntry* pEntry = aEntriesBox.First(); + SvTreeListEntry* pEntry = aEntriesBox.First(); while (pEntry) { TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); @@ -1115,7 +1115,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) aChangeButton.Enable( sal_False ); // #i36994 First selected can return zero! - SvLBoxEntry* pLBEntry = aEntriesBox.FirstSelected(); + SvTreeListEntry* pLBEntry = aEntriesBox.FirstSelected(); if ( pLBEntry != 0 ) { sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( pLBEntry ); @@ -1131,14 +1131,14 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) // update key box aKeyBox.Clear(); - SvLBoxEntry* pIt = aEntriesBox.First(); + SvTreeListEntry* pIt = aEntriesBox.First(); while ( pIt ) { TAccInfo* pUserData = (TAccInfo*)pIt->GetUserData(); if ( pUserData && pUserData->m_sCommand == sPossibleNewCommand ) { TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey); - SvLBoxEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND ); + SvTreeListEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND ); pE1->SetUserData(pU1); pE1->EnableChildrenOnDemand( sal_False ); } @@ -1149,10 +1149,10 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) else { // goto selected "key" entry of the key box - SvLBoxEntry* pE2 = 0; + SvTreeListEntry* pE2 = 0; TAccInfo* pU2 = 0; sal_uInt16 nP2 = LISTBOX_ENTRY_NOTFOUND; - SvLBoxEntry* pE3 = 0; + SvTreeListEntry* pE3 = 0; pE2 = aKeyBox.FirstSelected(); if (pE2) @@ -1194,7 +1194,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) pGroupLBox->Init(m_xSMGR, m_xFrame, m_sModuleLongName); // pb: #133213# do not select NULL entries - SvLBoxEntry* pEntry = aEntriesBox.GetEntry( 0, 0 ); + SvTreeListEntry* pEntry = aEntriesBox.GetEntry( 0, 0 ); if ( pEntry ) aEntriesBox.Select( pEntry ); pEntry = pGroupLBox->GetEntry( 0, 0 ); @@ -1472,7 +1472,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) sal_uInt16 SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const { sal_uInt16 nCode1 = aKey.GetCode()+aKey.GetModifier(); - SvLBoxEntry* pEntry = aEntriesBox.First(); + SvTreeListEntry* pEntry = aEntriesBox.First(); sal_uInt16 i = 0; while (pEntry) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 50e21ff19710..03ca2fe25865 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1256,7 +1256,7 @@ void MenuSaveInData::Apply( SvxConfigEntry* pRootEntry_, uno::Reference< container::XIndexContainer >& rMenuBar, uno::Reference< lang::XSingleComponentFactory >& rFactory, - SvLBoxEntry *pParentEntry ) + SvTreeListEntry *pParentEntry ) { (void)pRootEntry_; (void)pParentEntry; @@ -1353,14 +1353,14 @@ MenuSaveInData::Reset() class PopupPainter : public SvLBoxString { public: - PopupPainter( SvLBoxEntry* pEntry, const String& rStr ) + PopupPainter( SvTreeListEntry* pEntry, const String& rStr ) : SvLBoxString( pEntry, 0, rStr ) { } ~PopupPainter() { } void Paint( const Point& rPos, SvTreeListBox& rOutDev, - sal_uInt16 nViewDataEntryFlags, SvLBoxEntry* pEntry ) + sal_uInt16 nViewDataEntryFlags, SvTreeListEntry* pEntry ) { SvLBoxString::Paint( rPos, rOutDev, nViewDataEntryFlags, pEntry ); @@ -1438,7 +1438,7 @@ SvxMenuEntriesListBox::~SvxMenuEntriesListBox() // drag and drop support DragDropMode SvxMenuEntriesListBox::NotifyStartDrag( - TransferDataContainer& aTransferDataContainer, SvLBoxEntry* pEntry ) + TransferDataContainer& aTransferDataContainer, SvTreeListEntry* pEntry ) { (void)aTransferDataContainer; (void)pEntry; @@ -1470,14 +1470,14 @@ sal_Int8 SvxMenuEntriesListBox::AcceptDrop( const AcceptDropEvent& rEvt ) return SvTreeListBox::AcceptDrop( aNewAcceptDropEvent ); } -sal_Bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvLBoxEntry* ) +sal_Bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvTreeListEntry* ) { return sal_True; } sal_Bool SvxMenuEntriesListBox::NotifyMoving( - SvLBoxEntry* pTarget, SvLBoxEntry* pSource, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos) + SvTreeListEntry* pTarget, SvTreeListEntry* pSource, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) { // only try to do a move if we are dragging within the list box if ( m_bIsInternalDrag ) @@ -1500,8 +1500,8 @@ sal_Bool SvxMenuEntriesListBox::NotifyMoving( } sal_Bool SvxMenuEntriesListBox::NotifyCopying( - SvLBoxEntry* pTarget, SvLBoxEntry* pSource, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos) + SvTreeListEntry* pTarget, SvTreeListEntry* pSource, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) { (void)pSource; (void)rpNewParent; @@ -2063,8 +2063,8 @@ SvxEntries* SvxConfigPage::FindParentForChild( return NULL; } -SvLBoxEntry* SvxConfigPage::AddFunction( - SvLBoxEntry* pTarget, bool bFront, bool bAllowDuplicates ) +SvTreeListEntry* SvxConfigPage::AddFunction( + SvTreeListEntry* pTarget, bool bFront, bool bAllowDuplicates ) { String aDisplayName = pSelectorDlg->GetSelectedDisplayName(); String aHelpText = pSelectorDlg->GetSelectedHelpText(); @@ -2106,16 +2106,16 @@ SvLBoxEntry* SvxConfigPage::AddFunction( return InsertEntry( pNewEntryData, pTarget, bFront ); } -SvLBoxEntry* SvxConfigPage::InsertEntry( +SvTreeListEntry* SvxConfigPage::InsertEntry( SvxConfigEntry* pNewEntryData, - SvLBoxEntry* pTarget, + SvTreeListEntry* pTarget, bool bFront ) { // Grab the entries list for the currently selected menu SvxEntries* pEntries = GetTopLevelSelection()->GetEntries(); - SvLBoxEntry* pNewEntry = NULL; - SvLBoxEntry* pCurEntry = + SvTreeListEntry* pNewEntry = NULL; + SvTreeListEntry* pCurEntry = pTarget != NULL ? pTarget : aContentsListBox->GetCurEntry(); if ( bFront ) @@ -2166,10 +2166,10 @@ SvLBoxEntry* SvxConfigPage::InsertEntry( return pNewEntry; } -SvLBoxEntry* SvxConfigPage::InsertEntryIntoUI( +SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( SvxConfigEntry* pNewEntryData, sal_uLong nPos ) { - SvLBoxEntry* pNewEntry = NULL; + SvTreeListEntry* pNewEntry = NULL; if (pNewEntryData->IsSeparator()) { @@ -2227,9 +2227,9 @@ IMPL_LINK( SvxConfigPage, MoveHdl, Button *, pButton ) void SvxConfigPage::MoveEntry( bool bMoveUp ) { - SvLBoxEntry *pSourceEntry = aContentsListBox->FirstSelected(); - SvLBoxEntry *pTargetEntry = NULL; - SvLBoxEntry *pToSelect = NULL; + SvTreeListEntry *pSourceEntry = aContentsListBox->FirstSelected(); + SvTreeListEntry *pTargetEntry = NULL; + SvTreeListEntry *pToSelect = NULL; if ( !pSourceEntry ) { @@ -2260,7 +2260,7 @@ void SvxConfigPage::MoveEntry( bool bMoveUp ) } bool SvxConfigPage::MoveEntryData( - SvLBoxEntry* pSourceEntry, SvLBoxEntry* pTargetEntry ) + SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry ) { //modified by shizhoubo for issue53677 if ( NULL == pSourceEntry || NULL == pTargetEntry ) @@ -2400,7 +2400,7 @@ void SvxMenuConfigPage::UpdateButtonStates() PopupMenu* pPopup = aModifyCommandButton.GetPopupMenu(); // Disable Up and Down buttons depending on current selection - SvLBoxEntry* selection = aContentsListBox->GetCurEntry(); + SvTreeListEntry* selection = aContentsListBox->GetCurEntry(); if ( aContentsListBox->GetEntryCount() == 0 || selection == NULL ) { @@ -2416,8 +2416,8 @@ void SvxMenuConfigPage::UpdateButtonStates() return; } - SvLBoxEntry* first = aContentsListBox->First(); - SvLBoxEntry* last = aContentsListBox->Last(); + SvTreeListEntry* first = aContentsListBox->First(); + SvTreeListEntry* last = aContentsListBox->Last(); aMoveUpButton.Enable( selection != first ); aMoveDownButton.Enable( selection != last ); @@ -2460,7 +2460,7 @@ void SvxMenuConfigPage::DeleteSelectedTopLevel() bool SvxMenuConfigPage::DeleteSelectedContent() { - SvLBoxEntry *pActEntry = aContentsListBox->FirstSelected(); + SvTreeListEntry *pActEntry = aContentsListBox->FirstSelected(); if ( pActEntry != NULL ) { @@ -2651,7 +2651,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) } case ID_RENAME: { - SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry(); + SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = (SvxConfigEntry*) pActEntry->GetUserData(); @@ -2782,7 +2782,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( if ( entries != NULL ) { SvxConfigEntry* pEntry; - SvLBoxEntry* pLBEntry; + SvTreeListEntry* pLBEntry; pEntries = new SvxEntries(); SvxEntries::const_iterator iter = entries->begin(); @@ -2911,9 +2911,9 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, SelectHdl, Control*, pCtrl ) void SvxMainMenuOrganizerDialog::UpdateButtonStates() { // Disable Up and Down buttons depending on current selection - SvLBoxEntry* selection = aMenuListBox.GetCurEntry(); - SvLBoxEntry* first = aMenuListBox.First(); - SvLBoxEntry* last = aMenuListBox.Last(); + SvTreeListEntry* selection = aMenuListBox.GetCurEntry(); + SvTreeListEntry* first = aMenuListBox.First(); + SvTreeListEntry* last = aMenuListBox.Last(); aMoveUpButton.Enable( selection != first ); aMoveDownButton.Enable( selection != last ); @@ -2921,8 +2921,8 @@ void SvxMainMenuOrganizerDialog::UpdateButtonStates() IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton ) { - SvLBoxEntry *pSourceEntry = aMenuListBox.FirstSelected(); - SvLBoxEntry *pTargetEntry = NULL; + SvTreeListEntry *pSourceEntry = aMenuListBox.FirstSelected(); + SvTreeListEntry *pTargetEntry = NULL; if ( !pSourceEntry ) { @@ -3205,7 +3205,7 @@ void SvxToolbarConfigPage::DeleteSelectedTopLevel() bool SvxToolbarConfigPage::DeleteSelectedContent() { - SvLBoxEntry *pActEntry = aContentsListBox->FirstSelected(); + SvTreeListEntry *pActEntry = aContentsListBox->FirstSelected(); if ( pActEntry != NULL ) { @@ -3375,7 +3375,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) { case ID_RENAME: { - SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry(); + SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = (SvxConfigEntry*) pActEntry->GetUserData(); @@ -3402,7 +3402,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) } case ID_DEFAULT_COMMAND: { - SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry(); + SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = (SvxConfigEntry*) pActEntry->GetUserData(); @@ -3449,7 +3449,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) aContentsListBox->GetModel()->Remove( pActEntry ); - SvLBoxEntry* pNewLBEntry = + SvTreeListEntry* pNewLBEntry = InsertEntryIntoUI( pEntry, nSelectionPos ); aContentsListBox->SetCheckButtonState( pNewLBEntry, @@ -3472,7 +3472,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) SvxConfigEntry* pNewEntryData = new SvxConfigEntry; pNewEntryData->SetUserDefined( sal_True ); - SvLBoxEntry* pNewLBEntry = InsertEntry( pNewEntryData ); + SvTreeListEntry* pNewLBEntry = InsertEntry( pNewEntryData ); aContentsListBox->SetCheckButtonState( pNewLBEntry, SV_BUTTON_TRISTATE ); @@ -3499,7 +3499,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) } case ID_CHANGE_SYMBOL: { - SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry(); + SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = (SvxConfigEntry*) pActEntry->GetUserData(); @@ -3556,7 +3556,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) Image aImage( newgraphic ); aContentsListBox->GetModel()->Remove( pActEntry ); - SvLBoxEntry* pNewLBEntry = + SvTreeListEntry* pNewLBEntry = InsertEntryIntoUI( pEntry, nSelectionPos ); aContentsListBox->SetCheckButtonState( pNewLBEntry, @@ -3582,7 +3582,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) } case ID_RESET_SYMBOL: { - SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry(); + SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = (SvxConfigEntry*) pActEntry->GetUserData(); @@ -3616,7 +3616,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) Image aImage( backup ); aContentsListBox->GetModel()->Remove( pActEntry ); - SvLBoxEntry* pNewLBEntry = + SvTreeListEntry* pNewLBEntry = InsertEntryIntoUI( pEntry, nSelectionPos ); aContentsListBox->SetCheckButtonState( pNewLBEntry, @@ -4525,7 +4525,7 @@ void SvxToolbarConfigPage::UpdateButtonStates() aDescriptionField.Clear(); - SvLBoxEntry* selection = aContentsListBox->GetCurEntry(); + SvTreeListEntry* selection = aContentsListBox->GetCurEntry(); if ( aContentsListBox->GetEntryCount() == 0 || selection == NULL ) { return; @@ -4621,7 +4621,7 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox ) { SvxConfigEntry* pEntry = *iter; - SvLBoxEntry* pNewLBEntry = InsertEntryIntoUI( pEntry ); + SvTreeListEntry* pNewLBEntry = InsertEntryIntoUI( pEntry ); if (pEntry->IsBinding()) { @@ -4741,10 +4741,10 @@ IMPL_LINK( SvxToolbarConfigPage, AddFunctionHdl, return 0; } -SvLBoxEntry* SvxToolbarConfigPage::AddFunction( - SvLBoxEntry* pTarget, bool bFront, bool bAllowDuplicates ) +SvTreeListEntry* SvxToolbarConfigPage::AddFunction( + SvTreeListEntry* pTarget, bool bFront, bool bAllowDuplicates ) { - SvLBoxEntry* pNewLBEntry = + SvTreeListEntry* pNewLBEntry = SvxConfigPage::AddFunction( pTarget, bFront, bAllowDuplicates ); SvxConfigEntry* pEntry = (SvxConfigEntry*) pNewLBEntry->GetUserData(); @@ -4864,7 +4864,7 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt ) // -------------------------------------------------------- -void SvxToolbarEntriesListBox::ChangeVisibility( SvLBoxEntry* pEntry ) +void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry ) { if ( pEntry != NULL ) { @@ -4908,8 +4908,8 @@ void SvxToolbarEntriesListBox::KeyInput( const KeyEvent& rKeyEvent ) } sal_Bool SvxToolbarEntriesListBox::NotifyMoving( - SvLBoxEntry* pTarget, SvLBoxEntry* pSource, - SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos) + SvTreeListEntry* pTarget, SvTreeListEntry* pSource, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) { bool result = SvxMenuEntriesListBox::NotifyMoving( pTarget, pSource, rpNewParent, rNewChildPos ); @@ -4930,9 +4930,9 @@ sal_Bool SvxToolbarEntriesListBox::NotifyMoving( } sal_Bool SvxToolbarEntriesListBox::NotifyCopying( - SvLBoxEntry* pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry*& rpNewParent, + SvTreeListEntry* pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) { (void)pSource; diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index b457e5899d93..61db17f448bc 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -320,7 +320,7 @@ void SfxConfigFunctionListBox_Impl::ClearAll() String SfxConfigFunctionListBox_Impl::GetSelectedScriptURI() { - SvLBoxEntry *pEntry = FirstSelected(); + SvTreeListEntry *pEntry = FirstSelected(); if ( pEntry ) { SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData(); @@ -332,7 +332,7 @@ String SfxConfigFunctionListBox_Impl::GetSelectedScriptURI() String SfxConfigFunctionListBox_Impl::GetCurCommand() { - SvLBoxEntry *pEntry = FirstSelected(); + SvTreeListEntry *pEntry = FirstSelected(); if (!pEntry) return String(); SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData(); @@ -343,7 +343,7 @@ String SfxConfigFunctionListBox_Impl::GetCurCommand() String SfxConfigFunctionListBox_Impl::GetCurLabel() { - SvLBoxEntry *pEntry = FirstSelected(); + SvTreeListEntry *pEntry = FirstSelected(); if (!pEntry) return String(); SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData(); @@ -448,7 +448,7 @@ String SfxConfigGroupListBox_Impl::GetGroup() Returns the name of the selected function group/the selected basic. */ { - SvLBoxEntry *pEntry = FirstSelected(); + SvTreeListEntry *pEntry = FirstSelected(); while ( pEntry ) { SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData(); @@ -486,7 +486,7 @@ void SfxConfigGroupListBox_Impl::InitModule() catch(const css::container::NoSuchElementException&) { continue; } - SvLBoxEntry* pEntry = InsertEntry(sGroupName, NULL); + SvTreeListEntry* pEntry = InsertEntry(sGroupName, NULL); SfxGroupInfo_Impl* pInfo = new SfxGroupInfo_Impl(SFX_CFGGROUP_FUNCTION, rGroupID); pEntry->SetUserData(pInfo); } @@ -616,7 +616,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul static_cast<void *>(rootNode.get())); String aTitle(pImp->m_sDlgMacros); - SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL ); + SvTreeListEntry *pNewEntry = InsertEntry( aTitle, NULL ); pNewEntry->SetUserData( pInfo ); pNewEntry->EnableChildrenOnDemand( sal_True ); aArr.push_back( pInfo ); @@ -687,7 +687,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul 0, static_cast<void *>( theChild.get())); Image aImage = GetImage( theChild, xCtx, bIsRootNode ); - SvLBoxEntry* pNewEntry = + SvTreeListEntry* pNewEntry = InsertEntry( uiName, NULL); SetExpandedEntryBmp( pNewEntry, aImage ); SetCollapsedEntryBmp( pNewEntry, aImage ); @@ -723,7 +723,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul if ( m_xSMGR.is() ) { String sStyle( pImp->m_aStrGroupStyles ); - SvLBoxEntry *pEntry = InsertEntry( sStyle, 0 ); + SvTreeListEntry *pEntry = InsertEntry( sStyle, 0 ); SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, 0 ); // TODO last parameter should contain user data aArr.push_back( pInfo ); pEntry->SetUserData( pInfo ); @@ -866,7 +866,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() All functions/macros are displayed in the functionlistbox. */ { - SvLBoxEntry *pEntry = FirstSelected(); + SvTreeListEntry *pEntry = FirstSelected(); SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData(); pFunctionListBox->SetUpdateMode(sal_False); pFunctionListBox->ClearAll(); @@ -892,7 +892,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() { const css::frame::DispatchInformation& rInfo = lCommands[i]; ::rtl::OUString sUIName = MapCommand2UIName(rInfo.Command); - SvLBoxEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName, NULL); + SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName, NULL); SfxGroupInfo_Impl* pGrpInfo = new SfxGroupInfo_Impl(SFX_CFGFUNCTION_SLOT, 0); pGrpInfo->sCommand = rInfo.Command; pGrpInfo->sLabel = sUIName; @@ -935,7 +935,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() SfxGroupInfo_Impl* pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGFUNCTION_SCRIPT, 0, pScriptURI ); Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False ); - SvLBoxEntry* pNewEntry = + SvTreeListEntry* pNewEntry = pFunctionListBox->InsertEntry( children[n]->getName(), NULL ); pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage ); @@ -969,7 +969,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() ++pIt ) { SfxStyleInfo_Impl* pStyle = new SfxStyleInfo_Impl(*pIt); - SvLBoxEntry* pFuncEntry = pFunctionListBox->InsertEntry( pStyle->sLabel, NULL ); + SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry( pStyle->sLabel, NULL ); SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, pStyle ); pFunctionListBox->aArr.push_back( pGrpInfo ); pGrpInfo->sCommand = pStyle->sCommand; @@ -990,7 +990,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() pFunctionListBox->SetUpdateMode(sal_True); } -sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) +sal_Bool SfxConfigGroupListBox_Impl::Expand( SvTreeListEntry* pParent ) { sal_Bool bRet = SvTreeListBox::Expand( pParent ); if ( bRet ) @@ -1005,7 +1005,7 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) } else { - SvLBoxEntry *pEntry = GetFirstEntryInView(); + SvTreeListEntry *pEntry = GetFirstEntryInView(); sal_uLong nParentPos = 0; while ( pEntry && pEntry != pParent ) { @@ -1021,7 +1021,7 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) return bRet; } -void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry ) +void SfxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry ) /* Description A basic or a library is opened. */ @@ -1089,7 +1089,7 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry ) 0, static_cast<void *>( theChild.get())); Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False ); - SvLBoxEntry* pNewEntry = + SvTreeListEntry* pNewEntry = InsertEntry( theChild->getName(), pEntry ); SetExpandedEntryBmp( pNewEntry, aImage ); SetCollapsedEntryBmp(pNewEntry, aImage ); @@ -1133,7 +1133,7 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry ) ++pIt ) { SfxStyleInfo_Impl* pFamily = new SfxStyleInfo_Impl(*pIt); - SvLBoxEntry* pStyleEntry = InsertEntry( pFamily->sLabel, pEntry ); + SvTreeListEntry* pStyleEntry = InsertEntry( pFamily->sLabel, pEntry ); SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, pFamily ); aArr.push_back( pGrpInfo ); pStyleEntry->SetUserData( pGrpInfo ); @@ -1170,21 +1170,21 @@ void SfxConfigGroupListBox_Impl::SelectMacro( const String& rBasic, aModule = rMacro.GetToken( nCount-2, '.' ); } - SvLBoxEntry *pEntry = FirstChild(0); + SvTreeListEntry *pEntry = FirstChild(0); while ( pEntry ) { String aEntryBas = GetEntryText( pEntry ); if ( aEntryBas == aBasicName ) { Expand( pEntry ); - SvLBoxEntry *pLib = FirstChild( pEntry ); + SvTreeListEntry *pLib = FirstChild( pEntry ); while ( pLib ) { String aEntryLib = GetEntryText( pLib ); if ( aEntryLib == aLib ) { Expand( pLib ); - SvLBoxEntry *pMod = FirstChild( pLib ); + SvTreeListEntry *pMod = FirstChild( pLib ); while ( pMod ) { String aEntryMod = GetEntryText( pMod ); @@ -1193,7 +1193,7 @@ void SfxConfigGroupListBox_Impl::SelectMacro( const String& rBasic, Expand( pMod ); MakeVisible( pMod ); Select( pMod ); - SvLBoxEntry *pMethod = pFunctionListBox->First(); + SvTreeListEntry *pMethod = pFunctionListBox->First(); while ( pMethod ) { String aEntryMethod = GetEntryText( pMethod ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 7aa0c95e3101..2b0e57d2aa71 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -194,7 +194,7 @@ void _HeaderTabListBox::Enable( bool bEnable, bool bChild ) // and it is not read only void _SvxMacroTabPage::EnableButtons() { - const SvLBoxEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected(); + const SvTreeListEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected(); if ( pE ) { SvLBoxString* pEventMacro = (SvLBoxString*)pE->GetItem( LB_MACROS_ITEMPOS ); @@ -222,7 +222,7 @@ _SvxMacroTabPage::~_SvxMacroTabPage() { // need to delete the user data SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.GetEntry( 0 ); + SvTreeListEntry* pE = rListBox.GetEntry( 0 ); while( pE ) { ::rtl::OUString* pEventName = (::rtl::OUString*)pE->GetUserData(); @@ -433,13 +433,13 @@ class IconLBoxString : public SvLBoxString int m_nxImageOffset; public: - IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText, + IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText, Image* pMacroImg, Image* pComponentImg ); - virtual void Paint(const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); + virtual void Paint(const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvTreeListEntry* pEntry ); }; -IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText, +IconLBoxString::IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText, Image* pMacroImg, Image* pComponentImg ) : SvLBoxString( pEntry, nFlags, sText ) , m_pMacroImg( pMacroImg ) @@ -450,7 +450,7 @@ IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const St //=============================================== void IconLBoxString::Paint( const Point& aPos, SvTreeListBox& aDevice, - sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ ) + sal_uInt16 /*nFlags*/, SvTreeListEntry* /*pEntry*/ ) { String aTxt( GetText() ); if( aTxt.Len() ) @@ -490,7 +490,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents) SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); mpImpl->pEventLB->SetUpdateMode( sal_False ); rListBox.Clear(); - SvLBoxEntry* pE = rListBox.GetEntry( 0 ); + SvTreeListEntry* pE = rListBox.GetEntry( 0 ); EventsHash* eventsHash; Reference< container::XNameReplace> nameReplace; if(bAppEvents) @@ -538,7 +538,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents) String displayName( CUI_RES( displayableEvent->nEventResourceID ) ); displayName += '\t'; - SvLBoxEntry* _pE = rListBox.InsertEntry( displayName ); + SvTreeListEntry* _pE = rListBox.InsertEntry( displayName ); ::rtl::OUString* pEventName = new ::rtl::OUString( sEventName ); _pE->SetUserData( (void*)pEventName ); String sNew( eventURL ); @@ -565,7 +565,7 @@ IMPL_STATIC_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) { _SvxMacroTabPage_Impl* pImpl = pThis->mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.FirstSelected(); + SvTreeListEntry* pE = rListBox.FirstSelected(); sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == @@ -594,7 +594,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* { _SvxMacroTabPage_Impl* pImpl = pThis->mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.FirstSelected(); + SvTreeListEntry* pE = rListBox.FirstSelected(); sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) @@ -844,7 +844,7 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(0), Reference< util::XModifiable >(0)); DisplayAppEvents(true); SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.GetEntry( (sal_uLong)nSelectedIndex ); + SvTreeListEntry* pE = rListBox.GetEntry( (sal_uLong)nSelectedIndex ); if( pE ) rListBox.Select(pE); } diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index c7424aab776f..9c5cae324a6c 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -89,7 +89,7 @@ SvxConfigFunctionListBox_Impl::~SvxConfigFunctionListBox_Impl() ClearAll(); } -SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetLastSelectedEntry() +SvTreeListEntry* SvxConfigFunctionListBox_Impl::GetLastSelectedEntry() { if ( m_pDraggingEntry != NULL ) { @@ -120,7 +120,7 @@ IMPL_LINK_NOARG(SvxConfigFunctionListBox_Impl, TimerHdl) { aTimer.Stop(); Point aMousePos = GetPointerPosPixel(); - SvLBoxEntry *pEntry = GetCurEntry(); + SvTreeListEntry *pEntry = GetCurEntry(); if ( pEntry && GetEntry( aMousePos ) == pEntry && pCurEntry == pEntry ) Help::ShowBalloon( this, OutputToScreenPixel( aMousePos ), GetHelpText( pEntry ) ); return 0L; @@ -132,7 +132,7 @@ void SvxConfigFunctionListBox_Impl::ClearAll() Clear(); } -String SvxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry ) +String SvxConfigFunctionListBox_Impl::GetHelpText( SvTreeListEntry *pEntry ) { SvxGroupInfo_Impl *pInfo = pEntry ? (SvxGroupInfo_Impl*) pEntry->GetUserData(): 0; @@ -163,7 +163,7 @@ void SvxConfigFunctionListBox_Impl::FunctionSelected() // drag and drop support DragDropMode SvxConfigFunctionListBox_Impl::NotifyStartDrag( - TransferDataContainer& /*aTransferDataContainer*/, SvLBoxEntry* pEntry ) + TransferDataContainer& /*aTransferDataContainer*/, SvTreeListEntry* pEntry ) { m_pDraggingEntry = pEntry; return GetDragDropMode(); @@ -275,7 +275,7 @@ namespace } } -void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrowseNode >& _rxRootNode, SvLBoxEntry* _pParentEntry, bool _bCheapChildrenOnDemand ) +void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrowseNode >& _rxRootNode, SvTreeListEntry* _pParentEntry, bool _bCheapChildrenOnDemand ) { OSL_PRECOND( _rxRootNode.is(), "SvxConfigGroupListBox_Impl::fillScriptList: invalid root node!" ); if ( !_rxRootNode.is() ) @@ -340,7 +340,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows if ( children[n]->getType() == browse::BrowseNodeTypes::SCRIPT ) continue; - SvLBoxEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry ); + SvTreeListEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry ); Image aImage = GetImage( theChild, comphelper::getProcessComponentContext(), bIsRootNode ); SetExpandedEntryBmp( pNewEntry, aImage ); @@ -475,7 +475,7 @@ void SvxConfigGroupListBox_Impl::Init() { } - SvLBoxEntry *pEntry = InsertEntry( group, NULL ); + SvTreeListEntry *pEntry = InsertEntry( group, NULL ); SvxGroupInfo_Impl *pInfo = new SvxGroupInfo_Impl( SVX_CFGGROUP_FUNCTION, gids[i] ); @@ -510,7 +510,7 @@ void SvxConfigGroupListBox_Impl::Init() String aTitle = String( CUI_RES( STR_SELECTOR_MACROS ) ); - SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL ); + SvTreeListEntry *pNewEntry = InsertEntry( aTitle, NULL ); pNewEntry->SetUserData( pInfo ); pNewEntry->EnableChildrenOnDemand( sal_True ); aArr.push_back( pInfo ); @@ -620,7 +620,7 @@ SvxConfigGroupListBox_Impl::getDocumentModel( void SvxConfigGroupListBox_Impl::GroupSelected() { - SvLBoxEntry *pEntry = FirstSelected(); + SvTreeListEntry *pEntry = FirstSelected(); SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData(); pFunctionListBox->SetUpdateMode(sal_False); pFunctionListBox->ClearAll(); @@ -635,7 +635,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() { case SVX_CFGGROUP_FUNCTION : { - SvLBoxEntry *_pEntry = FirstSelected(); + SvTreeListEntry *_pEntry = FirstSelected(); if ( _pEntry != NULL ) { SvxGroupInfo_Impl *_pInfo = @@ -697,7 +697,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() aLabel = commands[i].Command; } - SvLBoxEntry* pFuncEntry = NULL; + SvTreeListEntry* pFuncEntry = NULL; if ( !!aImage ) { pFuncEntry = pFunctionListBox->InsertEntry( @@ -764,7 +764,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() SVX_CFGFUNCTION_SCRIPT, 123, uri, description ); Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False ); - SvLBoxEntry* pNewEntry = + SvTreeListEntry* pNewEntry = pFunctionListBox->InsertEntry( children[n]->getName(), NULL ); pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage ); @@ -796,7 +796,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() pFunctionListBox->SetUpdateMode(sal_True); } -sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) +sal_Bool SvxConfigGroupListBox_Impl::Expand( SvTreeListEntry* pParent ) { sal_Bool bRet = SvTreeListBox::Expand( pParent ); if ( bRet ) @@ -811,7 +811,7 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) } else { - SvLBoxEntry *pEntry = GetFirstEntryInView(); + SvTreeListEntry *pEntry = GetFirstEntryInView(); sal_uLong nParentPos = 0; while ( pEntry && pEntry != pParent ) { @@ -827,7 +827,7 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) return bRet; } -void SvxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry ) +void SvxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry ) { SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData(); pInfo->bWasOpened = sal_True; @@ -1043,8 +1043,8 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton ) else { // Select the next entry in the list if possible - SvLBoxEntry* current = aCommands.FirstSelected(); - SvLBoxEntry* next = aCommands.NextSibling( current ); + SvTreeListEntry* current = aCommands.FirstSelected(); + SvTreeListEntry* next = aCommands.NextSibling( current ); if ( next != NULL ) { @@ -1073,7 +1073,7 @@ SvxScriptSelectorDialog::GetScriptURL() const { OUString result; - SvLBoxEntry *pEntry = const_cast< SvxScriptSelectorDialog* >( this )->aCommands.GetLastSelectedEntry(); + SvTreeListEntry *pEntry = const_cast< SvxScriptSelectorDialog* >( this )->aCommands.GetLastSelectedEntry(); if ( pEntry ) { SvxGroupInfo_Impl *pData = (SvxGroupInfo_Impl*) pEntry->GetUserData(); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index b79feb12d2d2..50d0644a0b8e 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -985,7 +985,7 @@ namespace svx while( nCnt ) { Reference< XConversionDictionary > xDict = m_aDictList[ n ]; - SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n ); + SvTreeListEntry* pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n ); DBG_ASSERT( xDict.is(), "-HangulHanjaOptionsDialog::OkHdl(): someone is evaporated..." ); DBG_ASSERT( pEntry, "-HangulHanjaOptionsDialog::OkHdl(): no one there in list?" ); @@ -1071,7 +1071,7 @@ namespace svx IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl) { - SvLBoxEntry* pEntry = m_aDictsLB.FirstSelected(); + SvTreeListEntry* pEntry = m_aDictsLB.FirstSelected(); DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); if( pEntry ) { @@ -1165,7 +1165,7 @@ namespace svx HangulHanjaOptionsDialog::~HangulHanjaOptionsDialog() { - SvLBoxEntry* pEntry = m_aDictsLB.First(); + SvTreeListEntry* pEntry = m_aDictsLB.First(); String* pDel; while( pEntry ) { @@ -1181,7 +1181,7 @@ namespace svx void HangulHanjaOptionsDialog::AddDict( const String& _rName, bool _bChecked ) { - SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName ); + SvTreeListEntry* pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName ); m_aDictsLB.SetCheckButtonState( pEntry, _bChecked? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED ); pEntry->SetUserData( new String( _rName ) ); } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 69d9ff63fac8..848f8b1d657a 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -311,7 +311,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) |* |************************************************************************/ -int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLinks, SvLBoxEntry* pParentEntry ) +int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry ) { int nEntries=0; const uno::Sequence< OUString > aNames( xLinks->getElementNames() ); @@ -360,7 +360,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink // create userdata TargetData *pData = new TargetData ( aLink, bIsTarget ); - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; try { @@ -418,7 +418,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink void SvxHlinkDlgMarkWnd::ClearTree() { - SvLBoxEntry* pEntry = maLbTree.First(); + SvTreeListEntry* pEntry = maLbTree.First(); while ( pEntry ) { @@ -437,10 +437,10 @@ void SvxHlinkDlgMarkWnd::ClearTree() |* |************************************************************************/ -SvLBoxEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName ) +SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName ) { sal_Bool bFound=sal_False; - SvLBoxEntry* pEntry = maLbTree.First(); + SvTreeListEntry* pEntry = maLbTree.First(); while ( pEntry && !bFound ) { @@ -462,7 +462,7 @@ SvLBoxEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName ) void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark ) { - SvLBoxEntry* pEntry = FindEntry ( aStrMark ); + SvTreeListEntry* pEntry = FindEntry ( aStrMark ); if ( pEntry ) { maLbTree.Select ( pEntry ); @@ -478,7 +478,7 @@ void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark ) IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl) { - SvLBoxEntry* pEntry = maLbTree.GetCurEntry(); + SvTreeListEntry* pEntry = maLbTree.GetCurEntry(); if ( pEntry ) { diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 8ab01c089c1f..68429f218272 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -151,7 +151,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) if(nSelectionCount > 1) { // possibly deselect old entries in case of multi-selection - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; SvBaseLink* pLink = 0; pEntry = pSvTabListBox->GetHdlEntry(); pLink = (SvBaseLink*)pEntry->GetUserData(); @@ -269,7 +269,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl) std::vector< SvBaseLink* > aLnkArr; std::vector< sal_uInt16 > aPosArr; - SvLBoxEntry* pE = rListBox.FirstSelected(); + SvTreeListEntry* pE = rListBox.FirstSelected(); while( pE ) { sal_uInt16 nFndPos = (sal_uInt16)rListBox.GetModel()->GetAbsPos( pE ); @@ -322,7 +322,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl) if( pE ) { - SvLBoxEntry* pSelEntry = rListBox.FirstSelected(); + SvTreeListEntry* pSelEntry = rListBox.FirstSelected(); if( pE != pSelEntry ) rListBox.Select( pSelEntry, sal_False ); rListBox.Select( pE ); @@ -344,7 +344,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) PathDialog aPathDlg( this ); String sType, sFile, sLinkName; String sFilter; - SvLBoxEntry* pEntry = Links().FirstSelected(); + SvTreeListEntry* pEntry = Links().FirstSelected(); SvBaseLink* pLink = (SvBaseLink*)pEntry->GetUserData(); pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, 0, 0 ); INetURLObject aUrl(sFile); @@ -428,7 +428,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) pLinkMgr = 0; SetManager( pNewMgr ); - SvLBoxEntry* pEntry = Links().GetEntry( nPos ? --nPos : 0 ); + SvTreeListEntry* pEntry = Links().GetEntry( nPos ? --nPos : 0 ); if( pEntry ) Links().SetCurEntry( pEntry ); } @@ -443,7 +443,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) { SvBaseLinkMemberList aLinkList; - SvLBoxEntry* pEntry = Links().FirstSelected(); + SvTreeListEntry* pEntry = Links().FirstSelected(); while ( pEntry ) { void * pUD = pEntry->GetUserData(); @@ -492,7 +492,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) Links().SetUpdateMode(sal_False); for( sal_uLong nPos = Links().GetEntryCount(); nPos; ) { - SvLBoxEntry* pBox = Links().GetEntry( --nPos ); + SvTreeListEntry* pBox = Links().GetEntry( --nPos ); SvBaseLinkRef xLink( (SvBaseLink*)pBox->GetUserData() ); if( xLink.Is() ) { @@ -529,7 +529,7 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) { Links().SetUpdateMode(sal_False); Links().GetModel()->Remove( Links().GetEntry( nPos ) ); - SvLBoxEntry* pToUnselect = Links().FirstSelected(); + SvTreeListEntry* pToUnselect = Links().FirstSelected(); InsertEntry( *_pLink, nPos, sal_True ); if(pToUnselect) Links().Select(pToUnselect, sal_False); @@ -595,7 +595,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) if( !rLnks.empty() ) { - SvLBoxEntry* pEntry = Links().GetEntry( 0 ); + SvTreeListEntry* pEntry = Links().GetEntry( 0 ); Links().SetCurEntry( pEntry ); Links().Select( pEntry ); LinksSelectHdl( 0 ); @@ -638,7 +638,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_ aEntry += '\t'; aEntry += ImplGetStateStr( rLink ); - SvLBoxEntry * pE = Links().InsertEntryToColumn( aEntry, nPos ); + SvTreeListEntry * pE = Links().InsertEntryToColumn( aEntry, nPos ); pE->SetUserData( (void*)&rLink ); if(bSelect) Links().Select(pE); @@ -646,7 +646,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_ SvBaseLink* SvBaseLinksDlg::GetSelEntry( sal_uInt16* pPos ) { - SvLBoxEntry* pE = Links().FirstSelected(); + SvTreeListEntry* pE = Links().FirstSelected(); sal_uInt16 nPos; if( pE && LISTBOX_ENTRY_NOTFOUND != ( nPos = (sal_uInt16)Links().GetModel()->GetAbsPos( pE ) ) ) @@ -666,7 +666,7 @@ void SvBaseLinksDlg::SetType( SvBaseLink& rLink, { rLink.SetUpdateMode( nType ); rLink.Update(); - SvLBoxEntry* pBox = Links().GetEntry( nSelPos ); + SvTreeListEntry* pBox = Links().GetEntry( nSelPos ); Links().SetEntryText( ImplGetStateStr( rLink ), pBox, 3 ); if( pLinkMgr->GetPersist() ) pLinkMgr->GetPersist()->SetModified(); diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 5353edad37ea..da177364a5d2 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -68,7 +68,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl) IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox ) { - SvLBoxEntry* pEntry = + SvTreeListEntry* pEntry = pBox ? pBox->GetEntry( pBox->GetCurMousePoint() ) : aRadioLB.FirstSelected(); if ( pEntry ) aRadioLB.HandleEntryChecked( pEntry ); @@ -98,7 +98,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) { rtl::OUString sNewEntry( '\t' ); sNewEntry += sInsPath; - SvLBoxEntry* pEntry = aRadioLB.InsertEntry( sNewEntry ); + SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sNewEntry ); String* pData = new String( aURL ); pEntry->SetUserData( pData ); } @@ -134,7 +134,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl) { if ( pImpl->bIsRadioButtonMode ) { - SvLBoxEntry* pEntry = aRadioLB.FirstSelected(); + SvTreeListEntry* pEntry = aRadioLB.FirstSelected(); delete (String*)pEntry->GetUserData(); bool bChecked = aRadioLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED; sal_uLong nPos = aRadioLB.GetEntryPos( pEntry ); @@ -224,7 +224,7 @@ SvxMultiPathDialog::~SvxMultiPathDialog() nPos = (sal_uInt16)aRadioLB.GetEntryCount(); while ( nPos-- ) { - SvLBoxEntry* pEntry = aRadioLB.GetEntry( nPos ); + SvTreeListEntry* pEntry = aRadioLB.GetEntry( nPos ); delete (String*)pEntry->GetUserData(); } delete pImpl; @@ -242,7 +242,7 @@ String SvxMultiPathDialog::GetPath() const String sWritable; for ( sal_uInt16 i = 0; i < aRadioLB.GetEntryCount(); ++i ) { - SvLBoxEntry* pEntry = aRadioLB.GetEntry(i); + SvTreeListEntry* pEntry = aRadioLB.GetEntry(i); if ( aRadioLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) sWritable = *(String*)pEntry->GetUserData(); else @@ -286,7 +286,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath ) { rtl::OUString sEntry( '\t' ); sEntry += (bIsSystemPath ? sSystemPath : sPath); - SvLBoxEntry* pEntry = aRadioLB.InsertEntry( sEntry ); + SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sEntry ); String* pURL = new String( sPath ); pEntry->SetUserData( pURL ); } @@ -302,7 +302,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath ) if ( pImpl->bIsRadioButtonMode && nCount > 0 ) { - SvLBoxEntry* pEntry = aRadioLB.GetEntry( nCount - 1 ); + SvTreeListEntry* pEntry = aRadioLB.GetEntry( nCount - 1 ); if ( pEntry ) { aRadioLB.SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index c1faf050b9db..cd85721d9688 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -96,7 +96,7 @@ SFTreeListBox::~SFTreeListBox() deleteAllTree(); } -void SFTreeListBox::delUserData( SvLBoxEntry* pEntry ) +void SFTreeListBox::delUserData( SvTreeListEntry* pEntry ) { if ( pEntry ) { @@ -116,14 +116,14 @@ void SFTreeListBox::delUserData( SvLBoxEntry* pEntry ) } } -void SFTreeListBox::deleteTree( SvLBoxEntry* pEntry ) +void SFTreeListBox::deleteTree( SvTreeListEntry* pEntry ) { delUserData( pEntry ); pEntry = FirstChild( pEntry ); while ( pEntry ) { - SvLBoxEntry* pNextEntry = NextSibling( pEntry ); + SvTreeListEntry* pNextEntry = NextSibling( pEntry ); deleteTree( pEntry ); GetModel()->Remove( pEntry ); pEntry = pNextEntry; @@ -132,7 +132,7 @@ void SFTreeListBox::deleteTree( SvLBoxEntry* pEntry ) void SFTreeListBox::deleteAllTree() { - SvLBoxEntry* pEntry = GetEntry( 0 ); + SvTreeListEntry* pEntry = GetEntry( 0 ); // TBD - below is a candidate for a destroyAllTrees method if ( pEntry ) @@ -140,7 +140,7 @@ void SFTreeListBox::deleteAllTree() while ( pEntry ) { String text = GetEntryText( pEntry ); - SvLBoxEntry* pNextEntry = NextSibling( pEntry ) ; + SvTreeListEntry* pNextEntry = NextSibling( pEntry ) ; deleteTree( pEntry ); GetModel()->Remove( pEntry ); pEntry = pNextEntry; @@ -303,7 +303,7 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo return langNode; } -void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::com::sun::star::script::browse::XBrowseNode >& node, +void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference< ::com::sun::star::script::browse::XBrowseNode >& node, Reference< XModel >& model ) { if (! node.is() ) @@ -353,11 +353,11 @@ void SFTreeListBox::ExpandAllTrees() } SAL_WNODEPRECATED_DECLARATIONS_PUSH -SvLBoxEntry * SFTreeListBox::insertEntry( - String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent, +SvTreeListEntry * SFTreeListBox::insertEntry( + String const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL ) { - SvLBoxEntry * p; + SvTreeListEntry * p; if( nBitmap == IMG_DOCUMENT && !factoryURL.isEmpty() ) { Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); @@ -374,8 +374,8 @@ SvLBoxEntry * SFTreeListBox::insertEntry( SAL_WNODEPRECATED_DECLARATIONS_POP SAL_WNODEPRECATED_DECLARATIONS_PUSH -SvLBoxEntry * SFTreeListBox::insertEntry( - String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent, +SvTreeListEntry * SFTreeListBox::insertEntry( + String const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData ) { Image aImage; @@ -395,14 +395,14 @@ SvLBoxEntry * SFTreeListBox::insertEntry( { aImage = m_docImage; } - SvLBoxEntry * p = InsertEntry( + SvTreeListEntry * p = InsertEntry( rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND, aUserData.release()); // XXX possible leak return p; } SAL_WNODEPRECATED_DECLARATIONS_POP -void SFTreeListBox::RequestingChildren( SvLBoxEntry* pEntry ) +void SFTreeListBox::RequestingChildren( SvTreeListEntry* pEntry ) { SFEntry* userData = 0; if ( !pEntry ) @@ -657,7 +657,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox ) return 0; } - SvLBoxEntry* pEntry = pBox->GetHdlEntry(); + SvTreeListEntry* pEntry = pBox->GetHdlEntry(); SFEntry* userData = 0; if ( !pEntry ) @@ -692,7 +692,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) { if ( aScriptsBox.IsSelected( aScriptsBox.GetHdlEntry() ) ) { - SvLBoxEntry* pEntry = aScriptsBox.GetHdlEntry(); + SvTreeListEntry* pEntry = aScriptsBox.GetHdlEntry(); SFEntry* userData = 0; if ( !pEntry ) { @@ -738,7 +738,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) } - SvLBoxEntry* pParent = aScriptsBox.GetParent( pEntry ); + SvTreeListEntry* pParent = aScriptsBox.GetParent( pEntry ); while ( pParent && !mspNode.is() ) { SFEntry* mspUserData = (SFEntry*)pParent->GetUserData(); @@ -825,7 +825,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) return 0; } -Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvLBoxEntry* pEntry ) +Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvTreeListEntry* pEntry ) { Reference< browse::XBrowseNode > node; if ( pEntry ) @@ -840,7 +840,7 @@ Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvLBoxEntry* return node; } -Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) +Reference< XModel > SvxScriptOrgDialog::getModel( SvTreeListEntry* pEntry ) { Reference< XModel > model; if ( pEntry ) @@ -855,7 +855,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) return model; } -void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) +void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) { Reference< browse::XBrowseNode > aChildNode; @@ -994,7 +994,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) if ( aChildNode.is() ) { String aChildName = aChildNode->getName(); - SvLBoxEntry* pNewEntry = NULL; + SvTreeListEntry* pNewEntry = NULL; ::rtl::OUString name( aChildName ); @@ -1045,7 +1045,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) } } -void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) +void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) { Reference< browse::XBrowseNode > aChildNode; @@ -1122,7 +1122,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) aErrorBox.Execute(); } } -void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry ) +void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) { sal_Bool result = sal_False; Reference< browse::XBrowseNode > node = getBrowseNode( pEntry ); @@ -1225,7 +1225,7 @@ void SvxScriptOrgDialog::StoreCurrentSelection() String aDescription; if ( aScriptsBox.IsSelected( aScriptsBox.GetHdlEntry() ) ) { - SvLBoxEntry* pEntry = aScriptsBox.GetHdlEntry(); + SvTreeListEntry* pEntry = aScriptsBox.GetHdlEntry(); while( pEntry ) { aDescription.Insert( aScriptsBox.GetEntryText( pEntry ), 0 ); @@ -1243,12 +1243,12 @@ void SvxScriptOrgDialog::RestorePreviousSelection() String aStoredEntry = String( m_lastSelection[ m_sLanguage ] ); if( aStoredEntry.Len() <= 0 ) return; - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; sal_uInt16 nIndex = 0; while ( nIndex != STRING_NOTFOUND ) { String aTmp( aStoredEntry.GetToken( 0, ';', nIndex ) ); - SvLBoxEntry* pTmpEntry = aScriptsBox.FirstChild( pEntry ); + SvTreeListEntry* pTmpEntry = aScriptsBox.FirstChild( pEntry ); ::rtl::OUString debugStr(aTmp); while ( pTmpEntry ) { diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 646d55dd0c68..f5d296d2a44b 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -171,7 +171,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, // item resources are in svx sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( RESARRAY_INDEX_NOTFOUND != nId ) pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) ); else diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 47a396549d91..e8a711ecbc8e 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -130,7 +130,7 @@ void ReplaceEdit::SetText( const XubString& rStr, const Selection& rNewSelection AlternativesString::AlternativesString( ThesaurusAlternativesCtrl &rControl, - SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : + SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ), m_rControlImpl( rControl ) @@ -140,7 +140,7 @@ AlternativesString::AlternativesString( void AlternativesString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry ); Point aPos( rPos ); @@ -187,7 +187,7 @@ void ThesaurusAlternativesCtrl::ClearExtraData() } void ThesaurusAlternativesCtrl::SetExtraData( - const SvLBoxEntry *pEntry, + const SvTreeListEntry *pEntry, const AlternativesExtraData &rData ) { if (!pEntry) @@ -201,7 +201,7 @@ void ThesaurusAlternativesCtrl::SetExtraData( } AlternativesExtraData * ThesaurusAlternativesCtrl::GetExtraData( - const SvLBoxEntry *pEntry ) + const SvTreeListEntry *pEntry ) { AlternativesExtraData *pRes = NULL; UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) ); @@ -210,9 +210,9 @@ AlternativesExtraData * ThesaurusAlternativesCtrl::GetExtraData( return pRes; } -SvLBoxEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ) +SvTreeListEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; String aText; if (bIsHeader && nVal >= 0) { @@ -392,7 +392,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox ) IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox ) { - SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; + SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) { AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry ); @@ -409,7 +409,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pB IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox ) { - SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; + SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) { AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry ); diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index 8c827fde6b72..1349ab3cb7b0 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star; using ::rtl::OUString; -class SvLBoxEntry; +class SvTreeListEntry; class ThesaurusAlternativesCtrl; class AlternativesString : public SvLBoxString @@ -54,9 +54,9 @@ class AlternativesString : public SvLBoxString public: AlternativesString( ThesaurusAlternativesCtrl &rControl, - SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ); + SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ); - virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry); }; #endif diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index ca4a8c5c6dbd..b2309e947da9 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -61,7 +61,7 @@ class SfxAccCfgTabListBox_Impl : public SvTabListBox void KeyInput( const KeyEvent &rKEvt ); protected: - virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); + virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); public: SfxAccCfgTabListBox_Impl( @@ -171,7 +171,7 @@ private: void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); void ResetConfig(); - void CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 ); + void CreateCustomItems( SvTreeListEntry* pEntry, const String& aCol1, const String& aCol2 ); public: SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index e6cd1031d512..a695604698c1 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -83,8 +83,8 @@ class OfaACorrCheckListBox : public SvxSimpleTable sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState ); + SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; + void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); }; // class OfaAutocorrOptionsPage ------------------------------------------ @@ -170,7 +170,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage DECL_LINK(SelectHdl, OfaACorrCheckListBox*); DECL_LINK(EditHdl, void *); - SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); + SvTreeListEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); OfaSwAutoFmtOptionsPage( Window* pParent, @@ -397,7 +397,7 @@ private: String ChangeStringExt_Impl( sal_UCS4 ); - SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); + SvTreeListEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ); public: diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 3db2a5506981..bccef1c089c1 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -179,7 +179,7 @@ private: com::sun::star::container::XIndexContainer >& rNewMenuBar, com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >& rFactory, - SvLBoxEntry *pParent = NULL ); + SvTreeListEntry *pParent = NULL ); void ApplyMenu( com::sun::star::uno::Reference< @@ -331,16 +331,16 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* pEntry ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* pEntry ); - virtual sal_Bool NotifyMoving( SvLBoxEntry*, SvLBoxEntry*, - SvLBoxEntry*&, sal_uLong& ); + virtual sal_Bool NotifyMoving( SvTreeListEntry*, SvTreeListEntry*, + SvTreeListEntry*&, sal_uLong& ); - virtual sal_Bool NotifyCopying( SvLBoxEntry*, SvLBoxEntry*, - SvLBoxEntry*&, sal_uLong&); + virtual sal_Bool NotifyCopying( SvTreeListEntry*, SvTreeListEntry*, + SvTreeListEntry*&, sal_uLong&); virtual DragDropMode NotifyStartDrag( - TransferDataContainer&, SvLBoxEntry* ); + TransferDataContainer&, SvTreeListEntry* ); virtual void DragFinished( sal_Int8 ); @@ -370,7 +370,7 @@ private: DECL_LINK( SelectSaveInLocation, ListBox * ); DECL_LINK( AsyncInfoMsg, String* ); - bool SwapEntryData( SvLBoxEntry* pSourceEntry, SvLBoxEntry* pTargetEntry ); + bool SwapEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry ); void AlignControls(); protected: @@ -428,14 +428,14 @@ protected: void PositionContentsListBox(); - SvLBoxEntry* InsertEntry( SvxConfigEntry* pNewEntryData, - SvLBoxEntry* pTarget = NULL, + SvTreeListEntry* InsertEntry( SvxConfigEntry* pNewEntryData, + SvTreeListEntry* pTarget = NULL, bool bFront = sal_False ); void AddSubMenusToUI( const String& rBaseTitle, SvxConfigEntry* pParentData ); - SvLBoxEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData, + SvTreeListEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData, sal_uLong nPos = LIST_APPEND ); SvxEntries* FindParentForChild( SvxEntries* pParentEntries, @@ -449,14 +449,14 @@ public: SaveInData* GetSaveInData() { return pCurrentSaveInData; } - SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, + SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, bool bFront = sal_False, bool bAllowDuplicates = sal_False ); virtual void MoveEntry( bool bMoveUp ); - bool MoveEntryData( SvLBoxEntry* pSourceEntry, - SvLBoxEntry* pTargetEntry ); + bool MoveEntryData( SvTreeListEntry* pSourceEntry, + SvTreeListEntry* pTargetEntry ); sal_Bool FillItemSet( SfxItemSet& ); void Reset( const SfxItemSet& ); @@ -528,7 +528,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog HelpButton aHelpButton; SvxEntries* pEntries; - SvLBoxEntry* pNewMenuEntry; + SvTreeListEntry* pNewMenuEntry; bool bModified; void UpdateButtonStates(); @@ -556,7 +556,7 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox SvLBoxButtonData* m_pButtonData; SvxConfigPage* pPage; - void ChangeVisibility( SvLBoxEntry* pEntry ); + void ChangeVisibility( SvTreeListEntry* pEntry ); protected: @@ -582,10 +582,10 @@ public: { return m_aCheckBoxImageSizePixel; } virtual sal_Bool NotifyMoving( - SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong& ); + SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ); virtual sal_Bool NotifyCopying( - SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong&); + SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&); void KeyInput( const KeyEvent& rKeyEvent ); }; @@ -613,7 +613,7 @@ public: SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet ); ~SvxToolbarConfigPage(); - SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, + SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, bool bFront = sal_False, bool bAllowDuplicates = sal_True ); diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 52584ebc822a..d2ec922822f2 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -106,7 +106,7 @@ class SfxConfigFunctionListBox_Impl : public SvTreeListBox { friend class SfxConfigGroupListBox_Impl; Timer aTimer; - SvLBoxEntry* pCurEntry; + SvTreeListEntry* pCurEntry; SfxGroupInfoArr_Impl aArr; SfxStylesInfo_Impl* pStylesInfo; @@ -119,7 +119,7 @@ public: void ClearAll(); using Window::GetHelpText; - String GetHelpText( SvLBoxEntry *pEntry ); + String GetHelpText( SvTreeListEntry *pEntry ); String GetCurCommand(); String GetCurLabel(); String GetSelectedScriptURI(); @@ -163,9 +163,9 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox SfxStylesInfo_Impl* pStylesInfo; protected: - virtual void RequestingChildren( SvLBoxEntry *pEntry); + virtual void RequestingChildren( SvTreeListEntry *pEntry); using SvListView::Expand; - virtual sal_Bool Expand( SvLBoxEntry* pParent ); + virtual sal_Bool Expand( SvTreeListEntry* pParent ); public: SfxConfigGroupListBox_Impl ( Window* pParent, @@ -179,7 +179,7 @@ public: const ::rtl::OUString& sModuleLongName); void SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox ) { pFunctionListBox = pBox; } - void Open( SvLBoxEntry*, sal_Bool ); + void Open( SvTreeListEntry*, sal_Bool ); void GroupSelected(); void SelectMacro( const SfxMacroInfoItem* ); void SelectMacro( const String&, const String& ); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index d78e4618fe94..224b393bb493 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -27,7 +27,7 @@ #include "ControlFocusHelper.hxx" #include <sfx2/basedlgs.hxx> -class SvLBoxEntry; +class SvTreeListEntry; namespace svx { class OptHeaderTabListBox; @@ -53,7 +53,7 @@ namespace svx HeaderBar* pHeaderBar; ::svx::OptHeaderTabListBox* pPathBox; - SvLBoxEntry* m_pCurEntry; + SvTreeListEntry* m_pCurEntry; sal_uLong m_nOldCount; sal_Bool m_bModified; @@ -85,7 +85,7 @@ namespace svx @param _pEntry The entry to remove if the entry will be changed */ - void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL); + void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvTreeListEntry* _pEntry = NULL); #endif diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index eb51856f96a6..d9758f43c19c 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -73,9 +73,9 @@ private: protected: sal_Bool RefreshFromDoc( ::rtl::OUString aURL ); - SvLBoxEntry* FindEntry ( String aStrName ); + SvTreeListEntry* FindEntry ( String aStrName ); void ClearTree(); - int FillTree( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xLinks, SvLBoxEntry* pParentEntry =NULL ); + int FillTree( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =NULL ); virtual void Move (); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index f1537a25a8d0..a8507a6cc2c9 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -151,7 +151,7 @@ private: void SetDicReadonly_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &xDic ); - void RemoveDictEntry(SvLBoxEntry* pEntry); + void RemoveDictEntry(SvTreeListEntry* pEntry); sal_uInt16 GetLBInsertPos(const String &rDicWord); #endif diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index eefada0c45ff..75e4b1214063 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -40,7 +40,7 @@ namespace linguistic2{ class XDictionaryList; }}}} -class SvLBoxEntry; +class SvTreeListEntry; class SvxLinguData_Impl; // define ---------------------------------------------------------------- @@ -75,7 +75,7 @@ class SvxEditModulesDlg : public ModalDialog SvLBoxButtonData* pCheckButtonData; - SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); + SvTreeListEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); #ifdef _SVX_OPTLINGU_CXX DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); @@ -138,7 +138,7 @@ private: SvxLinguData_Impl* pLinguData; SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); - SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); + SvTreeListEntry* CreateEntry(String& rTxt, sal_uInt16 nCol); void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); sal_uLong GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index 21b10dcf87c0..627efe0fc3ab 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -41,7 +41,7 @@ public: SvxRadioButtonListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); ~SvxRadioButtonListBox(); - void HandleEntryChecked( SvLBoxEntry* _pEntry ); + void HandleEntryChecked( SvTreeListEntry* _pEntry ); const Point& GetCurMousePoint() const; }; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 9aef16f40e46..d1ec4d8fb752 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -65,18 +65,18 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > getLangNodeFromRootNode( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& root, ::rtl::OUString& language ); - void delUserData( SvLBoxEntry* pEntry ); + void delUserData( SvTreeListEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); protected: - void ExpandTree( SvLBoxEntry* pRootEntry ); - virtual void RequestingChildren( SvLBoxEntry* pParent ); + void ExpandTree( SvTreeListEntry* pRootEntry ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual void ExpandedHdl(); virtual long ExpandingHdl(); public: void Init( const ::rtl::OUString& language ); - void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, + void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); SFTreeListBox( Window* pParent, const ResId& rRes ); ~SFTreeListBox(); @@ -85,16 +85,16 @@ public: - SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap, - SvLBoxEntry * pParent, + SvTreeListEntry * insertEntry(String const & rText, sal_uInt16 nBitmap, + SvTreeListEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL ); - SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap, - SvLBoxEntry * pParent, + SvTreeListEntry * insertEntry(String const & rText, sal_uInt16 nBitmap, + SvTreeListEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData ); - void deleteTree( SvLBoxEntry * pEntry ); + void deleteTree( SvTreeListEntry * pEntry ); void deleteAllTree( ); }; @@ -170,12 +170,12 @@ protected: void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); - void createEntry( SvLBoxEntry* pEntry ); - void renameEntry( SvLBoxEntry* pEntry ); - void deleteEntry( SvLBoxEntry* pEntry ); + void createEntry( SvTreeListEntry* pEntry ); + void renameEntry( SvTreeListEntry* pEntry ); + void deleteEntry( SvTreeListEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > - getBrowseNode( SvLBoxEntry* pEntry ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry ); + getBrowseNode( SvTreeListEntry* pEntry ); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvTreeListEntry* pEntry ); String getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth ); void StoreCurrentSelection(); void RestorePreviousSelection(); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index c2828114c164..c4a8c7ec69d8 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -93,9 +93,9 @@ class SvxConfigFunctionListBox_Impl : public SvTreeListBox { friend class SvxConfigGroupListBox_Impl; Timer aTimer; - SvLBoxEntry* pCurEntry; + SvTreeListEntry* pCurEntry; SvxGroupInfoArr_Impl aArr; - SvLBoxEntry* m_pDraggingEntry; + SvTreeListEntry* m_pDraggingEntry; DECL_LINK(TimerHdl, void *); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -104,16 +104,16 @@ public: SvxConfigFunctionListBox_Impl( Window*, const ResId& ); ~SvxConfigFunctionListBox_Impl(); void ClearAll(); - String GetHelpText( SvLBoxEntry *pEntry ); + String GetHelpText( SvTreeListEntry *pEntry ); using Window::GetHelpText; - SvLBoxEntry* GetLastSelectedEntry(); + SvTreeListEntry* GetLastSelectedEntry(); void FunctionSelected(); // drag n drop methods virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual DragDropMode NotifyStartDrag( - TransferDataContainer&, SvLBoxEntry* ); + TransferDataContainer&, SvTreeListEntry* ); virtual void DragFinished( sal_Int8 ); }; @@ -152,13 +152,13 @@ class SvxConfigGroupListBox_Impl : public SvTreeListBox private: void fillScriptList( const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxRootNode, - SvLBoxEntry* _pParentEntry, + SvTreeListEntry* _pParentEntry, bool _bCheapChildrenOnDemand ); protected: - virtual void RequestingChildren( SvLBoxEntry *pEntry); - virtual sal_Bool Expand( SvLBoxEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry *pEntry); + virtual sal_Bool Expand( SvTreeListEntry* pParent ); using SvListView::Expand; public: @@ -172,7 +172,7 @@ public: ~SvxConfigGroupListBox_Impl(); void Init(); - void Open( SvLBoxEntry*, sal_Bool ); + void Open( SvTreeListEntry*, sal_Bool ); void ClearAll(); void GroupSelected(); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index c6b43a646e35..c27cf178b691 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -79,7 +79,7 @@ class ThesaurusAlternativesCtrl { SvxThesaurusDialog* m_pDialog; - typedef std::map< const SvLBoxEntry *, AlternativesExtraData > UserDataMap_t; + typedef std::map< const SvTreeListEntry *, AlternativesExtraData > UserDataMap_t; UserDataMap_t m_aUserData; /// disable copy ctor and assignment operator @@ -93,11 +93,11 @@ public: virtual ~ThesaurusAlternativesCtrl(); - SvLBoxEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ); + SvTreeListEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ); void ClearExtraData(); - void SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ); - AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry ); + void SetExtraData( const SvTreeListEntry *pEntry, const AlternativesExtraData &rData ); + AlternativesExtraData * GetExtraData( const SvTreeListEntry *pEntry ); virtual void KeyInput( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 0b37efdb2561..05321b2d47f9 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -153,7 +153,7 @@ private: String sTitle; String sNotLoadedError; - SvLBoxEntry* pCurrentPageEntry; + SvTreeListEntry* pCurrentPageEntry; // for the ColorTabPage SfxItemSet* pColorPageItemSet; diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 667e72bf725c..d7a0b83f7e68 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -104,7 +104,7 @@ CertPathDialog::CertPathDialog( Window* pParent ) : ::rtl::OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile ); rtl::OUStringBuffer sEntry; sEntry.append('\t').appendAscii(productNames[i]).append(':').append(profile).append('\t').append(sProfilePath); - SvLBoxEntry *pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear()); + SvTreeListEntry *pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear()); rtl::OUString* pCertPath = new rtl::OUString(sProfilePath); pEntry->SetUserData(pCertPath); } @@ -114,7 +114,7 @@ CertPathDialog::CertPathDialog( Window* pParent ) : { } - SvLBoxEntry *pEntry = m_aCertPathList.GetEntry(0); + SvTreeListEntry *pEntry = m_aCertPathList.GetEntry(0); if (pEntry) { m_aCertPathList.SetCheckButtonState(pEntry, SV_BUTTON_CHECKED); @@ -163,14 +163,14 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) rtl::OUString CertPathDialog::getDirectory() const { - SvLBoxEntry* pEntry = m_aCertPathList.FirstSelected(); + SvTreeListEntry* pEntry = m_aCertPathList.FirstSelected(); void* pCertPath = pEntry ? pEntry->GetUserData() : NULL; return pCertPath ? *static_cast<rtl::OUString*>(pCertPath) : rtl::OUString(); } CertPathDialog::~CertPathDialog() { - SvLBoxEntry* pEntry = m_aCertPathList.First(); + SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { rtl::OUString* pCertPath = static_cast<rtl::OUString*>(pEntry->GetUserData()); @@ -181,14 +181,14 @@ CertPathDialog::~CertPathDialog() IMPL_LINK( CertPathDialog, CheckHdl_Impl, SvxSimpleTable *, pList ) { - SvLBoxEntry* pEntry = pList ? m_aCertPathList.GetEntry(m_aCertPathList.GetCurMousePoint()) + SvTreeListEntry* pEntry = pList ? m_aCertPathList.GetEntry(m_aCertPathList.GetCurMousePoint()) : m_aCertPathList.FirstSelected(); if (pEntry) m_aCertPathList.HandleEntryChecked(pEntry); return 0; } -void CertPathDialog::HandleCheckEntry( SvLBoxEntry* _pEntry ) +void CertPathDialog::HandleCheckEntry( SvTreeListEntry* _pEntry ) { m_aCertPathList.Select( _pEntry, true ); SvButtonState eState = m_aCertPathList.GetCheckButtonState( _pEntry ); @@ -196,7 +196,7 @@ void CertPathDialog::HandleCheckEntry( SvLBoxEntry* _pEntry ) if (SV_BUTTON_CHECKED == eState) { // uncheck the other entries - SvLBoxEntry* pEntry = m_aCertPathList.First(); + SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { if (pEntry != _pEntry) @@ -210,7 +210,7 @@ void CertPathDialog::HandleCheckEntry( SvLBoxEntry* _pEntry ) void CertPathDialog::AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath) { - SvLBoxEntry* pEntry = m_aCertPathList.First(); + SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { rtl::OUString* pCertPath = static_cast<rtl::OUString*>(pEntry->GetUserData()); diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 8c54c3f2b95d..65d9a77e1fdb 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -55,7 +55,7 @@ private: DECL_LINK(AddHdl_Impl, void *); DECL_LINK(OKHdl_Impl, void *); - void HandleCheckEntry(SvLBoxEntry* _pEntry); + void HandleCheckEntry(SvTreeListEntry* _pEntry); void AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath); public: CertPathDialog(Window* pParent); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 7d1ef86a0a50..590d0fb79912 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -197,7 +197,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) sal_uLong nCount = pPathBox->GetEntryCount(); for ( sal_uLong i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = pPathBox->GetEntry(i); + SvTreeListEntry* pEntry = pPathBox->GetEntry(i); DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() ); if ( pRegistration && !pRegistration->sLocation.isEmpty() ) { @@ -276,7 +276,7 @@ void DbRegistrationOptionsPage::FillUserData() IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) { - SvLBoxEntry* pEntry = pPathBox->FirstSelected(); + SvTreeListEntry* pEntry = pPathBox->FirstSelected(); if ( pEntry ) { QueryBox aQuery(this,CUI_RES(QUERY_DELETE_CONFIRM)); @@ -297,7 +297,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl) IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) { - SvLBoxEntry* pEntry = pPathBox->GetCurEntry(); + SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); if ( !pEntry ) return 0L; @@ -376,7 +376,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) { - SvLBoxEntry* pEntry = pPathBox->FirstSelected(); + SvTreeListEntry* pEntry = pPathBox->FirstSelected(); bool bReadOnly = true; if ( pEntry ) @@ -396,7 +396,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co aStr += '\t'; aStr += String(_sLocation); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( _bReadOnly ) { Image aLocked( CUI_RES( RID_SVXBMP_LOCK ) ); @@ -411,7 +411,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co } // ----------------------------------------------------------------------------- -void DbRegistrationOptionsPage::openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry) +void DbRegistrationOptionsPage::openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvTreeListEntry* _pEntry) { ODocumentLinkDialog aDlg(this,_pEntry == NULL); @@ -442,7 +442,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, String*, _pName ) sal_uLong nCount = pPathBox->GetEntryCount(); for ( sal_uLong i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = pPathBox->GetEntry(i); + SvTreeListEntry* pEntry = pPathBox->GetEntry(i); if ( (!m_pCurEntry || m_pCurEntry != pEntry) && pPathBox->GetEntryText(pEntry,0) == *_pName ) return 0L; } diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 13ef512dbbb6..edc27c6d5975 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -146,9 +146,9 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aFontHeightLB.InsertEntry(String::CreateFromInt32(nHeight)); } -SvLBoxEntry* SvxFontSubstTabPage::CreateEntry(String& rFont1, String& rFont2) +SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(String& rFont1, String& rFont2) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( &aCheckLB ); @@ -186,7 +186,7 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) pConfig->Enable(aUseTableCB.IsChecked()); - SvLBoxEntry* pEntry = aCheckLB.First(); + SvTreeListEntry* pEntry = aCheckLB.First(); while (pEntry) { @@ -240,7 +240,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet& ) const SubstitutionStruct* pSubs = pConfig->GetSubstitution(i); String aTmpStr1(pSubs->sFont); String aTmpStr2(pSubs->sReplaceBy); - SvLBoxEntry* pEntry = CreateEntry(aTmpStr1, aTmpStr2); + SvTreeListEntry* pEntry = CreateEntry(aTmpStr1, aTmpStr2); aCheckLB.Insert(pEntry); aCheckLB.CheckEntry(pEntry, 0, pSubs->bReplaceAlways); aCheckLB.CheckEntry(pEntry, 1, pSubs->bReplaceOnScreenOnly); @@ -273,7 +273,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) { if (pWin == &aNewDelTBX) { - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; // nCol is stupidly the nCol'th text column, not counted! // Therefor "0" as column. sal_uLong nPos = aCheckLB.GetEntryPos(aFont1CB.GetText(), 0); @@ -309,7 +309,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) pEntry = aCheckLB.FirstSelected(); while (pEntry) { - SvLBoxEntry* pDelEntry = pEntry; + SvTreeListEntry* pDelEntry = pEntry; pEntry = aCheckLB.NextSelected(pEntry); aCheckLB.RemoveEntry(pDelEntry); } @@ -321,7 +321,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) if (pWin == &aCheckLB) { - SvLBoxEntry* pEntry = aCheckLB.FirstSelected(); + SvTreeListEntry* pEntry = aCheckLB.FirstSelected(); if (aCheckLB.NextSelected(pEntry) == 0) { @@ -336,7 +336,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) if (nPos != 0xffffffff) { - SvLBoxEntry* pEntry = aCheckLB.GetEntry(nPos); + SvTreeListEntry* pEntry = aCheckLB.GetEntry(nPos); if (pEntry != aCheckLB.FirstSelected()) { @@ -378,7 +378,7 @@ void SvxFontSubstTabPage::CheckEnable() { sal_Bool bApply, bDelete; - SvLBoxEntry* pEntry = aCheckLB.FirstSelected(); + SvTreeListEntry* pEntry = aCheckLB.FirstSelected(); String sEntry = aFont1CB.GetText(); sEntry += '\t'; @@ -480,7 +480,7 @@ void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sa SvButtonState( SV_BUTTON_UNCHECKED ) ); } -void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked) +void SvxFontSubstCheckListBox::CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked) { if ( pEntry ) SetCheckButtonState( @@ -495,12 +495,12 @@ sal_Bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED; } -sal_Bool SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, sal_uInt16 nCol) +sal_Bool SvxFontSubstCheckListBox::IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol) { return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED; } -void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) +void SvxFontSubstCheckListBox::SetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -525,7 +525,7 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uIn } } -SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const +SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 9775991da304..04afa3ebc13a 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -48,11 +48,11 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); - sal_Bool IsChecked(SvLBoxEntry* pEntry, sal_uInt16 nCol = 0); + sal_Bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0); void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); - void CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState ); + void CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked); + SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; + void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); }; // class SvxFontSubstTabPage ---------------------------------------------------- @@ -92,7 +92,7 @@ class SvxFontSubstTabPage : public SfxTabPage DECL_LINK(SelectHdl, Window *pWin = 0); DECL_LINK(NonPropFontsHdl, CheckBox* pBox); - SvLBoxEntry* CreateEntry(String& rFont1, String& rFont2); + SvTreeListEntry* CreateEntry(String& rFont1, String& rFont2); void CheckEnable(); diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index a479751a3986..6149c15b8f1c 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -29,15 +29,15 @@ namespace svx class OptLBoxString_Impl : public SvLBoxString { public: - OptLBoxString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) : + OptLBoxString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) : SvLBoxString( pEntry, nFlags, rTxt ) {} - virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry ); }; // ----------------------------------------------------------------------- -void OptLBoxString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) +void OptLBoxString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry ) { Font aOldFont( rDev.GetFont() ); Font aFont( aOldFont ); @@ -57,7 +57,7 @@ OptHeaderTabListBox::OptHeaderTabListBox( Window* pParent, WinBits nWinStyle ) : } // ----------------------------------------------------------------------- -void OptHeaderTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, +void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind ) { diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index dc28269a7998..472dcc13449b 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -30,7 +30,7 @@ namespace svx public: OptHeaderTabListBox( Window* pParent, WinBits nBits ); - virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); + virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); }; } // svx #endif // SVX_OPTHEADERTABLISTBOX_HXX diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index d478723adc70..e16644890006 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -381,7 +381,7 @@ sal_uInt16 SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord) sal_uInt16 j; for( j = 0; j < aWordsLB.GetEntryCount(); j++ ) { - SvLBoxEntry* pEntry = aWordsLB.GetEntry(j); + SvTreeListEntry* pEntry = aWordsLB.GetEntry(j); DBG_ASSERT( pEntry, "NULL pointer"); String aNormEntry( getNormDicEntry_Impl( rDicWord ) ); StringCompare eCmpRes = (StringCompare)pCollator-> @@ -395,7 +395,7 @@ sal_uInt16 SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord) return nPos; } -void SvxEditDictionaryDialog::RemoveDictEntry(SvLBoxEntry* pEntry) +void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) { sal_uInt16 nLBPos = aAllDictsLB.GetSelectEntryPos(); @@ -551,7 +551,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) { if(!bFirstSelect) { - SvLBoxEntry* pEntry = pBox->FirstSelected(); + SvTreeListEntry* pEntry = pBox->FirstSelected(); String sTmpShort(pBox->GetEntryText(pEntry, 0)); // without this the curser is always at the beginning of a word, if the text // is set over the ModifyHdl, although you're editing there at the moment @@ -574,7 +574,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) { - SvLBoxEntry* pEntry = aWordsLB.FirstSelected(); + SvTreeListEntry* pEntry = aWordsLB.FirstSelected(); if(pBtn == &aDeletePB) { @@ -589,7 +589,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) } if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled()) { - SvLBoxEntry* _pEntry = aWordsLB.FirstSelected(); + SvTreeListEntry* _pEntry = aWordsLB.FirstSelected(); XubString aNewWord(aWordED.GetText()); String sEntry(aNewWord); XubString aReplaceStr(aReplaceED.GetText()); @@ -638,7 +638,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) sEntry += aReplaceStr; } - SvLBoxEntry* pNewEntry = NULL; + SvTreeListEntry* pNewEntry = NULL; if(_pEntry) // entry selected in aWordsLB ie action = modify entry { aWordsLB.SetEntryText( sEntry, _pEntry ); @@ -647,7 +647,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) else { _nPos = GetLBInsertPos( aNewWord ); - SvLBoxEntry* pInsEntry = aWordsLB.InsertEntry(sEntry, 0, sal_False, + SvTreeListEntry* pInsEntry = aWordsLB.InsertEntry(sEntry, 0, sal_False, _nPos == USHRT_MAX ? LIST_APPEND : (sal_uInt32)_nPos); pNewEntry = pInsEntry; } @@ -673,7 +673,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) { - SvLBoxEntry* pFirstSel = aWordsLB.FirstSelected(); + SvTreeListEntry* pFirstSel = aWordsLB.FirstSelected(); String rEntry = pEdt->GetText(); xub_StrLen nWordLen=rEntry.Len(); @@ -693,7 +693,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) for(sal_uInt16 i = 0; i < aWordsLB.GetEntryCount(); i++) { - SvLBoxEntry* pEntry = aWordsLB.GetEntry( i ); + SvTreeListEntry* pEntry = aWordsLB.GetEntry( i ); String aTestStr( aWordsLB.GetEntryText(pEntry, 0) ); eCmpRes = cmpDicEntry_Impl( rEntry, aTestStr ); if(CDE_DIFFERENT != eCmpRes) @@ -740,7 +740,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) } else if(aWordsLB.GetEntryCount()>0) { - SvLBoxEntry* pEntry = aWordsLB.GetEntry( 0 ); + SvTreeListEntry* pEntry = aWordsLB.GetEntry( 0 ); bDoNothing=sal_True; aWordsLB.MakeVisible(pEntry); bDoNothing=sal_False; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 6afeba5bdbfe..eddd6573151e 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -205,7 +205,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst ) { sal_uInt16 nCol = bFirst ? 1 : 2; - SvLBoxEntry* pEntry = GetEntry4Type( pArr->eType ); + SvTreeListEntry* pEntry = GetEntry4Type( pArr->eType ); if( pEntry ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol )); @@ -263,7 +263,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst ) { sal_uInt16 nCol = bFirst ? 1 : 2; - SvLBoxEntry* pEntry = GetEntry4Type( static_cast< sal_IntPtr >( pArr->eType ) ); + SvTreeListEntry* pEntry = GetEntry4Type( static_cast< sal_IntPtr >( pArr->eType ) ); if( pEntry ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol )); @@ -282,7 +282,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) void OfaMSFilterTabPage2::InsertEntry( const String& _rTxt, sal_IntPtr _nType ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( &aCheckLB ); @@ -298,9 +298,9 @@ void OfaMSFilterTabPage2::InsertEntry( const String& _rTxt, sal_IntPtr _nType ) aCheckLB.Insert( pEntry ); } -SvLBoxEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const +SvTreeListEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const { - SvLBoxEntry* pEntry = aCheckLB.First(); + SvTreeListEntry* pEntry = aCheckLB.First(); while ( pEntry ) { if ( _nType == sal_IntPtr( pEntry->GetUserData() ) ) @@ -335,7 +335,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick() } void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( - SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) + SvTreeListEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -361,7 +361,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( } SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( - SvLBoxEntry* pEntry, sal_uInt16 nCol ) const + SvTreeListEntry* pEntry, sal_uInt16 nCol ) const { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -395,7 +395,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) sal_uInt16 nCol = GetCurrentTabPos() - 1; if ( nCol < 2 ) { - SvLBoxEntry* pEntry = GetEntry( nSelPos ); + SvTreeListEntry* pEntry = GetEntry( nSelPos ); sal_Bool bIsChecked = ( GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED ); CheckEntryPos( nSelPos, nCol, !bIsChecked ); CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, (void*)pEntry ); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 7502703073dc..655bc106f5b1 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -64,8 +64,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage using SvxSimpleTable::SetTabs; void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState ); + SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; + void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); protected: virtual void SetTabs(); virtual void HBarClick(); @@ -92,7 +92,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage virtual ~OfaMSFilterTabPage2(); void InsertEntry( const String& _rTxt, sal_IntPtr _nType ); - SvLBoxEntry* GetEntry4Type( sal_IntPtr _nType ) const; + SvTreeListEntry* GetEntry4Type( sal_IntPtr _nType ) const; public: diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index d2d0347c5902..5157dae4cdc3 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -207,7 +207,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvxSimpleTable *, pList ) { - SvLBoxEntry* pEntry = pList ? m_aJavaList.GetEntry( m_aJavaList.GetCurMousePoint() ) + SvTreeListEntry* pEntry = pList ? m_aJavaList.GetEntry( m_aJavaList.GetCurMousePoint() ) : m_aJavaList.FirstSelected(); if ( pEntry ) m_aJavaList.HandleEntryChecked( pEntry ); @@ -219,7 +219,7 @@ IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvxSimpleTable *, pList ) IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl) { // set installation directory info - SvLBoxEntry* pEntry = m_aJavaList.FirstSelected(); + SvTreeListEntry* pEntry = m_aJavaList.FirstSelected(); DBG_ASSERT( pEntry, "SvxJavaOptionsPage::SelectHdl_Impl(): no entry" ); String* pLocation = static_cast< String* >( pEntry->GetUserData() ); DBG_ASSERT( pLocation, "invalid location string" ); @@ -414,7 +414,7 @@ void SvxJavaOptionsPage::ClearJavaInfo() void SvxJavaOptionsPage::ClearJavaList() { - SvLBoxEntry* pEntry = m_aJavaList.First(); + SvTreeListEntry* pEntry = m_aJavaList.First(); while ( pEntry ) { String* pLocation = static_cast< String* >( pEntry->GetUserData() ); @@ -457,7 +457,7 @@ void SvxJavaOptionsPage::LoadJREs() JavaInfo* pCmpInfo = *parInfo++; if ( jfw_areEqualJavaInfo( pCmpInfo, pSelectedJava ) ) { - SvLBoxEntry* pEntry = m_aJavaList.GetEntry(i); + SvTreeListEntry* pEntry = m_aJavaList.GetEntry(i); if ( pEntry ) m_aJavaList.HandleEntryChecked( pEntry ); break; @@ -480,7 +480,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) sEntry.append('\t'); if ( ( _pInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE ) == JFW_FEATURE_ACCESSBRIDGE ) sEntry.append(m_sAccessibilityText); - SvLBoxEntry* pEntry = m_aJavaList.InsertEntry(sEntry.makeStringAndClear()); + SvTreeListEntry* pEntry = m_aJavaList.InsertEntry(sEntry.makeStringAndClear()); INetURLObject aLocObj( ::rtl::OUString( _pInfo->sLocation ) ); String* pLocation = new String( aLocObj.getFSysPath( INetURLObject::FSYS_DETECT ) ); pEntry->SetUserData( pLocation ); @@ -488,7 +488,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) // ----------------------------------------------------------------------- -void SvxJavaOptionsPage::HandleCheckEntry( SvLBoxEntry* _pEntry ) +void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) { m_aJavaList.Select( _pEntry, sal_True ); SvButtonState eState = m_aJavaList.GetCheckButtonState( _pEntry ); @@ -496,7 +496,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvLBoxEntry* _pEntry ) if ( SV_BUTTON_CHECKED == eState ) { // we have radio button behavior -> so uncheck the other entries - SvLBoxEntry* pEntry = m_aJavaList.First(); + SvTreeListEntry* pEntry = m_aJavaList.First(); while ( pEntry ) { if ( pEntry != _pEntry ) @@ -555,7 +555,7 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) else jfw_freeJavaInfo( pInfo ); - SvLBoxEntry* pEntry = m_aJavaList.GetEntry( nPos ); + SvTreeListEntry* pEntry = m_aJavaList.GetEntry( nPos ); m_aJavaList.Select( pEntry ); m_aJavaList.SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); HandleCheckEntry( pEntry ); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index d59f507fa85d..aed4aef70269 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -90,7 +90,7 @@ private: void ClearJavaList(); void LoadJREs(); void AddJRE( JavaInfo* _pInfo ); - void HandleCheckEntry( SvLBoxEntry* _pEntry ); + void HandleCheckEntry( SvTreeListEntry* _pEntry ); void AddFolder( const ::rtl::OUString& _rFolder ); public: diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 9beea46dd176..f732a6aade39 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -261,7 +261,7 @@ void DicUserData::SetChecked( sal_Bool bVal ) // class BrwString_Impl ------------------------------------------------- -static void lcl_SetCheckButton( SvLBoxEntry* pEntry, sal_Bool bCheck ) +static void lcl_SetCheckButton( SvTreeListEntry* pEntry, sal_Bool bCheck ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON)); @@ -280,15 +280,15 @@ class BrwStringDic_Impl : public SvLBoxString { public: - BrwStringDic_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + BrwStringDic_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); }; void BrwStringDic_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); Point aPos(rPos); @@ -447,15 +447,15 @@ class BrwString_Impl : public SvLBoxString { public: - BrwString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + BrwString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); }; void BrwString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { Point aPos(rPos); aPos.X() += 20; @@ -1271,7 +1271,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) aActiveDics.realloc( nDics ); OUString *pActiveDic = aActiveDics.getArray(); - SvLBoxEntry *pEntry = aLinguDicsCLB.GetEntry( i ); + SvTreeListEntry *pEntry = aLinguDicsCLB.GetEntry( i ); if (pEntry) { DicUserData aData( (sal_uLong)pEntry->GetUserData() ); @@ -1305,7 +1305,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) nEntries = aLinguOptionsCLB.GetEntryCount(); for (sal_uInt16 j = 0; j < nEntries; ++j) { - SvLBoxEntry *pEntry = aLinguOptionsCLB.GetEntry( j ); + SvTreeListEntry *pEntry = aLinguOptionsCLB.GetEntry( j ); OptionsUserData aData( (sal_uLong)pEntry->GetUserData() ); String aPropName( lcl_GetPropertyName( (EID_OPTIONS) aData.GetEntryId() ) ); @@ -1327,8 +1327,8 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) aLngCfg.SetProperty( aPropName, aAny ); } - SvLBoxEntry *pPreBreakEntry = aLinguOptionsCLB.GetEntry( (sal_uInt16) EID_NUM_PRE_BREAK ); - SvLBoxEntry *pPostBreakEntry = aLinguOptionsCLB.GetEntry( (sal_uInt16) EID_NUM_POST_BREAK ); + SvTreeListEntry *pPreBreakEntry = aLinguOptionsCLB.GetEntry( (sal_uInt16) EID_NUM_PRE_BREAK ); + SvTreeListEntry *pPostBreakEntry = aLinguOptionsCLB.GetEntry( (sal_uInt16) EID_NUM_POST_BREAK ); DBG_ASSERT( pPreBreakEntry, "NULL Pointer" ); DBG_ASSERT( pPostBreakEntry, "NULL Pointer" ); if (pPreBreakEntry && pPostBreakEntry) @@ -1389,7 +1389,7 @@ void SvxLinguTabPage::AddDicBoxEntry( SvxLocaleToLanguage( rxDic->getLocale() ), DictionaryType_NEGATIVE == rxDic->getDictionaryType() ) ); aLinguDicsCLB.InsertEntry( aTxt, (sal_uInt16)LISTBOX_APPEND ); // append at end - SvLBoxEntry* pEntry = aLinguDicsCLB.GetEntry( aLinguDicsCLB.GetEntryCount() - 1 ); + SvTreeListEntry* pEntry = aLinguDicsCLB.GetEntry( aLinguDicsCLB.GetEntryCount() - 1 ); DBG_ASSERT( pEntry, "failed to add entry" ); if (pEntry) { @@ -1435,7 +1435,7 @@ void SvxLinguTabPage::UpdateModulesBox_Impl() { const ServiceInfo_Impl &rInfo = rAllDispSrvcArr[i]; aLinguModulesCLB.InsertEntry( rInfo.sDisplayName, (sal_uInt16)LISTBOX_APPEND ); - SvLBoxEntry* pEntry = aLinguModulesCLB.GetEntry(i); + SvTreeListEntry* pEntry = aLinguModulesCLB.GetEntry(i); pEntry->SetUserData( (void *) &rInfo ); aLinguModulesCLB.CheckEntryPos( i, rInfo.bConfigured ); } @@ -1466,7 +1466,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) aLinguOptionsCLB.Clear(); SvLBoxTreeList *pModel = aLinguOptionsCLB.GetModel(); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; sal_Int16 nVal = 0; sal_Bool bVal = sal_False; @@ -1619,7 +1619,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) const uno::Reference< XDictionary > &rDic = aDics.getConstArray()[ nPos ]; if (SvxGetIgnoreAllList() == rDic) { - SvLBoxEntry* pEntry = aLinguDicsCLB.GetEntry( nPos ); + SvTreeListEntry* pEntry = aLinguDicsCLB.GetEntry( nPos ); if (pEntry) lcl_SetCheckButton( pEntry, sal_True ); } @@ -1690,7 +1690,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else if (&aLinguDicsEditPB == pBtn) { - SvLBoxEntry *pEntry = aLinguDicsCLB.GetCurEntry(); + SvTreeListEntry *pEntry = aLinguDicsCLB.GetCurEntry(); if (pEntry) { DicUserData aData( (sal_uLong) pEntry->GetUserData() ); @@ -1721,7 +1721,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) QueryBox( this, CUI_RES( RID_SFXQB_DELDICT ) ).Execute() ) return 0; - SvLBoxEntry *pEntry = aLinguDicsCLB.GetCurEntry(); + SvTreeListEntry *pEntry = aLinguDicsCLB.GetCurEntry(); if (pEntry) { DicUserData aData( (sal_uLong) pEntry->GetUserData() ); @@ -1759,7 +1759,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) sal_uLong nCnt = aLinguDicsCLB.GetEntryCount(); for (sal_uLong i = 0; i < nCnt; ++i) { - SvLBoxEntry *pDicEntry = aLinguDicsCLB.GetEntry( i ); + SvTreeListEntry *pDicEntry = aLinguDicsCLB.GetEntry( i ); DBG_ASSERT( pDicEntry, "missing entry" ); if (pDicEntry) { @@ -1780,7 +1780,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else if (&aLinguOptionsEditPB == pBtn) { - SvLBoxEntry *pEntry = aLinguOptionsCLB.GetCurEntry(); + SvTreeListEntry *pEntry = aLinguOptionsCLB.GetCurEntry(); DBG_ASSERT( pEntry, "no entry selected" ); if (pEntry) { @@ -1829,7 +1829,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else if (&aLinguDicsCLB == pBox) { - SvLBoxEntry *pEntry = pBox->GetCurEntry(); + SvTreeListEntry *pEntry = pBox->GetCurEntry(); if (pEntry) { DicUserData aData( (sal_uLong) pEntry->GetUserData() ); @@ -1841,7 +1841,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else if (&aLinguOptionsCLB == pBox) { - SvLBoxEntry *pEntry = pBox->GetCurEntry(); + SvTreeListEntry *pEntry = pBox->GetCurEntry(); if (pEntry) { OptionsUserData aData( (sal_uLong) pEntry->GetUserData() ); @@ -1858,9 +1858,9 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) // ----------------------------------------------------------------------- -SvLBoxEntry* SvxLinguTabPage::CreateEntry( String& rTxt, sal_uInt16 nCol ) +SvTreeListEntry* SvxLinguTabPage::CreateEntry( String& rTxt, sal_uInt16 nCol ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( &aLinguOptionsCLB ); @@ -2021,9 +2021,9 @@ SvxEditModulesDlg::~SvxEditModulesDlg() } -SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, sal_uInt16 nCol ) +SvTreeListEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, sal_uInt16 nCol ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) { pCheckButtonData = new SvLBoxButtonData( &aModulesCLB ); @@ -2047,7 +2047,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) { sal_Bool bDisableUp = sal_True; sal_Bool bDisableDown = sal_True; - SvLBoxEntry *pEntry = pBox->GetCurEntry(); + SvTreeListEntry *pEntry = pBox->GetCurEntry(); if (pEntry) { ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); @@ -2080,7 +2080,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { pBox = &aModulesCLB; - SvLBoxEntry *pCurEntry = pBox->GetCurEntry(); + SvTreeListEntry *pCurEntry = pBox->GetCurEntry(); if (pCurEntry) { ModuleUserData_Impl* pData = (ModuleUserData_Impl *) @@ -2089,7 +2089,7 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { // make hyphenator checkboxes function as radio-buttons // (at most one box may be checked) - SvLBoxEntry *pEntry = pBox->First(); + SvTreeListEntry *pEntry = pBox->First(); while (pEntry) { pData = (ModuleUserData_Impl *) pEntry->GetUserData(); @@ -2127,7 +2127,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) sal_Bool bChanged = sal_False; for(sal_uInt16 i = 0; i < aModulesCLB.GetEntryCount(); i++) { - SvLBoxEntry *pEntry = aModulesCLB.GetEntry(i); + SvTreeListEntry *pEntry = aModulesCLB.GetEntry(i); ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); if(pData->IsParent()) { @@ -2185,7 +2185,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // // spellchecker entries // - SvLBoxEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); + SvTreeListEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); ModuleUserData_Impl* pUserData = new ModuleUserData_Impl( String(), sal_True, sal_False, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); @@ -2210,7 +2210,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); - SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); + SvTreeListEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); LangImplNameTable &rTable = rLinguData.GetSpellTable(); const bool bHasLang = rTable.count( eCurLanguage ); @@ -2254,7 +2254,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); - SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); + SvTreeListEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); LangImplNameTable &rTable = rLinguData.GetGrammarTable(); const bool bHasLang = rTable.count( eCurLanguage ); @@ -2298,7 +2298,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); - SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); + SvTreeListEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); LangImplNameTable &rTable = rLinguData.GetHyphTable(); const bool bHasLang = rTable.count( eCurLanguage ); @@ -2342,7 +2342,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); - SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); + SvTreeListEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); LangImplNameTable &rTable = rLinguData.GetThesTable(); const bool bHasLang = rTable.count( eCurLanguage ); @@ -2368,7 +2368,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) { sal_Bool bUp = &aPrioUpPB == pBtn; sal_uInt16 nCurPos = aModulesCLB.GetSelectEntryPos(); - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; if (nCurPos != LISTBOX_ENTRY_NOTFOUND && 0 != (pEntry = aModulesCLB.GetEntry(nCurPos))) { @@ -2377,7 +2377,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); String aStr(aModulesCLB.GetEntryText(pEntry)); - SvLBoxEntry* pToInsert = CreateEntry( aStr, CBCOL_FIRST ); + SvTreeListEntry* pToInsert = CreateEntry( aStr, CBCOL_FIRST ); pToInsert->SetUserData( (void *)pData); sal_Bool bIsChecked = aModulesCLB.IsChecked(nCurPos); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 90c0f2aa6939..6a8b4b4c0334 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -335,7 +335,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) String aValue( sTmpPath ); aStr += '\t'; aStr += Convert_Impl( aValue ); - SvLBoxEntry* pEntry = pPathBox->InsertEntry( aStr ); + SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr ); if ( bReadOnly ) { pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage ); @@ -391,7 +391,7 @@ void SvxPathTabPage::FillUserData() IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) { sal_uInt16 nSelCount = 0; - SvLBoxEntry* pEntry = pPathBox->FirstSelected(); + SvTreeListEntry* pEntry = pPathBox->FirstSelected(); //the entry image indicates whether the path is write protected Image aEntryImage; @@ -413,7 +413,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) { - SvLBoxEntry* pEntry = pPathBox->FirstSelected(); + SvTreeListEntry* pEntry = pPathBox->FirstSelected(); while ( pEntry ) { PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); @@ -469,7 +469,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) { - SvLBoxEntry* pEntry = pPathBox->GetCurEntry(); + SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); if ( !pEntry ) { SAL_WARN( "cui.options", "SvxPathTabPage::ChangeCurrentEntry(): no entry" ); @@ -534,7 +534,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) { - SvLBoxEntry* pEntry = pPathBox->GetCurEntry(); + SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); sal_uInt16 nPos = ( pEntry != NULL ) ? ( (PathUserData_Impl*)pEntry->GetUserData() )->nRealId : 0; String sInternal, sUser, sWritable; if ( pEntry ) diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index dd5fb5979c7d..599b573c9835 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -52,7 +52,7 @@ void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt ) { if ( !rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode() ) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if ( GetCheckButtonState( pEntry ) == SV_BUTTON_UNCHECKED ) { SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); @@ -64,7 +64,7 @@ void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt ) SvxSimpleTable::KeyInput( rKEvt ); } -void SvxRadioButtonListBox::HandleEntryChecked( SvLBoxEntry* _pEntry ) +void SvxRadioButtonListBox::HandleEntryChecked( SvTreeListEntry* _pEntry ) { Select( _pEntry, sal_True ); SvButtonState eState = GetCheckButtonState( _pEntry ); @@ -72,7 +72,7 @@ void SvxRadioButtonListBox::HandleEntryChecked( SvLBoxEntry* _pEntry ) if ( SV_BUTTON_CHECKED == eState ) { // we have radio button behavior -> so uncheck the other entries - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { if ( pEntry != _pEntry ) diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index b61ddd8c7e40..050d750b8f1b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -535,7 +535,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString OfaTreeOptionsDialog::~OfaTreeOptionsDialog() { - SvLBoxEntry* pEntry = aTreeLB.First(); + SvTreeListEntry* pEntry = aTreeLB.First(); // first children while(pEntry) { @@ -594,9 +594,9 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup ) { OptionsPageInfo* pPageInfo = new OptionsPageInfo( nId ); - SvLBoxEntry* pParent = aTreeLB.GetEntry( 0, nGroup ); + SvTreeListEntry* pParent = aTreeLB.GetEntry( 0, nGroup ); DBG_ASSERT( pParent, "OfaTreeOptionsDialog::AddTabPage(): no group found" ); - SvLBoxEntry* pEntry = aTreeLB.InsertEntry( rPageName, pParent ); + SvTreeListEntry* pEntry = aTreeLB.InsertEntry( rPageName, pParent ); pEntry->SetUserData( pPageInfo ); return pPageInfo; } @@ -607,7 +607,7 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, SfxModule* pCreateModule, sal_uInt16 nDialogId ) { - SvLBoxEntry* pEntry = aTreeLB.InsertEntry(rGroupName); + SvTreeListEntry* pEntry = aTreeLB.InsertEntry(rGroupName); OptionsGroupInfo* pInfo = new OptionsGroupInfo( pCreateShell, pCreateModule, nDialogId ); pEntry->SetUserData(pInfo); @@ -673,7 +673,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) } } - SvLBoxEntry* pEntry = aTreeLB.First(); + SvTreeListEntry* pEntry = aTreeLB.First(); while ( pEntry ) { if ( aTreeLB.GetParent( pEntry ) ) @@ -703,12 +703,12 @@ IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) { pBox->Update(); pBox->InitStartEntry(); - SvLBoxEntry* pEntry = pBox->GetHdlEntry(); + SvTreeListEntry* pEntry = pBox->GetHdlEntry(); if(pEntry && pBox->IsExpanded(pEntry)) { sal_uInt32 nChildCount = pBox->GetChildCount( pEntry ); - SvLBoxEntry* pNext = pEntry; + SvTreeListEntry* pNext = pEntry; for(sal_uInt32 i = 0; i < nChildCount;i++) { pNext = pBox->GetNextEntryInView(pNext); @@ -735,7 +735,7 @@ IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) void OfaTreeOptionsDialog::ApplyItemSets() { - SvLBoxEntry* pEntry = aTreeLB.First(); + SvTreeListEntry* pEntry = aTreeLB.First(); while(pEntry) { if(!aTreeLB.GetParent(pEntry)) @@ -802,7 +802,7 @@ void OfaTreeOptionsDialog::ActivatePage( const String& rPageURL ) void OfaTreeOptionsDialog::ActivateLastSelection() { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( pLastPageSaver ) { String sExpand( EXPAND_PROTOCOL ); @@ -826,7 +826,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY ); } - SvLBoxEntry* pTemp = aTreeLB.First(); + SvTreeListEntry* pTemp = aTreeLB.First(); while( !pEntry && pTemp ) { // restore only selection of a leaf @@ -862,7 +862,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() pEntry = aTreeLB.Next(pEntry); } - SvLBoxEntry* pParent = aTreeLB.GetParent(pEntry); + SvTreeListEntry* pParent = aTreeLB.GetParent(pEntry); aTreeLB.Expand(pParent); aTreeLB.MakeVisible(pParent); aTreeLB.MakeVisible(pEntry); @@ -880,8 +880,8 @@ long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) if( aKeyCode.GetCode() == KEY_PAGEUP || aKeyCode.GetCode() == KEY_PAGEDOWN) { - SvLBoxEntry* pCurEntry = aTreeLB.FirstSelected(); - SvLBoxEntry* pTemp = 0; + SvTreeListEntry* pCurEntry = aTreeLB.FirstSelected(); + SvTreeListEntry* pTemp = 0; if(aKeyCode.GetCode() == KEY_PAGEDOWN) { pTemp = aTreeLB.Next( pCurEntry ) ; @@ -923,8 +923,8 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() return; } - SvLBoxEntry* pEntry = pBox->GetCurEntry(); - SvLBoxEntry* pParent = pBox->GetParent(pEntry); + SvTreeListEntry* pEntry = pBox->GetCurEntry(); + SvTreeListEntry* pParent = pBox->GetParent(pEntry); // If the user has selected a category, automatically switch to a suitable // default sub-page instead. @@ -1009,7 +1009,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() if(bIdentical) pGroupInfo->m_pShell = pGroupInfo->m_pModule; // now test whether there was the same module in other groups, too (e. g. Text+HTML) - SvLBoxEntry* pTemp = aTreeLB.First(); + SvTreeListEntry* pTemp = aTreeLB.First(); while(pTemp) { if(!aTreeLB.GetParent(pTemp) && pTemp != pEntry) @@ -1841,7 +1841,7 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void ) SvLBoxTreeList* pTreeList = aTreeLB.GetModel(); DBG_ASSERT( pTreeList, "-OfaTreeOptionsDialog::ResizeTreeLB(): no model, no cookies!" ); - SvLBoxEntry* pEntry = pTreeList->First(); + SvTreeListEntry* pEntry = pTreeList->First(); while( pEntry ) { long n = aTreeLB.GetTextWidth(aTreeLB.GetEntryText(pEntry)); @@ -2166,7 +2166,7 @@ static sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeL { String sGroupName( rGroupName ); sal_uInt16 nRet = 0; - SvLBoxEntry* pEntry = rTreeLB.First(); + SvTreeListEntry* pEntry = rTreeLB.First(); while( pEntry ) { if ( !rTreeLB.GetParent( pEntry ) ) @@ -2192,7 +2192,7 @@ static void lcl_insertLeaf( nGrpId = pDlg->AddGroup( pNode->m_sLabel, NULL, NULL, nNodeGrpId ); if ( !pNode->m_sPageURL.isEmpty() ) { - SvLBoxEntry* pGrpEntry = rTreeLB.GetEntry( 0, nGrpId ); + SvTreeListEntry* pGrpEntry = rTreeLB.GetEntry( 0, nGrpId ); DBG_ASSERT( pGrpEntry, "OfaTreeOptionsDialog::InsertNodes(): no group" ); if ( pGrpEntry ) { diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 133932276dee..b6f1bdc755ad 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -191,7 +191,7 @@ void WebConnectionInfoDialog::FillPasswordList() ::rtl::OUString aUIEntry( aURLEntries[nURLInd].Url ); aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName; - SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); + SvTreeListEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } @@ -207,7 +207,7 @@ void WebConnectionInfoDialog::FillPasswordList() ::rtl::OUString aUIEntry( aUrls[ nURLIdx ] ); aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) ); - SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); + SvTreeListEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } @@ -221,7 +221,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) { try { - SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry(); if ( pEntry ) { ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 ); @@ -277,7 +277,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) { try { - SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry(); if ( pEntry ) { ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 ); @@ -314,7 +314,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) // ----------------------------------------------------------------------- IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) { - SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry(); if ( !pEntry ) { m_aRemoveBtn.Enable( sal_False ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index a34bd712786a..bec34f57d92c 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -330,15 +330,15 @@ class OfaImpBrwString : public SvLBoxString { public: - OfaImpBrwString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + OfaImpBrwString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr){} virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); }; void OfaImpBrwString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { rDev.DrawText( rPos, GetText() ); if(pEntry->GetUserData()) @@ -469,9 +469,9 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, aEditPB.SetClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl)); } -SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 nCol) +SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 nCol) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if ( !pCheckButtonData ) { @@ -789,7 +789,7 @@ sal_Bool OfaACorrCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED; } -void OfaACorrCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) +void OfaACorrCheckListBox::SetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -814,7 +814,7 @@ void OfaACorrCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 } } -SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const +SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -991,7 +991,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, { pArray->push_back(DoubleString()); DoubleString& rDouble = (*pArray)[pArray->size() - 1]; - SvLBoxEntry* pEntry = aReplaceTLB.GetEntry( i ); + SvTreeListEntry* pEntry = aReplaceTLB.GetEntry( i ); rDouble.sShort = aReplaceTLB.GetEntryText(pEntry, 0); rDouble.sLong = aReplaceTLB.GetEntryText(pEntry, 1); rDouble.pUserData = pEntry->GetUserData(); @@ -1015,7 +1015,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, String sEntry(rDouble.sShort); sEntry += '\t'; sEntry += rDouble.sLong; - SvLBoxEntry* pEntry = aReplaceTLB.InsertEntry(sEntry); + SvTreeListEntry* pEntry = aReplaceTLB.InsertEntry(sEntry); aTextOnlyCB.Check(bTextOnly); if(!bTextOnly) pEntry->SetUserData(rDouble.pUserData); // that means: with format info or even with selection text @@ -1041,7 +1041,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, String sEntry(pWordPtr->GetShort()); sEntry += '\t'; sEntry += pWordPtr->GetLong(); - SvLBoxEntry* pEntry = aReplaceTLB.InsertEntry(sEntry); + SvTreeListEntry* pEntry = aReplaceTLB.InsertEntry(sEntry); aTextOnlyCB.Check(pWordPtr->IsTextOnly()); if(!bTextOnly) pEntry->SetUserData(&aTextOnlyCB); // that means: with format info @@ -1099,7 +1099,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) { if(!bFirstSelect || !bHasSelectionText) { - SvLBoxEntry* pEntry = pBox->FirstSelected(); + SvTreeListEntry* pEntry = pBox->FirstSelected(); String sTmpShort(pBox->GetEntryText(pEntry, 0)); // if the text is set via ModifyHdl, the cursor is always at the beginning // of a word, although you're editing here @@ -1186,7 +1186,7 @@ void OfaAutocorrReplacePage::DeleteEntry(String sShort, String sLong) IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) { - SvLBoxEntry* pEntry = aReplaceTLB.FirstSelected(); + SvTreeListEntry* pEntry = aReplaceTLB.FirstSelected(); if( pBtn == &aDeleteReplacePB ) { DBG_ASSERT( pEntry, "no entry selected" ); @@ -1200,7 +1200,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) } if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled()) { - SvLBoxEntry* _pNewEntry = aReplaceTLB.FirstSelected(); + SvTreeListEntry* _pNewEntry = aReplaceTLB.FirstSelected(); String sEntry(aShortED.GetText()); if(sEntry.Len() && ( aReplaceED.GetText().Len() || ( bHasSelectionText && bSWriter ) )) @@ -1220,14 +1220,14 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) sal_uInt32 j; for( j = 0; j < aReplaceTLB.GetEntryCount(); j++ ) { - SvLBoxEntry* pReplaceEntry = aReplaceTLB.GetEntry(j); + SvTreeListEntry* pReplaceEntry = aReplaceTLB.GetEntry(j); if( 0 >= pCompareClass->compareString(sEntry, aReplaceTLB.GetEntryText(pReplaceEntry, 0) ) ) break; } nPos = j; } - SvLBoxEntry* pInsEntry = aReplaceTLB.InsertEntry( - sEntry, static_cast< SvLBoxEntry * >(NULL), false, + SvTreeListEntry* pInsEntry = aReplaceTLB.InsertEntry( + sEntry, static_cast< SvTreeListEntry * >(NULL), false, nPos == UINT_MAX ? LIST_APPEND : nPos); if( !bReplaceEditChanged && !aTextOnlyCB.IsChecked()) { @@ -1255,7 +1255,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) { - SvLBoxEntry* pFirstSel = aReplaceTLB.FirstSelected(); + SvTreeListEntry* pFirstSel = aReplaceTLB.FirstSelected(); sal_Bool bShort = pEdt == &aShortED; const String rEntry = pEdt->GetText(); const String rRepString = aReplaceED.GetText(); @@ -1270,7 +1270,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) for(sal_uInt32 i = 0; i < aReplaceTLB.GetEntryCount(); i++) { - SvLBoxEntry* pEntry = aReplaceTLB.GetEntry( i ); + SvTreeListEntry* pEntry = aReplaceTLB.GetEntry( i ); String aTestStr=aReplaceTLB.GetEntryText(pEntry, 0); if( pCompareClass->compareString(rEntry, aTestStr ) == 0 ) { @@ -1306,7 +1306,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) } else if( aReplaceTLB.GetEntryCount() > 0 ) { - SvLBoxEntry* pEntry = aReplaceTLB.GetEntry( 0 ); + SvTreeListEntry* pEntry = aReplaceTLB.GetEntry( 0 ); aReplaceTLB.MakeVisible( pEntry ); } @@ -1721,9 +1721,9 @@ enum OfaQuoteOptions REPLACE_1ST }; -SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, sal_uInt16 nCol) +SvTreeListEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, sal_uInt16 nCol) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if ( !pCheckButtonData ) { @@ -2419,7 +2419,7 @@ void OfaSmartTagOptionsTabPage::ClearListBox() const sal_uLong nCount = m_aSmartTagTypesLB.GetEntryCount(); for ( sal_uInt16 i = 0; i < nCount; ++i ) { - const SvLBoxEntry* pEntry = m_aSmartTagTypesLB.GetEntry(i); + const SvTreeListEntry* pEntry = m_aSmartTagTypesLB.GetEntry(i); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); delete pUserData; } @@ -2459,7 +2459,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) aName + OUString(RTL_CONSTASCII_USTRINGPARAM(")")); - SvLBoxEntry* pEntry = m_aSmartTagTypesLB.SvTreeListBox::InsertEntry( aLBEntry ); + SvTreeListEntry* pEntry = m_aSmartTagTypesLB.SvTreeListBox::InsertEntry( aLBEntry ); if ( pEntry ) { const bool bCheck = rSmartTagMgr.IsSmartTagTypeEnabled( aSmartTagType ); @@ -2475,7 +2475,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl) { const sal_uInt16 nPos = m_aSmartTagTypesLB.GetSelectEntryPos(); - const SvLBoxEntry* pEntry = m_aSmartTagTypesLB.GetEntry(nPos); + const SvTreeListEntry* pEntry = m_aSmartTagTypesLB.GetEntry(nPos); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec; const sal_Int32 nSmartTagIdx = pUserData->mnSmartTagIdx; @@ -2514,7 +2514,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) return 0; const sal_uInt16 nPos = m_aSmartTagTypesLB.GetSelectEntryPos(); - const SvLBoxEntry* pEntry = m_aSmartTagTypesLB.GetEntry(nPos); + const SvTreeListEntry* pEntry = m_aSmartTagTypesLB.GetEntry(nPos); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec; const sal_Int32 nSmartTagIdx = pUserData->mnSmartTagIdx; @@ -2547,7 +2547,7 @@ sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) for ( sal_uInt16 i = 0; i < nCount; ++i ) { - const SvLBoxEntry* pEntry = m_aSmartTagTypesLB.GetEntry(i); + const SvTreeListEntry* pEntry = m_aSmartTagTypesLB.GetEntry(i); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); const sal_Bool bChecked = m_aSmartTagTypesLB.IsChecked(i); const sal_Bool bIsCurrentlyEnabled = pSmartTagMgr->IsSmartTagTypeEnabled( pUserData->maSmartTagType ); diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 6fa74205d4fd..576f390ef123 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -140,7 +140,7 @@ String ConvertToUIName_Impl( SvxMacro *pMacro ) void _SfxMacroTabPage::EnableButtons() { // don't do anything as long as the eventbox is empty - const SvLBoxEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected(); + const SvTreeListEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected(); if ( pE ) { // get bound macro @@ -182,7 +182,7 @@ void _SfxMacroTabPage::AddEvent( const String & rEventName, sal_uInt16 nEventId sTmp += sNew; } - SvLBoxEntry* pE = mpImpl->pEventLB->GetListBox().InsertEntry( sTmp ); + SvTreeListEntry* pE = mpImpl->pEventLB->GetListBox().InsertEntry( sTmp ); pE->SetUserData( reinterpret_cast< void* >( sal::static_int_cast< sal_IntPtr >( nEventId )) ); } @@ -249,7 +249,7 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet ) FillEvents(); SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.GetEntry( 0 ); + SvTreeListEntry* pE = rListBox.GetEntry( 0 ); if( pE ) rListBox.SetCurEntry( pE ); } @@ -263,7 +263,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) { _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.FirstSelected(); + SvTreeListEntry* pE = rListBox.FirstSelected(); sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) @@ -304,7 +304,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) { _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.FirstSelected(); + SvTreeListEntry* pE = rListBox.FirstSelected(); sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) @@ -420,7 +420,7 @@ void _SfxMacroTabPage::FillEvents() // get events from the table and fill the EventListBox respectively for( sal_uLong n = 0 ; n < nEntryCnt ; ++n ) { - SvLBoxEntry* pE = rListBox.GetEntry( n ); + SvTreeListEntry* pE = rListBox.GetEntry( n ); if( pE ) { SvLBoxString* pLItem = ( SvLBoxString* ) pE->GetItem( LB_MACROS_ITEMPOS ); diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 72520aa7e42f..bf46021f7237 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2436,7 +2436,7 @@ Any OApplicationController::getCurrentSelection( Control& _rControl ) const } // ----------------------------------------------------------------------------- -sal_Bool OApplicationController::requestQuickHelp( const SvLBoxEntry* /*_pEntry*/, String& /*_rText*/ ) const +sal_Bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*/, String& /*_rText*/ ) const { return sal_False; } @@ -2485,7 +2485,7 @@ sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const sal_Int8 nAction = OComponentTransferable::canExtractComponentDescriptor(_rFlavors,eType == E_FORM) ? DND_ACTION_COPY : DND_ACTION_NONE; if ( nAction != DND_ACTION_NONE ) { - SvLBoxEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); + SvTreeListEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); ::rtl::OUString sName; if ( pHitEntry ) { @@ -2553,7 +2553,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) else if ( OComponentTransferable::canExtractComponentDescriptor(aDroppedData.GetDataFlavorExVector(),m_aAsyncDrop.nType == E_FORM) ) { m_aAsyncDrop.aDroppedData = OComponentTransferable::extractComponentDescriptor(aDroppedData); - SvLBoxEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); + SvTreeListEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); if ( pHitEntry ) m_aAsyncDrop.aUrl = pView->getQualifiedName( pHitEntry ); diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 3f0eb1ab9ff9..6cdb65c2cf29 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -47,7 +47,7 @@ #include <memory> -class SvLBoxEntry; +class SvTreeListEntry; class SvTreeListBox; class TransferableHelper; class TransferableClipboardListener; @@ -523,7 +523,7 @@ namespace dbaui virtual bool interceptUserInput( const NotifyEvent& _rEvent ); // IControlActionListener overridables - virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const; + virtual sal_Bool requestQuickHelp( const SvTreeListEntry* _pEntry, String& _rText ) const; virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 1f827f31b1bf..7bbc447cda5a 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -88,13 +88,13 @@ namespace dbaui namespace { - SvLBoxEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvLBoxEntry* _pFirst) + SvTreeListEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvTreeListEntry* _pFirst) { - SvLBoxEntry* pReturn = NULL; + SvTreeListEntry* pReturn = NULL; sal_Int32 nIndex = 0; String sName( _rName.getToken(0,'/',nIndex) ); - SvLBoxEntry* pEntry = _pFirst; + SvTreeListEntry* pEntry = _pFirst; while( pEntry ) { if ( rTree.GetEntryText(pEntry) == sName ) @@ -115,7 +115,7 @@ namespace } return pReturn; } - SvLBoxEntry* lcl_findEntry(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvLBoxEntry* _pFirst) + SvTreeListEntry* lcl_findEntry(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvTreeListEntry* _pFirst) { sal_Int32 nIndex = 0; ::rtl::OUString sErase = _rName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part @@ -327,7 +327,7 @@ void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< ::rtl::OUStr DBTreeListBox& rTree = *m_pLists[nPos]; sal_Int32 nCount = rTree.GetEntryCount(); _rNames.reserve(nCount); - SvLBoxEntry* pEntry = rTree.FirstSelected(); + SvTreeListEntry* pEntry = rTree.FirstSelected(); ElementType eType = getElementType(); while( pEntry ) { @@ -339,7 +339,7 @@ void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< ::rtl::OUStr else { ::rtl::OUString sName = rTree.GetEntryText(pEntry); - SvLBoxEntry* pParent = rTree.GetParent(pEntry); + SvTreeListEntry* pParent = rTree.GetParent(pEntry); while(pParent) { sName = rTree.GetEntryText(pParent) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sName; @@ -379,7 +379,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e ::std::vector< NamedDatabaseObject > aSelected; - SvLBoxEntry* pEntry = pList->FirstSelected(); + SvTreeListEntry* pEntry = pList->FirstSelected(); while( pEntry ) { NamedDatabaseObject aObject; @@ -400,7 +400,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e case E_REPORT: { ::rtl::OUString sName = pList->GetEntryText(pEntry); - SvLBoxEntry* pParent = pList->GetParent(pEntry); + SvTreeListEntry* pParent = pList->GetParent(pEntry); while ( pParent ) { ::rtl::OUStringBuffer buffer; @@ -448,14 +448,14 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa const ::rtl::OUString* pEnd = pIter + _aNames.getLength(); for(;pIter != pEnd;++pIter) { - SvLBoxEntry* pEntry = rTree.GetEntryPosByName(*pIter); + SvTreeListEntry* pEntry = rTree.GetEntryPosByName(*pIter); if ( pEntry ) rTree.Select(pEntry); } } } // ----------------------------------------------------------------------------- -::rtl::OUString OAppDetailPageHelper::getQualifiedName( SvLBoxEntry* _pEntry ) const +::rtl::OUString OAppDetailPageHelper::getQualifiedName( SvTreeListEntry* _pEntry ) const { int nPos = getVisibleControlIndex(); ::rtl::OUString sComposedName; @@ -466,7 +466,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa OSL_ENSURE(m_pLists[nPos],"Tables tree view is NULL! -> GPF"); DBTreeListBox& rTree = *m_pLists[nPos]; - SvLBoxEntry* pEntry = _pEntry; + SvTreeListEntry* pEntry = _pEntry; if ( !pEntry ) pEntry = rTree.FirstSelected(); @@ -481,7 +481,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa else { sComposedName = rTree.GetEntryText(pEntry); - SvLBoxEntry* pParent = rTree.GetParent(pEntry); + SvTreeListEntry* pParent = rTree.GetParent(pEntry); while(pParent) { sComposedName = rTree.GetEntryText(pParent) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sComposedName; @@ -505,7 +505,7 @@ sal_Int32 OAppDetailPageHelper::getSelectionCount() if ( nPos < E_ELEMENT_TYPE_COUNT ) { DBTreeListBox& rTree = *m_pLists[nPos]; - SvLBoxEntry* pEntry = rTree.FirstSelected(); + SvTreeListEntry* pEntry = rTree.FirstSelected(); while( pEntry ) { ++nCount; @@ -553,7 +553,7 @@ void OAppDetailPageHelper::paste() { } // ----------------------------------------------------------------------------- -bool OAppDetailPageHelper::isLeaf(SvLBoxEntry* _pEntry) const +bool OAppDetailPageHelper::isLeaf(SvTreeListEntry* _pEntry) const { if ( !_pEntry ) return false; @@ -577,7 +577,7 @@ sal_Bool OAppDetailPageHelper::isALeafSelected() const if ( nPos < E_ELEMENT_TYPE_COUNT ) { DBTreeListBox& rTree = *m_pLists[nPos]; - SvLBoxEntry* pEntry = rTree.FirstSelected( ); + SvTreeListEntry* pEntry = rTree.FirstSelected( ); while( !bLeafSelected && pEntry ) { bLeafSelected = isLeaf( pEntry ); @@ -587,9 +587,9 @@ sal_Bool OAppDetailPageHelper::isALeafSelected() const return bLeafSelected; } // ----------------------------------------------------------------------------- -SvLBoxEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const +SvTreeListEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const { - SvLBoxEntry* pReturn = NULL; + SvTreeListEntry* pReturn = NULL; int nPos = getVisibleControlIndex(); if ( nPos < E_ELEMENT_TYPE_COUNT ) pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,sal_True ); @@ -621,7 +621,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon { static_cast<OTableTreeListBox*>(m_pLists[E_TABLE])->UpdateTableList(_xConnection); - SvLBoxEntry* pEntry = m_pLists[E_TABLE]->First(); + SvTreeListEntry* pEntry = m_pLists[E_TABLE]->First(); if ( pEntry ) m_pLists[E_TABLE]->Expand(pEntry); m_pLists[E_TABLE]->SelectAll(sal_False); @@ -734,7 +734,7 @@ namespace // ----------------------------------------------------------------------------- void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, const ElementType _eType, - const sal_uInt16 _nImageId, SvLBoxEntry* _pParent ) + const sal_uInt16 _nImageId, SvTreeListEntry* _pParent ) { OSL_ENSURE(_xContainer.is(),"Data source is NULL! -> GPF"); OSL_ENSURE( ( _eType >= E_TABLE ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OAppDetailPageHelper::fillNames: invalid type!" ); @@ -753,7 +753,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY); if ( xSubElements.is() ) { @@ -834,7 +834,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType if ( pTreeView ) { ::rtl::OUString sNewName = _rNewName; - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; switch( _eType ) { case E_TABLE: @@ -860,9 +860,9 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType } } // ----------------------------------------------------------------------------- -SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) +SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) { - SvLBoxEntry* pRet = NULL; + SvTreeListEntry* pRet = NULL; DBTreeListBox* pTreeView = m_pLists[_eType]; if( _eType == E_TABLE && pTreeView ) { @@ -871,7 +871,7 @@ SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl:: else if ( pTreeView ) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; Reference<XChild> xChild(_rObject,UNO_QUERY); if ( xChild.is() && E_QUERY != _eType ) { @@ -918,7 +918,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUStr case E_QUERY: if ( pTreeView ) { - SvLBoxEntry* pEntry = lcl_findEntry_impl(*pTreeView,_rName,pTreeView->First()); + SvTreeListEntry* pEntry = lcl_findEntry_impl(*pTreeView,_rName,pTreeView->First()); if ( pEntry ) pTreeView->GetModel()->Remove(pEntry); } @@ -928,7 +928,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUStr { if ( pTreeView ) { - SvLBoxEntry* pEntry = lcl_findEntry(*pTreeView,_rName,pTreeView->First()); + SvTreeListEntry* pEntry = lcl_findEntry(*pTreeView,_rName,pTreeView->First()); if ( pEntry ) pTreeView->GetModel()->Remove(pEntry); } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 8b34d8c4a6ff..ba3971f930d4 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -125,7 +125,7 @@ namespace dbaui void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer, const ElementType _eType, const sal_uInt16 _nImageId, - SvLBoxEntry* _pParent ); + SvTreeListEntry* _pParent ); /** sets the detail page @param _pWindow @@ -250,7 +250,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvLBoxEntry* _pEntry ) const; + ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /// return the element of currently select entry ElementType getElementType() const; @@ -267,7 +267,7 @@ namespace dbaui @return <TRUE/> if the entry is a leaf, otherwise <FALSE/> */ - bool isLeaf(SvLBoxEntry* _pEntry) const; + bool isLeaf(SvTreeListEntry* _pEntry) const; /** returns if one of the selected entries is a leaf @return @@ -275,7 +275,7 @@ namespace dbaui */ sal_Bool isALeafSelected() const; - SvLBoxEntry* getEntry( const Point& _aPosPixel ) const; + SvTreeListEntry* getEntry( const Point& _aPosPixel ) const; /// clears the detail pages void clearPages(); @@ -293,7 +293,7 @@ namespace dbaui @param _rxConn If we insert a table, the connection must be set. */ - SvLBoxEntry* elementAdded(ElementType eType + SvTreeListEntry* elementAdded(ElementType eType ,const ::rtl::OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 7ebc0993aa64..d3da7bbf5c0d 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -98,7 +98,7 @@ void OCreationList::Paint( const Rectangle& _rRect ) } // ----------------------------------------------------------------------------- -void OCreationList::PreparePaint( SvLBoxEntry* _pEntry ) +void OCreationList::PreparePaint( SvTreeListEntry* _pEntry ) { Wallpaper aEntryBackground( m_aOriginalBackgroundColor ); if ( _pEntry ) @@ -128,7 +128,7 @@ void OCreationList::PreparePaint( SvLBoxEntry* _pEntry ) // ----------------------------------------------------------------------------- void OCreationList::SelectSearchEntry( const void* _pEntry ) { - SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) ); + SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) ); OSL_ENSURE( pEntry, "OCreationList::SelectSearchEntry: invalid entry!" ); if ( pEntry ) @@ -141,7 +141,7 @@ void OCreationList::SelectSearchEntry( const void* _pEntry ) // ----------------------------------------------------------------------------- void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const { - SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) ); + SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) ); OSL_ENSURE( pEntry, "OCreationList::ExecuteSearchEntry: invalid entry!" ); OSL_ENSURE( pEntry == GetCurEntry(), "OCreationList::ExecuteSearchEntry: SelectSearchEntry should have been called before!" ); @@ -150,7 +150,7 @@ void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const } // ----------------------------------------------------------------------------- -Rectangle OCreationList::GetFocusRect( SvLBoxEntry* _pEntry, long _nLine ) +Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) { Rectangle aRect = SvTreeListBox::GetFocusRect( _pEntry, _nLine ); aRect.Left() = 0; @@ -220,7 +220,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt ) } else if ( !rMEvt.IsSynthetic() ) { - SvLBoxEntry* pEntry = GetEntry( rMEvt.GetPosPixel() ); + SvTreeListEntry* pEntry = GetEntry( rMEvt.GetPosPixel() ); if ( m_pMouseDownEntry ) { @@ -253,7 +253,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt ) // ----------------------------------------------------------------------------- void OCreationList::MouseButtonUp( const MouseEvent& rMEvt ) { - SvLBoxEntry* pEntry = GetEntry( rMEvt.GetPosPixel() ); + SvTreeListEntry* pEntry = GetEntry( rMEvt.GetPosPixel() ); bool bExecute = false; // Was the mouse released over the active entry? // (i.e. the entry which was under the mouse when the button went down) @@ -278,7 +278,7 @@ void OCreationList::MouseButtonUp( const MouseEvent& rMEvt ) onSelected( pEntry ); } // ----------------------------------------------------------------------------- -bool OCreationList::setCurrentEntryInvalidate( SvLBoxEntry* _pEntry ) +bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry ) { if ( GetCurEntry() != _pEntry ) { @@ -304,7 +304,7 @@ void OCreationList::updateHelpText() m_rTaskWindow.setHelpText( nHelpTextId ); } // ----------------------------------------------------------------------------- -void OCreationList::onSelected( SvLBoxEntry* _pEntry ) const +void OCreationList::onSelected( SvTreeListEntry* _pEntry ) const { OSL_ENSURE( _pEntry, "OCreationList::onSelected: invalid entry!" ); URL aCommand; @@ -319,15 +319,15 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt ) { if ( rCode.GetCode() == KEY_RETURN ) { - SvLBoxEntry* pEntry = GetCurEntry() ? GetCurEntry() : FirstSelected(); + SvTreeListEntry* pEntry = GetCurEntry() ? GetCurEntry() : FirstSelected(); if ( pEntry ) onSelected( pEntry ); return; } } - SvLBoxEntry* pOldCurrent = GetCurEntry(); + SvTreeListEntry* pOldCurrent = GetCurEntry(); SvTreeListBox::KeyInput(rKEvt); - SvLBoxEntry* pNewCurrent = GetCurEntry(); + SvTreeListEntry* pNewCurrent = GetCurEntry(); if ( pOldCurrent != pNewCurrent ) { @@ -439,7 +439,7 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId) IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/) { DBG_CHKTHIS(OTasksWindow,NULL); - SvLBoxEntry* pEntry = m_aCreation.GetHdlEntry(); + SvTreeListEntry* pEntry = m_aCreation.GetHdlEntry(); if ( pEntry ) m_aHelpText.SetText( ModuleRes( reinterpret_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) ); return 1L; @@ -498,7 +498,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) for ( TaskEntryList::const_iterator pTask = _rList.begin(); pTask != aEnd; ++pTask, ++pImages ) { - SvLBoxEntry* pEntry = m_aCreation.InsertEntry( pTask->sTitle ); + SvTreeListEntry* pEntry = m_aCreation.InsertEntry( pTask->sTitle ); pEntry->SetUserData( reinterpret_cast< void* >( new TaskEntry( *pTask ) ) ); Image aImage = Image( *pImages ); @@ -523,7 +523,7 @@ void OTasksWindow::Clear() { DBG_CHKTHIS(OTasksWindow,NULL); m_aCreation.resetLastActive(); - SvLBoxEntry* pEntry = m_aCreation.First(); + SvTreeListEntry* pEntry = m_aCreation.First(); while ( pEntry ) { delete reinterpret_cast< TaskEntry* >( pEntry->GetUserData() ); @@ -764,13 +764,13 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane } // ----------------------------------------------------------------------------- -::rtl::OUString OApplicationDetailView::getQualifiedName( SvLBoxEntry* _pEntry ) const +::rtl::OUString OApplicationDetailView::getQualifiedName( SvTreeListEntry* _pEntry ) const { DBG_CHKTHIS(OApplicationDetailView,NULL); return m_pControlHelper->getQualifiedName( _pEntry ); } // ----------------------------------------------------------------------------- -sal_Bool OApplicationDetailView::isLeaf(SvLBoxEntry* _pEntry) const +sal_Bool OApplicationDetailView::isLeaf(SvTreeListEntry* _pEntry) const { DBG_CHKTHIS(OApplicationDetailView,NULL); return m_pControlHelper->isLeaf(_pEntry); @@ -857,7 +857,7 @@ void OApplicationDetailView::selectElements(const Sequence< ::rtl::OUString>& _a m_pControlHelper->selectElements( _aNames ); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const +SvTreeListEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const { DBG_CHKTHIS(OApplicationDetailView,NULL); return m_pControlHelper->getEntry(_aPoint); @@ -882,7 +882,7 @@ void OApplicationDetailView::paste() m_pControlHelper->paste(); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) +SvTreeListEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) { DBG_CHKTHIS(OApplicationDetailView,NULL); return m_pControlHelper->elementAdded(_eType,_rName, _rObject ); diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 220b31f10f2a..f8bb55627901 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -35,7 +35,7 @@ #include <vector> -class SvLBoxEntry; +class SvTreeListEntry; namespace dbaui { @@ -49,8 +49,8 @@ namespace dbaui OTasksWindow& m_rTaskWindow; // members related to drawing the currently hovered/selected entry - SvLBoxEntry* m_pMouseDownEntry; - SvLBoxEntry* m_pLastActiveEntry; + SvTreeListEntry* m_pMouseDownEntry; + SvTreeListEntry* m_pLastActiveEntry; Color m_aOriginalBackgroundColor; Font m_aOriginalFont; @@ -71,8 +71,8 @@ namespace dbaui void updateHelpText(); protected: - virtual void PreparePaint( SvLBoxEntry* _pEntry ); - virtual Rectangle GetFocusRect( SvLBoxEntry* _pEntry, long _nLine ); + virtual void PreparePaint( SvTreeListEntry* _pEntry ); + virtual Rectangle GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ); virtual void ModelHasCleared(); // IMnemonicEntryList @@ -80,11 +80,11 @@ namespace dbaui virtual void ExecuteSearchEntry( const void* _pEntry ) const; private: - void onSelected( SvLBoxEntry* _pEntry ) const; + void onSelected( SvTreeListEntry* _pEntry ) const; /** sets a new current entry, and invalidates the old and the new one, if necessary @return <TRUE/> if and only if the "current entry" changed */ - bool setCurrentEntryInvalidate( SvLBoxEntry* _pEntry ); + bool setCurrentEntryInvalidate( SvTreeListEntry* _pEntry ); }; struct TaskEntry @@ -206,7 +206,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvLBoxEntry* _pEntry ) const; + ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -214,7 +214,7 @@ namespace dbaui @return <TRUE/> if the entry is a leaf, otherwise <FALSE/> */ - sal_Bool isLeaf(SvLBoxEntry* _pEntry) const; + sal_Bool isLeaf(SvTreeListEntry* _pEntry) const; /** returns if one of the selected entries is a leaf @return @@ -289,7 +289,7 @@ namespace dbaui @param _rxConn If we insert a table, the connection must be set. */ - SvLBoxEntry* elementAdded(ElementType eType + SvTreeListEntry* elementAdded(ElementType eType ,const ::rtl::OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); @@ -352,7 +352,7 @@ namespace dbaui const ::rtl::OUString& _sName, sal_Bool _bTable); - SvLBoxEntry* getEntry( const Point& _aPoint ) const; + SvTreeListEntry* getEntry( const Point& _aPoint ) const; Window* getTreeWindow() const; private: diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 69658324ed40..3e3469d7ce11 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -362,13 +362,13 @@ void OApplicationView::paste() pTest->paste(); } // ----------------------------------------------------------------------------- -::rtl::OUString OApplicationView::getQualifiedName( SvLBoxEntry* _pEntry ) const +::rtl::OUString OApplicationView::getQualifiedName( SvTreeListEntry* _pEntry ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getQualifiedName( _pEntry ); } // ----------------------------------------------------------------------------- -sal_Bool OApplicationView::isLeaf(SvLBoxEntry* _pEntry) const +sal_Bool OApplicationView::isLeaf(SvTreeListEntry* _pEntry) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->isLeaf(_pEntry); @@ -452,7 +452,7 @@ void OApplicationView::selectElements(const Sequence< ::rtl::OUString>& _aNames) getDetailView()->selectElements( _aNames ); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject ) +SvTreeListEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->elementAdded(eType,_rName,_rObject); @@ -486,7 +486,7 @@ void OApplicationView::selectContainer(ElementType _eType) getPanel()->selectContainer(_eType); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationView::getEntry( const Point& _aPosPixel ) const +SvTreeListEntry* OApplicationView::getEntry( const Point& _aPosPixel ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getEntry(_aPosPixel); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index f9d0940d0252..ab2c3ff50452 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -32,7 +32,7 @@ namespace com{ namespace sun { namespace star { namespace beans { class XPropertySet; } } } } class Control; -class SvLBoxEntry; +class SvTreeListEntry; class MnemonicGenerator; namespace dbaui @@ -141,7 +141,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvLBoxEntry* _pEntry ) const; + ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -149,7 +149,7 @@ namespace dbaui @return <TRUE/> if the entry is a leaf, otherwise <FALSE/> */ - sal_Bool isLeaf(SvLBoxEntry* _pEntry) const; + sal_Bool isLeaf(SvTreeListEntry* _pEntry) const; /** returns if one of the selected entries is a leaf @return @@ -224,7 +224,7 @@ namespace dbaui @param _rxConn If we insert a table, the connection must be set. */ - SvLBoxEntry* elementAdded(ElementType _eType + SvTreeListEntry* elementAdded(ElementType _eType ,const ::rtl::OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); @@ -296,7 +296,7 @@ namespace dbaui const ::rtl::OUString& _sName, sal_Bool _bTable); - SvLBoxEntry* getEntry( const Point& _aPosPixel ) const; + SvTreeListEntry* getEntry( const Point& _aPosPixel ) const; }; } #endif // DBAUI_APPVIEW_HXX diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index dd6af234a43a..9eea983ba8ce 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -47,7 +47,7 @@ namespace dbaui ~DBTreeView(); /** sets a handler which is called when an list box entry is to be expanded. - <p>When calling the link, the parameter is an SvLBoxEntry marking the entry to be expanded. + <p>When calling the link, the parameter is an SvTreeListEntry marking the entry to be expanded. </p> */ void SetPreExpandHandler(const Link& _rHdl); diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index dcf9a2034430..d19a2bbfb560 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -37,7 +37,7 @@ namespace dbaui { // ......................................................................... // ----------------------------------------------------------------------------- -SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvLBoxEntry* _pEntry ) const +SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvTreeListEntry* _pEntry ) const { OSL_ENSURE(isContainer(_pEntry), "SbaTableQueryBrowser::getChildType: invalid entry!"); switch (getEntryType(_pEntry)) @@ -53,21 +53,21 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvLBoxEntry* } // ----------------------------------------------------------------------------- -String SbaTableQueryBrowser::GetEntryText( SvLBoxEntry* _pEntry ) const +String SbaTableQueryBrowser::GetEntryText( SvTreeListEntry* _pEntry ) const { return m_pTreeView->getListBox().GetEntryText(_pEntry); } // ----------------------------------------------------------------------------- -SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( SvLBoxEntry* _pEntry ) const +SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( SvTreeListEntry* _pEntry ) const { if (!_pEntry) return etUnknown; - SvLBoxEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); - SvLBoxEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry); - SvLBoxEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES); - SvLBoxEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES); + SvTreeListEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); + SvTreeListEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry); + SvTreeListEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES); + SvTreeListEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES); #ifdef DBG_UTIL String sTest; @@ -105,7 +105,7 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( SvLBoxEntry* return etQueryContainer; } //------------------------------------------------------------------------------ -void SbaTableQueryBrowser::select(SvLBoxEntry* _pEntry, sal_Bool _bSelect) +void SbaTableQueryBrowser::select(SvTreeListEntry* _pEntry, sal_Bool _bSelect) { SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : NULL; if (pTextItem) @@ -119,7 +119,7 @@ void SbaTableQueryBrowser::select(SvLBoxEntry* _pEntry, sal_Bool _bSelect) } //------------------------------------------------------------------------------ -void SbaTableQueryBrowser::selectPath(SvLBoxEntry* _pEntry, sal_Bool _bSelect) +void SbaTableQueryBrowser::selectPath(SvTreeListEntry* _pEntry, sal_Bool _bSelect) { while (_pEntry) { @@ -128,7 +128,7 @@ void SbaTableQueryBrowser::selectPath(SvLBoxEntry* _pEntry, sal_Bool _bSelect) } } //------------------------------------------------------------------------------ -sal_Bool SbaTableQueryBrowser::isSelected(SvLBoxEntry* _pEntry) const +sal_Bool SbaTableQueryBrowser::isSelected(SvTreeListEntry* _pEntry) const { SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : NULL; if (pTextItem) @@ -199,7 +199,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged() if ( m_pTreeView ) { // change all bitmap entries - SvLBoxEntry* pEntryLoop = m_pTreeModel->First(); + SvTreeListEntry* pEntryLoop = m_pTreeModel->First(); while ( pEntryLoop ) { DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pEntryLoop->GetUserData()); diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 8f6f446c8ec0..94472f0f515a 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -63,7 +63,7 @@ namespace dbaui using namespace ::svx; // ----------------------------------------------------------------------------- - TransferableHelper* SbaTableQueryBrowser::implCopyObject( SvLBoxEntry* _pApplyTo, sal_Int32 _nCommandType, sal_Bool _bAllowConnection ) + TransferableHelper* SbaTableQueryBrowser::implCopyObject( SvTreeListEntry* _pApplyTo, sal_Int32 _nCommandType, sal_Bool _bAllowConnection ) { try { @@ -98,7 +98,7 @@ namespace dbaui sal_Int8 SbaTableQueryBrowser::queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) { // check if we're a table or query container - SvLBoxEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rEvt.maPosPixel ); + SvTreeListEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rEvt.maPosPixel ); if ( pHitEntry ) // no drop if no entry was hit .... { @@ -120,7 +120,7 @@ namespace dbaui // ----------------------------------------------------------------------------- sal_Int8 SbaTableQueryBrowser::executeDrop( const ExecuteDropEvent& _rEvt ) { - SvLBoxEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rEvt.maPosPixel ); + SvTreeListEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rEvt.maPosPixel ); EntryType eEntryType = getEntryType( pHitEntry ); if (!isContainer(eEntryType)) { @@ -182,7 +182,7 @@ namespace dbaui { // get the affected list entry // ensure that the entry which the user clicked at is selected - SvLBoxEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rPosPixel ); + SvTreeListEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rPosPixel ); if (!pHitEntry) // no drag of no entry was hit .... return sal_False; @@ -203,19 +203,19 @@ namespace dbaui // ----------------------------------------------------------------------------- IMPL_LINK(SbaTableQueryBrowser, OnCopyEntry, void*, /*NOTINTERESIN*/) { - SvLBoxEntry* pSelected = m_pTreeView->getListBox().FirstSelected(); + SvTreeListEntry* pSelected = m_pTreeView->getListBox().FirstSelected(); if( isEntryCopyAllowed( pSelected ) ) copyEntry( pSelected ); return 0; } // ----------------------------------------------------------------------------- - sal_Bool SbaTableQueryBrowser::isEntryCopyAllowed(SvLBoxEntry* _pEntry) const + sal_Bool SbaTableQueryBrowser::isEntryCopyAllowed(SvTreeListEntry* _pEntry) const { EntryType eType = getEntryType(_pEntry); return ( eType == etTableOrView || eType == etQuery ); } // ----------------------------------------------------------------------------- - void SbaTableQueryBrowser::copyEntry(SvLBoxEntry* _pEntry) + void SbaTableQueryBrowser::copyEntry(SvTreeListEntry* _pEntry) { TransferableHelper* pTransfer = NULL; Reference< XTransferable> aEnsureDelete; @@ -237,7 +237,7 @@ namespace dbaui SharedConnection xDestConnection; if ( ensureConnection( m_aAsyncDrop.pDroppedAt, xDestConnection ) && xDestConnection.is() ) { - SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent(m_aAsyncDrop.pDroppedAt); + SvTreeListEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent(m_aAsyncDrop.pDroppedAt); m_aTableCopyHelper.asyncCopyTagTable( m_aAsyncDrop, getDataSourceAcessor( pDataSourceEntry ), xDestConnection ); } } @@ -252,7 +252,7 @@ namespace dbaui if (m_pTreeModel) { // clear the user data of the tree model - SvLBoxEntry* pEntryLoop = m_pTreeModel->First(); + SvTreeListEntry* pEntryLoop = m_pTreeModel->First(); while (pEntryLoop) { DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pEntryLoop->GetUserData()); diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 5e0b0075e98f..8c8e2a5c0df0 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -857,7 +857,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun:: return sal_True; } // ----------------------------------------------------------------------------- -Reference<XPropertySet> getColumnHelper(SvLBoxEntry* _pCurrentlyDisplayed,const Reference<XPropertySet>& _rxSource) +Reference<XPropertySet> getColumnHelper(SvTreeListEntry* _pCurrentlyDisplayed,const Reference<XPropertySet>& _rxSource) { Reference<XPropertySet> xRet; if(_pCurrentlyDisplayed) @@ -1075,9 +1075,9 @@ void SAL_CALL SbaTableQueryBrowser::statusChanged( const FeatureStateEvent& _rEv // ------------------------------------------------------------------------- void SbaTableQueryBrowser::checkDocumentDataSource() { - SvLBoxEntry* pDataSourceEntry = NULL; - SvLBoxEntry* pContainerEntry = NULL; - SvLBoxEntry* pObjectEntry = getObjectEntry( m_aDocumentDataSource, &pDataSourceEntry, &pContainerEntry, sal_False ); + SvTreeListEntry* pDataSourceEntry = NULL; + SvTreeListEntry* pContainerEntry = NULL; + SvTreeListEntry* pObjectEntry = getObjectEntry( m_aDocumentDataSource, &pDataSourceEntry, &pContainerEntry, sal_False ); sal_Bool bKnownDocDataSource = (NULL != pObjectEntry); if (!bKnownDocDataSource) { @@ -1149,10 +1149,10 @@ namespace virtual ~FilterByEntryDataId() {} - virtual bool includeEntry( SvLBoxEntry* _pEntry ) const; + virtual bool includeEntry( SvTreeListEntry* _pEntry ) const; }; - bool FilterByEntryDataId::includeEntry( SvLBoxEntry* _pEntry ) const + bool FilterByEntryDataId::includeEntry( SvTreeListEntry* _pEntry ) const { DBTreeListUserData* pData = static_cast< DBTreeListUserData* >( _pEntry->GetUserData() ); return ( !pData || ( pData->sAccessor == sId ) ); @@ -1160,7 +1160,7 @@ namespace } // ------------------------------------------------------------------------- -String SbaTableQueryBrowser::getDataSourceAcessor( SvLBoxEntry* _pDataSourceEntry ) const +String SbaTableQueryBrowser::getDataSourceAcessor( SvTreeListEntry* _pDataSourceEntry ) const { OSL_ENSURE( _pDataSourceEntry, "SbaTableQueryBrowser::getDataSourceAcessor: invalid entry!" ); @@ -1171,8 +1171,8 @@ String SbaTableQueryBrowser::getDataSourceAcessor( SvLBoxEntry* _pDataSourceEntr } // ------------------------------------------------------------------------- -SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataSource, const ::rtl::OUString& _rCommand, sal_Int32 _nCommandType, - SvLBoxEntry** _ppDataSourceEntry, SvLBoxEntry** _ppContainerEntry, sal_Bool _bExpandAncestors, +SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataSource, const ::rtl::OUString& _rCommand, sal_Int32 _nCommandType, + SvTreeListEntry** _ppDataSourceEntry, SvTreeListEntry** _ppContainerEntry, sal_Bool _bExpandAncestors, const SharedConnection& _rxConnection ) { if (_ppDataSourceEntry) @@ -1180,7 +1180,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS if (_ppContainerEntry) *_ppContainerEntry = NULL; - SvLBoxEntry* pObject = NULL; + SvTreeListEntry* pObject = NULL; if ( m_pTreeView ) { // look for the data source entry @@ -1190,7 +1190,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS // #i33699# FilterByEntryDataId aFilter( sDataSourceId ); - SvLBoxEntry* pDataSource = m_pTreeView->getListBox().GetEntryPosByName( sDisplayName, NULL, &aFilter ); + SvTreeListEntry* pDataSource = m_pTreeView->getListBox().GetEntryPosByName( sDisplayName, NULL, &aFilter ); if ( !pDataSource ) // check if the data source name is a file location { if ( bIsDataSourceURL ) @@ -1213,7 +1213,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS m_pTreeView->getListBox().Expand(pDataSource); // look for the object container - SvLBoxEntry* pCommandType = NULL; + SvTreeListEntry* pCommandType = NULL; switch (_nCommandType) { case CommandType::TABLE: @@ -1284,8 +1284,8 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS } // ------------------------------------------------------------------------- -SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor, - SvLBoxEntry** _ppDataSourceEntry, SvLBoxEntry** _ppContainerEntry, +SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor, + SvTreeListEntry** _ppDataSourceEntry, SvTreeListEntry** _ppContainerEntry, sal_Bool _bExpandAncestors) { // extract the props from the descriptor @@ -1425,7 +1425,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) thr { // our connection is in dispose so we have to find the entry equal with this connection // and close it what means to collapse the entry // get the top-level representing the removed data source - SvLBoxEntry* pDSLoop = m_pTreeView->getListBox().FirstChild(NULL); + SvTreeListEntry* pDSLoop = m_pTreeView->getListBox().FirstChild(NULL); while (pDSLoop) { DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pDSLoop->GetUserData()); @@ -1733,12 +1733,12 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const case ID_TREE_CLOSE_CONN: case ID_TREE_EDIT_DATABASE: { - SvLBoxEntry* pCurrentEntry( m_pTreeView->getListBox().GetCurEntry() ); + SvTreeListEntry* pCurrentEntry( m_pTreeView->getListBox().GetCurEntry() ); EntryType eType = getEntryType( pCurrentEntry ); if ( eType == etUnknown ) return aReturn; - SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent( pCurrentEntry ); + SvTreeListEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent( pCurrentEntry ); DBTreeListUserData* pDSData = pDataSourceEntry ? static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() ) @@ -1949,7 +1949,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue // nothing to do break; - SvLBoxEntry* pSelected = m_pCurrentlyDisplayed; + SvTreeListEntry* pSelected = m_pCurrentlyDisplayed; // unload unloadAndCleanup( sal_False ); @@ -2115,7 +2115,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb String sDSDisplayName, sDataSourceId; getDataSourceDisplayName_isURL( _rDbName, sDSDisplayName, sDataSourceId ); - SvLBoxEntry* pDatasourceEntry = m_pTreeView->getListBox().InsertEntry( sDSDisplayName, _rDbImage, _rDbImage, NULL, sal_False ); + SvTreeListEntry* pDatasourceEntry = m_pTreeView->getListBox().InsertEntry( sDSDisplayName, _rDbImage, _rDbImage, NULL, sal_False ); DBTreeListUserData* pDSData = new DBTreeListUserData; pDSData->eType = etDatasource; pDSData->sAccessor = sDataSourceId; @@ -2161,7 +2161,7 @@ void SbaTableQueryBrowser::initializeTreeModel() } // ------------------------------------------------------------------------- void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAccess, - SvLBoxEntry* _pParent, + SvTreeListEntry* _pParent, EntryType _eEntryType) { DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(_pParent->GetUserData()); @@ -2196,7 +2196,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce } //------------------------------------------------------------------------------ -SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const String& _rName, void* _pUserData, EntryType _eEntryType ) +SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParent, const String& _rName, void* _pUserData, EntryType _eEntryType ) { SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) ); @@ -2205,7 +2205,7 @@ SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const Image aImage; pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage ); - SvLBoxEntry* pNewEntry = m_pTreeView->getListBox().InsertEntry( _rName, _pParent, _eEntryType == etQueryContainer , LIST_APPEND, _pUserData ); + SvTreeListEntry* pNewEntry = m_pTreeView->getListBox().InsertEntry( _rName, _pParent, _eEntryType == etQueryContainer , LIST_APPEND, _pUserData ); m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImage ); m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage ); @@ -2214,13 +2214,13 @@ SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const } //------------------------------------------------------------------------------ -IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent) +IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent) { if (_pParent->HasChildren()) // nothing to to ... return 1L; - SvLBoxEntry* pFirstParent = m_pTreeView->getListBox().GetRootLevelParent(_pParent); + SvTreeListEntry* pFirstParent = m_pTreeView->getListBox().GetRootLevelParent(_pParent); OSL_ENSURE(pFirstParent,"SbaTableQueryBrowser::OnExpandEntry: No rootlevelparent!"); DBTreeListUserData* pData = static_cast< DBTreeListUserData* >(_pParent->GetUserData()); @@ -2323,7 +2323,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent) } //------------------------------------------------------------------------------ -sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry ) +sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry ) { OSL_ENSURE(_pEntry, "SbaTableQueryBrowser::ensureEntryObject: invalid argument!"); if (!_pEntry) @@ -2335,7 +2335,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry ) DBTreeListUserData* pEntryData = static_cast<DBTreeListUserData*>(_pEntry->GetUserData()); OSL_ENSURE(pEntryData,"ensureEntryObject: user data should already be set!"); - SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); + SvTreeListEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); sal_Bool bSuccess = sal_False; switch (eType) @@ -2349,7 +2349,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry ) } { - SvLBoxEntry* pParent = m_pTreeView->getListBox().GetParent(_pEntry); + SvTreeListEntry* pParent = m_pTreeView->getListBox().GetParent(_pEntry); if ( pParent != pDataSourceEntry ) { SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING); @@ -2513,9 +2513,9 @@ sal_Bool SbaTableQueryBrowser::implSelect(const ::rtl::OUString& _rDataSourceNam { if (_rDataSourceName.getLength() && _rCommand.getLength() && (-1 != _nCommandType)) { - SvLBoxEntry* pDataSource = NULL; - SvLBoxEntry* pCommandType = NULL; - SvLBoxEntry* pCommand = getObjectEntry( _rDataSourceName, _rCommand, _nCommandType, &pDataSource, &pCommandType, sal_True, _rxConnection ); + SvTreeListEntry* pDataSource = NULL; + SvTreeListEntry* pCommandType = NULL; + SvTreeListEntry* pCommand = getObjectEntry( _rDataSourceName, _rCommand, _nCommandType, &pDataSource, &pCommandType, sal_True, _rxConnection ); if (pCommand) { @@ -2556,9 +2556,9 @@ IMPL_LINK(SbaTableQueryBrowser, OnSelectionChange, void*, /*NOINTERESTEDIN*/) return implSelect( m_pTreeView->getListBox().FirstSelected() ) ? 1L : 0L; } //------------------------------------------------------------------------------ -SvLBoxEntry* SbaTableQueryBrowser::implGetConnectionEntry(SvLBoxEntry* _pEntry) const +SvTreeListEntry* SbaTableQueryBrowser::implGetConnectionEntry(SvTreeListEntry* _pEntry) const { - SvLBoxEntry* pCurrentEntry = _pEntry; + SvTreeListEntry* pCurrentEntry = _pEntry; DBTreeListUserData* pEntryData = static_cast< DBTreeListUserData* >( pCurrentEntry->GetUserData() ); while(pEntryData->eType != etDatasource ) { @@ -2568,7 +2568,7 @@ SvLBoxEntry* SbaTableQueryBrowser::implGetConnectionEntry(SvLBoxEntry* _pEntry) return pCurrentEntry; } //------------------------------------------------------------------------------ -bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) +bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) { if ( !_pEntry ) return false; @@ -2588,11 +2588,11 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) OSL_ENSURE(m_pTreeModel->HasParent(m_pTreeModel->GetParent(_pEntry)), "SbaTableQueryBrowser::implSelect: invalid entry (2)!"); // get the entry for the tables or queries - SvLBoxEntry* pContainer = m_pTreeModel->GetParent(_pEntry); + SvTreeListEntry* pContainer = m_pTreeModel->GetParent(_pEntry); DBTreeListUserData* pContainerData = static_cast<DBTreeListUserData*>(pContainer->GetUserData()); // get the entry for the datasource - SvLBoxEntry* pConnection = implGetConnectionEntry(pContainer); + SvTreeListEntry* pConnection = implGetConnectionEntry(pContainer); DBTreeListUserData* pConData = static_cast<DBTreeListUserData*>(pConnection->GetUserData()); // reinitialize the rowset @@ -2612,7 +2612,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) ::rtl::OUStringBuffer sNameBuffer(sSimpleName); if ( etQueryContainer == pContainerData->eType ) { - SvLBoxEntry* pTemp = pContainer; + SvTreeListEntry* pTemp = pContainer; while( m_pTreeModel->GetParent(pTemp) != pConnection ) { sNameBuffer.insert(0,sal_Unicode('/')); @@ -2786,11 +2786,11 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry ) } // ----------------------------------------------------------------------------- -SvLBoxEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNameAccess>& _rxNameAccess) +SvTreeListEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNameAccess>& _rxNameAccess) { DBTreeListBox& rListBox = m_pTreeView->getListBox(); - SvLBoxEntry* pContainer = NULL; - SvLBoxEntry* pDSLoop = rListBox.FirstChild(NULL); + SvTreeListEntry* pContainer = NULL; + SvTreeListEntry* pDSLoop = rListBox.FirstChild(NULL); while (pDSLoop) { pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_QUERIES); @@ -2817,7 +2817,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve Reference< XNameAccess > xNames(_rEvent.Source, UNO_QUERY); // first search for a definition container where we can insert this element - SvLBoxEntry* pEntry = getEntryFromContainer(xNames); + SvTreeListEntry* pEntry = getEntryFromContainer(xNames); if(pEntry) // found one { // insert the new entry into the tree @@ -2847,7 +2847,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve SbaXDataBrowserController::elementInserted(_rEvent); } // ------------------------------------------------------------------------- -sal_Bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const String& _sName,SvLBoxEntry* _pContainer) +sal_Bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const String& _sName,SvTreeListEntry* _pContainer) { return m_pCurrentlyDisplayed && getEntryType(m_pCurrentlyDisplayed) == getChildType(_pContainer) @@ -2862,7 +2862,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven Reference< XNameAccess > xNames(_rEvent.Source, UNO_QUERY); // get the top-level representing the removed data source // and search for the queries and tables - SvLBoxEntry* pContainer = getEntryFromContainer(xNames); + SvTreeListEntry* pContainer = getEntryFromContainer(xNames); if ( pContainer ) { // a query or table has been removed String aName = ::comphelper::getString(_rEvent.Accessor); @@ -2871,7 +2871,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven { // the element displayed currently has been replaced // we need to remember the old value - SvLBoxEntry* pTemp = m_pCurrentlyDisplayed; + SvTreeListEntry* pTemp = m_pCurrentlyDisplayed; // unload unloadAndCleanup( sal_False ); // don't dispose the connection @@ -2885,7 +2885,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven else { // remove the entry from the model - SvLBoxEntry* pChild = m_pTreeModel->FirstChild(pContainer); + SvTreeListEntry* pChild = m_pTreeModel->FirstChild(pContainer); while(pChild) { if (m_pTreeView->getListBox().GetEntryText(pChild) == aName) @@ -2913,7 +2913,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve SolarMutexGuard aSolarGuard; Reference< XNameAccess > xNames(_rEvent.Source, UNO_QUERY); - SvLBoxEntry* pContainer = getEntryFromContainer(xNames); + SvTreeListEntry* pContainer = getEntryFromContainer(xNames); if ( pContainer ) { // a table or query as been replaced String aName = ::comphelper::getString(_rEvent.Accessor); @@ -2922,7 +2922,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve { // the element displayed currently has been replaced // we need to remember the old value - SvLBoxEntry* pTemp = m_pCurrentlyDisplayed; + SvTreeListEntry* pTemp = m_pCurrentlyDisplayed; unloadAndCleanup( sal_False ); // don't dispose the connection DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pTemp->GetUserData()); @@ -2942,7 +2942,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve else { // find the entry for this name - SvLBoxEntry* pChild = m_pTreeModel->FirstChild(pContainer); + SvTreeListEntry* pChild = m_pTreeModel->FirstChild(pContainer); while(pChild) { if (m_pTreeView->getListBox().GetEntryText(pChild) == aName) @@ -3008,7 +3008,7 @@ void SbaTableQueryBrowser::impl_releaseConnection( SharedConnection& _rxConnecti } // ------------------------------------------------------------------------- -void SbaTableQueryBrowser::disposeConnection( SvLBoxEntry* _pDSEntry ) +void SbaTableQueryBrowser::disposeConnection( SvTreeListEntry* _pDSEntry ) { OSL_ENSURE( _pDSEntry, "SbaTableQueryBrowser::disposeConnection: invalid entry (NULL)!" ); OSL_ENSURE( impl_isDataSourceEntry( _pDSEntry ), "SbaTableQueryBrowser::disposeConnection: invalid entry (not top-level)!" ); @@ -3022,7 +3022,7 @@ void SbaTableQueryBrowser::disposeConnection( SvLBoxEntry* _pDSEntry ) } // ------------------------------------------------------------------------- -void SbaTableQueryBrowser::closeConnection(SvLBoxEntry* _pDSEntry,sal_Bool _bDisposeConnection) +void SbaTableQueryBrowser::closeConnection(SvTreeListEntry* _pDSEntry,sal_Bool _bDisposeConnection) { OSL_ENSURE(_pDSEntry, "SbaTableQueryBrowser::closeConnection: invalid entry (NULL)!"); OSL_ENSURE( impl_isDataSourceEntry( _pDSEntry ), "SbaTableQueryBrowser::closeConnection: invalid entry (not top-level)!"); @@ -3032,16 +3032,16 @@ void SbaTableQueryBrowser::closeConnection(SvLBoxEntry* _pDSEntry,sal_Bool _bDis unloadAndCleanup(_bDisposeConnection); // collapse the query/table container - for (SvLBoxEntry* pContainers = m_pTreeModel->FirstChild(_pDSEntry); pContainers; pContainers= m_pTreeModel->NextSibling(pContainers)) + for (SvTreeListEntry* pContainers = m_pTreeModel->FirstChild(_pDSEntry); pContainers; pContainers= m_pTreeModel->NextSibling(pContainers)) { - SvLBoxEntry* pElements = m_pTreeModel->FirstChild(pContainers); + SvTreeListEntry* pElements = m_pTreeModel->FirstChild(pContainers); if ( pElements ) m_pTreeView->getListBox().Collapse(pContainers); m_pTreeView->getListBox().EnableExpandHandler(pContainers); // and delete their children (they are connection-relative) for (; pElements; ) { - SvLBoxEntry* pRemove = pElements; + SvTreeListEntry* pRemove = pElements; pElements= m_pTreeModel->NextSibling(pElements); DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pRemove->GetUserData()); pRemove->SetUserData(NULL); @@ -3064,7 +3064,7 @@ void SbaTableQueryBrowser::unloadAndCleanup( sal_Bool _bDisposeConnection ) // nothing to do return; - SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent(m_pCurrentlyDisplayed); + SvTreeListEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent(m_pCurrentlyDisplayed); // de-select the path for the currently displayed table/query if (m_pCurrentlyDisplayed) @@ -3356,9 +3356,9 @@ void SbaTableQueryBrowser::showExplorer() } // ----------------------------------------------------------------------------- -sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedConnection& _rConnection) +sal_Bool SbaTableQueryBrowser::ensureConnection(SvTreeListEntry* _pAnyEntry, SharedConnection& _rConnection) { - SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent(_pAnyEntry); + SvTreeListEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent(_pAnyEntry); DBTreeListUserData* pDSData = pDSEntry ? static_cast<DBTreeListUserData*>(pDSEntry->GetUserData()) @@ -3369,7 +3369,7 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedC // ----------------------------------------------------------------------------- SAL_WNODEPRECATED_DECLARATIONS_PUSH -::std::auto_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvLBoxEntry* _pAnyEntry ) +::std::auto_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry ) { ::std::auto_ptr< ImageProvider > pImageProvider( new ImageProvider ); SharedConnection xConnection; @@ -3380,9 +3380,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH SAL_WNODEPRECATED_DECLARATIONS_POP // ----------------------------------------------------------------------------- -sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvLBoxEntry* _pAnyEntry, SharedConnection& _rConnection ) +sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvTreeListEntry* _pAnyEntry, SharedConnection& _rConnection ) { - SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent( _pAnyEntry ); + SvTreeListEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent( _pAnyEntry ); DBTreeListUserData* pDSData = pDSEntry ? static_cast< DBTreeListUserData* >( pDSEntry->GetUserData() ) @@ -3394,14 +3394,14 @@ sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvLBoxEntry* _pAnyEntry #if OSL_DEBUG_LEVEL > 0 // ----------------------------------------------------------------------------- -bool SbaTableQueryBrowser::impl_isDataSourceEntry( SvLBoxEntry* _pEntry ) const +bool SbaTableQueryBrowser::impl_isDataSourceEntry( SvTreeListEntry* _pEntry ) const { return m_pTreeModel->GetRootLevelParent( _pEntry ) == _pEntry; } #endif // ----------------------------------------------------------------------------- -sal_Bool SbaTableQueryBrowser::ensureConnection( SvLBoxEntry* _pDSEntry, void* pDSData, SharedConnection& _rConnection ) +sal_Bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* pDSData, SharedConnection& _rConnection ) { OSL_ENSURE( impl_isDataSourceEntry( _pDSEntry ), "SbaTableQueryBrowser::ensureConnection: this entry does not denote a data source!" ); if(_pDSEntry) @@ -3440,8 +3440,8 @@ sal_Bool SbaTableQueryBrowser::ensureConnection( SvLBoxEntry* _pDSEntry, void* p // ----------------------------------------------------------------------------- IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortData ) { - SvLBoxEntry* pLHS = static_cast<SvLBoxEntry*>(_pSortData->pLeft); - SvLBoxEntry* pRHS = static_cast<SvLBoxEntry*>(_pSortData->pRight); + SvTreeListEntry* pLHS = static_cast<SvTreeListEntry*>(_pSortData->pLeft); + SvTreeListEntry* pRHS = static_cast<SvTreeListEntry*>(_pSortData->pRight); OSL_ENSURE(pLHS && pRHS, "SbaTableQueryBrowser::OnTreeEntryCompare: invalid tree entries!"); // we want the table entry and the end so we have to do a check @@ -3503,7 +3503,7 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa } // ----------------------------------------------------------------------------- -void SbaTableQueryBrowser::implAdministrate( SvLBoxEntry* _pApplyTo ) +void SbaTableQueryBrowser::implAdministrate( SvTreeListEntry* _pApplyTo ) { OSL_PRECOND( _pApplyTo, "SbaTableQueryBrowser::implAdministrate: illegal entry!" ); if ( !_pApplyTo ) @@ -3518,7 +3518,7 @@ void SbaTableQueryBrowser::implAdministrate( SvLBoxEntry* _pApplyTo ) if ( xFrameLoader.is() ) { // the initial selection - SvLBoxEntry* pTopLevelSelected = _pApplyTo; + SvTreeListEntry* pTopLevelSelected = _pApplyTo; while (pTopLevelSelected && m_pTreeView->getListBox().GetParent(pTopLevelSelected)) pTopLevelSelected = m_pTreeView->getListBox().GetParent(pTopLevelSelected); ::rtl::OUString sInitialSelection; @@ -3557,7 +3557,7 @@ void SbaTableQueryBrowser::implAdministrate( SvLBoxEntry* _pApplyTo ) } // ----------------------------------------------------------------------------- -sal_Bool SbaTableQueryBrowser::requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const +sal_Bool SbaTableQueryBrowser::requestQuickHelp( const SvTreeListEntry* _pEntry, String& _rText ) const { const DBTreeListUserData* pData = static_cast< const DBTreeListUserData* >( _pEntry->GetUserData() ); if ( ( pData->eType == etDatasource ) && pData->sAccessor.Len() ) @@ -3600,7 +3600,7 @@ Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const if ( &m_pTreeView->getListBox() != &_rControl ) return Any(); - SvLBoxEntry* pSelected = m_pTreeView->getListBox().FirstSelected(); + SvTreeListEntry* pSelected = m_pTreeView->getListBox().FirstSelected(); if ( !pSelected ) return Any(); @@ -3736,9 +3736,9 @@ void SbaTableQueryBrowser::loadMenu(const Reference< XFrame >& _xFrame) ::rtl::OUString sTitle; if ( m_pCurrentlyDisplayed ) { - SvLBoxEntry* pContainer = m_pTreeModel->GetParent(m_pCurrentlyDisplayed); + SvTreeListEntry* pContainer = m_pTreeModel->GetParent(m_pCurrentlyDisplayed); // get the entry for the datasource - SvLBoxEntry* pConnection = implGetConnectionEntry(pContainer); + SvTreeListEntry* pConnection = implGetConnectionEntry(pContainer); ::rtl::OUString sName = m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed); sTitle = GetEntryText( pConnection ); INetURLObject aURL(sTitle); @@ -3773,8 +3773,8 @@ sal_Bool SbaTableQueryBrowser::preReloadForm() extractDescriptorProps(aDesc, sDataSource, sCommand, nCommandType, bEscapeProcessing); if ( !sDataSource.isEmpty() && !sCommand.isEmpty() && (-1 != nCommandType) ) { - SvLBoxEntry* pDataSource = NULL; - SvLBoxEntry* pCommandType = NULL; + SvTreeListEntry* pDataSource = NULL; + SvTreeListEntry* pCommandType = NULL; m_pCurrentlyDisplayed = getObjectEntry( sDataSource, sCommand, nCommandType, &pDataSource, &pCommandType, sal_True, SharedConnection() ); bIni = sal_True; } @@ -3840,7 +3840,7 @@ void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRe void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSourceName ) { // get the top-level representing the removed data source - SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox().FirstChild( NULL ); + SvTreeListEntry* pDataSourceEntry = m_pTreeView->getListBox().FirstChild( NULL ); while ( pDataSourceEntry ) { if ( m_pTreeView->getListBox().GetEntryText( pDataSourceEntry ) == _rDataSourceName ) @@ -3871,7 +3871,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour { for ( size_t i = 0, n = pList->size(); i < n; ++i ) { - SvLBoxEntry* pEntryLoop = static_cast<SvLBoxEntry*>((*pList)[ i ]); + SvTreeListEntry* pEntryLoop = static_cast<SvTreeListEntry*>((*pList)[ i ]); DBTreeListUserData* pData = static_cast< DBTreeListUserData* >( pEntryLoop->GetUserData() ); pEntryLoop->SetUserData( NULL ); delete pData; diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 94f0bc25e49a..685bcf877444 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -108,17 +108,17 @@ DBTreeListBox::~DBTreeListBox() implStopSelectionTimer(); } //------------------------------------------------------------------------ -SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const +SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvTreeListEntry* pStart, const IEntryFilter* _pFilter ) const { SvLBoxTreeList* myModel = GetModel(); SvTreeEntryList* pChildren = myModel->GetChildList(pStart); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( pChildren ) { size_t nCount = pChildren->size(); for (size_t i = 0; i < nCount; ++i) { - pEntry = static_cast<SvLBoxEntry*>((*pChildren)[ i ]); + pEntry = static_cast<SvTreeListEntry*>((*pChildren)[ i ]); SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); if ( pItem->GetText().equals(aName) ) { @@ -134,13 +134,13 @@ SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* } // ------------------------------------------------------------------------- -void DBTreeListBox::EnableExpandHandler(SvLBoxEntry* _pEntry) +void DBTreeListBox::EnableExpandHandler(SvTreeListEntry* _pEntry) { LINK(this, DBTreeListBox, OnResetEntry).Call(_pEntry); } // ------------------------------------------------------------------------- -void DBTreeListBox::RequestingChildren( SvLBoxEntry* pParent ) +void DBTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) { if (m_aPreExpandHandler.IsSet()) { @@ -155,7 +155,7 @@ void DBTreeListBox::RequestingChildren( SvLBoxEntry* pParent ) } // ------------------------------------------------------------------------- -void DBTreeListBox::InitEntry( SvLBoxEntry* _pEntry, const XubString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind) +void DBTreeListBox::InitEntry( SvTreeListEntry* _pEntry, const XubString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind) { SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind); SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); @@ -204,7 +204,7 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) } // ------------------------------------------------------------------------- -IMPL_LINK(DBTreeListBox, OnResetEntry, SvLBoxEntry*, pEntry) +IMPL_LINK(DBTreeListBox, OnResetEntry, SvTreeListEntry*, pEntry) { // set the flag which allows if the entry can be expanded pEntry->SetFlags( (pEntry->GetFlags() & ~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN)) | SV_ENTRYFLAG_CHILDREN_ON_DEMAND ); @@ -213,11 +213,11 @@ IMPL_LINK(DBTreeListBox, OnResetEntry, SvLBoxEntry*, pEntry) return 0L; } // ----------------------------------------------------------------------------- -void DBTreeListBox::ModelHasEntryInvalidated( SvListEntry* _pEntry ) +void DBTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* _pEntry ) { SvTreeListBox::ModelHasEntryInvalidated( _pEntry ); - SvLBoxEntry* pLBEntry = static_cast<SvLBoxEntry*>(_pEntry); + SvTreeListEntry* pLBEntry = static_cast<SvTreeListEntry*>(_pEntry); if (m_aSelectedEntries.find(pLBEntry) != m_aSelectedEntries.end()) { SvLBoxItem* pTextItem = pLBEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING); @@ -230,10 +230,10 @@ void DBTreeListBox::ModelHasEntryInvalidated( SvListEntry* _pEntry ) } } // ------------------------------------------------------------------------- -void DBTreeListBox::ModelHasRemoved( SvListEntry* _pEntry ) +void DBTreeListBox::ModelHasRemoved( SvTreeListEntry* _pEntry ) { SvTreeListBox::ModelHasRemoved(_pEntry); - SvLBoxEntry* pLBEntry = static_cast<SvLBoxEntry*>(_pEntry); + SvTreeListEntry* pLBEntry = static_cast<SvTreeListEntry*>(_pEntry); if (m_aSelectedEntries.find(pLBEntry) != m_aSelectedEntries.end()) { implStopSelectionTimer(); @@ -247,9 +247,9 @@ sal_Int8 DBTreeListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) sal_Int8 nDropOption = DND_ACTION_NONE; if ( m_pActionListener ) { - SvLBoxEntry* pDroppedEntry = GetEntry(_rEvt.maPosPixel); + SvTreeListEntry* pDroppedEntry = GetEntry(_rEvt.maPosPixel); // check if drag is on child entry, which is not allowed - SvLBoxEntry* pParent = NULL; + SvTreeListEntry* pParent = NULL; if ( _rEvt.mnAction & DND_ACTION_MOVE ) { if ( !m_pDragedEntry ) // no entry to move @@ -319,7 +319,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { String sQuickHelpText; @@ -402,12 +402,12 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) SvTreeListBox::KeyInput(rKEvt); } // ----------------------------------------------------------------------------- -sal_Bool DBTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& /*_aSelection*/) +sal_Bool DBTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& /*_aSelection*/) { return m_aEditingHandler.Call(pEntry) != 0; } // ----------------------------------------------------------------------------- -sal_Bool DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ) +sal_Bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) { DBTreeEditedEntry aEntry; aEntry.pEntry = pEntry; @@ -433,7 +433,7 @@ sal_Bool DBTreeListBox::DoubleClickHdl() // ----------------------------------------------------------------------------- void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,sal_Bool _bUp) { - SvLBoxEntry* pEntry = _pListBox->GetEntry( _rPos ); + SvTreeListEntry* pEntry = _pListBox->GetEntry( _rPos ); if( pEntry && pEntry != _pListBox->Last() ) { _pListBox->ScrollOutputArea( _bUp ? -1 : 1 ); diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx index aaf208db812c..07b2b0aab880 100644 --- a/dbaccess/source/ui/control/listviewitems.cxx +++ b/dbaccess/source/ui/control/listviewitems.cxx @@ -28,7 +28,7 @@ namespace dbaui // class OBoldListboxString //======================================================================== //------------------------------------------------------------------------ - void OBoldListboxString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData) + void OBoldListboxString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData) { SvLBoxString::InitViewData( pView, pEntry, _pViewData ); if ( !m_bEmphasized ) @@ -50,7 +50,7 @@ namespace dbaui } //------------------------------------------------------------------------ - void OBoldListboxString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ) + void OBoldListboxString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry ) { if (m_bEmphasized) { diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 07367d8319c5..a62ee25bc4be 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -82,7 +82,7 @@ void OMarkableTreeListBox::KeyInput( const KeyEvent& rKEvt ) // only if there are spaces if (rKEvt.GetKeyCode().GetCode() == KEY_SPACE && !rKEvt.GetKeyCode().IsShift() && !rKEvt.GetKeyCode().IsMod1()) { - SvLBoxEntry* pCurrentHandlerEntry = GetHdlEntry(); + SvTreeListEntry* pCurrentHandlerEntry = GetHdlEntry(); if(pCurrentHandlerEntry) { SvButtonState eState = GetCheckButtonState( pCurrentHandlerEntry); @@ -100,7 +100,7 @@ void OMarkableTreeListBox::KeyInput( const KeyEvent& rKEvt ) DBTreeListBox::KeyInput(rKEvt); } -SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) +SvButtonState OMarkableTreeListBox::implDetermineState(SvTreeListEntry* _pEntry) { SvButtonState eState = GetCheckButtonState(_pEntry); if (!GetModel()->HasChildren(_pEntry)) @@ -114,7 +114,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) sal_uInt16 nCheckedChildren = 0; sal_uInt16 nChildrenOverall = 0; - SvLBoxEntry* pChildLoop = GetModel()->FirstChild(_pEntry); + SvTreeListEntry* pChildLoop = GetModel()->FirstChild(_pEntry); while (pChildLoop) { #ifdef DBG_UTIL @@ -167,7 +167,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) void OMarkableTreeListBox::CheckButtons() { - SvLBoxEntry* pEntry = GetModel()->First(); + SvTreeListEntry* pEntry = GetModel()->First(); while (pEntry) { implDetermineState(pEntry); @@ -182,13 +182,13 @@ void OMarkableTreeListBox::CheckButtonHdl() m_aCheckButtonHandler.Call(this); } -void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) +void OMarkableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) { SvButtonState eState = GetCheckButtonState( _pEntry); if (GetModel()->HasChildren(_pEntry)) // if it has children, check those too { - SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry); - SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); + SvTreeListEntry* pChildEntry = GetModel()->Next(_pEntry); + SvTreeListEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); while(pChildEntry && pChildEntry != pSiblingEntry) { SetCheckButtonState(pChildEntry, eState); @@ -196,14 +196,14 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) } } - SvLBoxEntry* pEntry = IsSelected(_pEntry) ? FirstSelected() : NULL; + SvTreeListEntry* pEntry = IsSelected(_pEntry) ? FirstSelected() : NULL; while(pEntry) { SetCheckButtonState(pEntry,eState); if(GetModel()->HasChildren(pEntry)) // if it has children, check those too { - SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry); - SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); + SvTreeListEntry* pChildEntry = GetModel()->Next(pEntry); + SvTreeListEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); while(pChildEntry && pChildEntry != pSiblingEntry) { SetCheckButtonState(pChildEntry,eState); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 239a0a2511a8..94b2d32652d4 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -101,7 +101,7 @@ void OTableTreeListBox::implSetDefaultImages() } // ----------------------------------------------------------------------------- -bool OTableTreeListBox::isFolderEntry( const SvLBoxEntry* _pEntry ) const +bool OTableTreeListBox::isFolderEntry( const SvTreeListEntry* _pEntry ) const { sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() ); if ( ( nEntryType == DatabaseObjectContainer::TABLES ) @@ -117,7 +117,7 @@ void OTableTreeListBox::notifyHiContrastChanged() { implSetDefaultImages(); - SvLBoxEntry* pEntryLoop = First(); + SvTreeListEntry* pEntryLoop = First(); while (pEntryLoop) { sal_uInt16 nCount = pEntryLoop->ItemCount(); @@ -325,13 +325,13 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn bCatalogs ? xMeta->getCatalogs() : xMeta->getSchemas(), 1 ) ); sal_Int32 nFolderType = bCatalogs ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; - SvLBoxEntry* pRootEntry = getAllObjectsEntry(); + SvTreeListEntry* pRootEntry = getAllObjectsEntry(); for ( ::std::vector< ::rtl::OUString >::const_iterator folder = aFolderNames.begin(); folder != aFolderNames.end(); ++folder ) { - SvLBoxEntry* pFolder = GetEntryPosByName( *folder, pRootEntry ); + SvTreeListEntry* pFolder = GetEntryPosByName( *folder, pRootEntry ); if ( !pFolder ) pFolder = InsertEntry( *folder, pRootEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderType ) ); } @@ -344,7 +344,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn } } //------------------------------------------------------------------------ -sal_Bool OTableTreeListBox::isWildcardChecked(SvLBoxEntry* _pEntry) const +sal_Bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* _pEntry) const { if (_pEntry) { @@ -356,20 +356,20 @@ sal_Bool OTableTreeListBox::isWildcardChecked(SvLBoxEntry* _pEntry) const } //------------------------------------------------------------------------ -void OTableTreeListBox::checkWildcard(SvLBoxEntry* _pEntry) +void OTableTreeListBox::checkWildcard(SvTreeListEntry* _pEntry) { SetCheckButtonState(_pEntry, SV_BUTTON_CHECKED); checkedButton_noBroadcast(_pEntry); } //------------------------------------------------------------------------ -SvLBoxEntry* OTableTreeListBox::getAllObjectsEntry() const +SvTreeListEntry* OTableTreeListBox::getAllObjectsEntry() const { return haveVirtualRoot() ? First() : NULL; } //------------------------------------------------------------------------ -void OTableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) +void OTableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) { OMarkableTreeListBox::checkedButton_noBroadcast(_pEntry); @@ -383,7 +383,7 @@ void OTableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) } //------------------------------------------------------------------------ -void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, sal_Bool _bUpdateDescendants, sal_Bool _bUpdateAncestors) +void OTableTreeListBox::implEmphasize(SvTreeListEntry* _pEntry, sal_Bool _bChecked, sal_Bool _bUpdateDescendants, sal_Bool _bUpdateAncestors) { OSL_ENSURE(_pEntry, "OTableTreeListBox::implEmphasize: invalid entry (NULL)!"); @@ -404,7 +404,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, if (_bUpdateDescendants) { // remove the mark for all children of the checked entry - SvLBoxEntry* pChildLoop = FirstChild(_pEntry); + SvTreeListEntry* pChildLoop = FirstChild(_pEntry); while (pChildLoop) { if (GetModel()->HasChildren(pChildLoop)) @@ -422,7 +422,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, } //------------------------------------------------------------------------ -void OTableTreeListBox::InitEntry(SvLBoxEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) +void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) { OMarkableTreeListBox::InitEntry(_pEntry, _rString, _rCollapsedBitmap, _rExpandedBitmap, _eButtonKind); @@ -436,7 +436,7 @@ void OTableTreeListBox::InitEntry(SvLBoxEntry* _pEntry, const XubString& _rStrin } //------------------------------------------------------------------------ -SvLBoxEntry* OTableTreeListBox::implAddEntry( +SvTreeListEntry* OTableTreeListBox::implAddEntry( const Reference< XDatabaseMetaData >& _rxMeta, const ::rtl::OUString& _rTableName, sal_Bool _bCheckName @@ -450,7 +450,7 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry( ::rtl::OUString sCatalog, sSchema, sName; qualifiedNameComponents( _rxMeta, _rTableName, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); - SvLBoxEntry* pParentEntry = getAllObjectsEntry(); + SvTreeListEntry* pParentEntry = getAllObjectsEntry(); // if the DB uses catalog at the start of identifiers, then our hierarchy is // catalog @@ -468,7 +468,7 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry( if ( !rFirstName.isEmpty() ) { - SvLBoxEntry* pFolder = GetEntryPosByName( rFirstName, pParentEntry ); + SvTreeListEntry* pFolder = GetEntryPosByName( rFirstName, pParentEntry ); if ( !pFolder ) pFolder = InsertEntry( rFirstName, pParentEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFirstFolderType ) ); pParentEntry = pFolder; @@ -476,13 +476,13 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry( if ( !rSecondName.isEmpty() ) { - SvLBoxEntry* pFolder = GetEntryPosByName( rSecondName, pParentEntry ); + SvTreeListEntry* pFolder = GetEntryPosByName( rSecondName, pParentEntry ); if ( !pFolder ) pFolder = InsertEntry( rSecondName, pParentEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nSecondFolderType ) ); pParentEntry = pFolder; } - SvLBoxEntry* pRet = NULL; + SvTreeListEntry* pRet = NULL; if ( !_bCheckName || !GetEntryPosByName( sName, pParentEntry ) ) { pRet = InsertEntry( sName, pParentEntry, sal_False, LIST_APPEND ); @@ -497,7 +497,7 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry( } //------------------------------------------------------------------------ -NamedDatabaseObject OTableTreeListBox::describeObject( SvLBoxEntry* _pEntry ) +NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry ) { NamedDatabaseObject aObject; @@ -511,7 +511,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvLBoxEntry* _pEntry ) || ( nEntryType == DatabaseObjectContainer::SCHEMA ) ) { - SvLBoxEntry* pParent = GetParent( _pEntry ); + SvTreeListEntry* pParent = GetParent( _pEntry ); sal_Int32 nParentEntryType = pParent ? reinterpret_cast< sal_IntPtr >( pParent->GetUserData() ) : -1; ::rtl::OUStringBuffer buffer; @@ -544,7 +544,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvLBoxEntry* _pEntry ) } //------------------------------------------------------------------------ -SvLBoxEntry* OTableTreeListBox::addedTable( const ::rtl::OUString& _rName ) +SvTreeListEntry* OTableTreeListBox::addedTable( const ::rtl::OUString& _rName ) { try { @@ -569,7 +569,7 @@ bool OTableTreeListBox::impl_getAndAssertMetaData( Reference< XDatabaseMetaData } //------------------------------------------------------------------------ -String OTableTreeListBox::getQualifiedTableName( SvLBoxEntry* _pEntry ) const +String OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) const { OSL_PRECOND( !isFolderEntry( _pEntry ), "OTableTreeListBox::getQualifiedTableName: folder entries not allowed here!" ); @@ -583,10 +583,10 @@ String OTableTreeListBox::getQualifiedTableName( SvLBoxEntry* _pEntry ) const ::rtl::OUString sSchema; ::rtl::OUString sTable; - SvLBoxEntry* pSchema = GetParent( _pEntry ); + SvTreeListEntry* pSchema = GetParent( _pEntry ); if ( pSchema ) { - SvLBoxEntry* pCatalog = GetParent( pSchema ); + SvTreeListEntry* pCatalog = GetParent( pSchema ); if ( pCatalog || ( xMeta->supportsCatalogsInDataManipulation() && !xMeta->supportsSchemasInDataManipulation() @@ -615,7 +615,7 @@ String OTableTreeListBox::getQualifiedTableName( SvLBoxEntry* _pEntry ) const } //------------------------------------------------------------------------ -SvLBoxEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUString& _rName ) +SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUString& _rName ) { try { @@ -627,9 +627,9 @@ SvLBoxEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUString& ::rtl::OUString sCatalog, sSchema, sName; qualifiedNameComponents(xMeta, _rName, sCatalog, sSchema, sName,::dbtools::eInDataManipulation); - SvLBoxEntry* pParent = getAllObjectsEntry(); - SvLBoxEntry* pCat = NULL; - SvLBoxEntry* pSchema = NULL; + SvTreeListEntry* pParent = getAllObjectsEntry(); + SvTreeListEntry* pCat = NULL; + SvTreeListEntry* pSchema = NULL; if ( !sCatalog.isEmpty() ) { pCat = GetEntryPosByName(sCatalog, pParent); @@ -657,7 +657,7 @@ void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName ) { try { - SvLBoxEntry* pEntry = getEntryByQualifiedName( _rName ); + SvTreeListEntry* pEntry = getEntryByQualifiedName( _rName ); if ( pEntry ) GetModel()->Remove( pEntry ); } diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 580791a345a0..55fbf4b1dfff 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -96,15 +96,15 @@ TableListFacade::~TableListFacade() String TableListFacade::getSelectedName( String& _out_rAliasName ) const { - SvLBoxEntry* pEntry = m_rTableList.FirstSelected(); + SvTreeListEntry* pEntry = m_rTableList.FirstSelected(); if ( !pEntry ) return String(); ::rtl::OUString aCatalog, aSchema, aTableName; - SvLBoxEntry* pSchema = m_rTableList.GetParent(pEntry); + SvTreeListEntry* pSchema = m_rTableList.GetParent(pEntry); if(pSchema && pSchema != m_rTableList.getAllObjectsEntry()) { - SvLBoxEntry* pCatalog = m_rTableList.GetParent(pSchema); + SvTreeListEntry* pCatalog = m_rTableList.GetParent(pSchema); if(pCatalog && pCatalog != m_rTableList.getAllObjectsEntry()) aCatalog = m_rTableList.GetEntryText(pCatalog); aSchema = m_rTableList.GetEntryText(pSchema); @@ -200,7 +200,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) } m_rTableList.UpdateTableList( m_xConnection, sTables, sViews ); - SvLBoxEntry* pEntry = m_rTableList.First(); + SvTreeListEntry* pEntry = m_rTableList.First(); while( pEntry && m_rTableList.GetModel()->HasChildren( pEntry ) ) { m_rTableList.Expand( pEntry ); @@ -217,7 +217,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) bool TableListFacade::isLeafSelected() const { - SvLBoxEntry* pEntry = m_rTableList.FirstSelected(); + SvTreeListEntry* pEntry = m_rTableList.FirstSelected(); return pEntry && !m_rTableList.GetModel()->HasChildren( pEntry ); } @@ -306,7 +306,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ ) String QueryListFacade::getSelectedName( String& _out_rAliasName ) const { String sSelected; - SvLBoxEntry* pEntry = m_rQueryList.FirstSelected(); + SvTreeListEntry* pEntry = m_rQueryList.FirstSelected(); if ( pEntry ) sSelected = _out_rAliasName = m_rQueryList.GetEntryText( pEntry ); return sSelected; @@ -314,7 +314,7 @@ String QueryListFacade::getSelectedName( String& _out_rAliasName ) const bool QueryListFacade::isLeafSelected() const { - SvLBoxEntry* pEntry = m_rQueryList.FirstSelected(); + SvTreeListEntry* pEntry = m_rQueryList.FirstSelected(); return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry ); } diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 7b64a5dfcafb..c5fb8365d446 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -95,7 +95,7 @@ namespace dbaui extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars); //------------------------------------------------------------------ - sal_Bool DbaIndexList::EditedEntry( SvLBoxEntry* _pEntry, const rtl::OUString& _rNewText ) + sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const rtl::OUString& _rNewText ) { // first check if this is valid SQL92 name if ( isSQL92CheckEnabled(m_xConnection) ) @@ -146,7 +146,7 @@ namespace dbaui } //------------------------------------------------------------------ - void DbaIndexList::SelectNoHandlerCall( SvLBoxEntry* _pEntry ) + void DbaIndexList::SelectNoHandlerCall( SvTreeListEntry* _pEntry ) { disableSelectHandler(); Select(_pEntry, sal_True); @@ -154,7 +154,7 @@ namespace dbaui } //------------------------------------------------------------------ - sal_Bool DbaIndexList::Select( SvLBoxEntry* pEntry, sal_Bool _bSelect ) + sal_Bool DbaIndexList::Select( SvTreeListEntry* pEntry, sal_Bool _bSelect ) { sal_Bool bReturn = SvTreeListBox::Select(pEntry, _bSelect); @@ -273,7 +273,7 @@ DBG_NAME(DbaIndexDialog) { m_aActions.EnableItem(ID_INDEX_NEW, !m_aIndexes.IsEditingActive()); - SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); sal_Bool bSelectedAnything = NULL != pSelected; @@ -304,7 +304,7 @@ DBG_NAME(DbaIndexDialog) Indexes::iterator aEnd = m_pIndexes->end(); for (; aIndexLoop != aEnd; ++aIndexLoop) { - SvLBoxEntry* pNewEntry = NULL; + SvTreeListEntry* pNewEntry = NULL; if (aIndexLoop->bPrimaryKey) pNewEntry = m_aIndexes.InsertEntry(aIndexLoop->sName, aPKeyIcon, aPKeyIcon); else @@ -327,7 +327,7 @@ DBG_NAME(DbaIndexDialog) } //------------------------------------------------------------------ - sal_Bool DbaIndexDialog::implCommit(SvLBoxEntry* _pEntry) + sal_Bool DbaIndexDialog::implCommit(SvTreeListEntry* _pEntry) { OSL_ENSURE(_pEntry, "DbaIndexDialog::implCommit: invalid entry!"); @@ -389,12 +389,12 @@ DBG_NAME(DbaIndexDialog) return; } - SvLBoxEntry* pNewEntry = m_aIndexes.InsertEntry(sNewIndexName); + SvTreeListEntry* pNewEntry = m_aIndexes.InsertEntry(sNewIndexName); m_pIndexes->insert(sNewIndexName); // update the user data on the entries in the list box: // they're iterators of the index collection, and thus they have changed when removing the index - for (SvLBoxEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust)) + for (SvTreeListEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust)) { Indexes::iterator aAfterInsertPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust)); OSL_ENSURE(aAfterInsertPos != m_pIndexes->end(), "DbaIndexDialog::OnNewIndex: problems with on of the entries!"); @@ -412,7 +412,7 @@ DBG_NAME(DbaIndexDialog) void DbaIndexDialog::OnDropIndex(sal_Bool _bConfirm) { // the selected index - SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); OSL_ENSURE(pSelected, "DbaIndexDialog::OnDropIndex: invalid call!"); if (pSelected) { @@ -435,7 +435,7 @@ DBG_NAME(DbaIndexDialog) } //------------------------------------------------------------------ - sal_Bool DbaIndexDialog::implDropIndex(SvLBoxEntry* _pEntry, sal_Bool _bRemoveFromCollection) + sal_Bool DbaIndexDialog::implDropIndex(SvTreeListEntry* _pEntry, sal_Bool _bRemoveFromCollection) { // do the drop Indexes::iterator aDropPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); @@ -466,7 +466,7 @@ DBG_NAME(DbaIndexDialog) // update the user data on the entries in the list box: // they're iterators of the index collection, and thus they have changed when removing the index - for (SvLBoxEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust)) + for (SvTreeListEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust)) { Indexes::iterator aAfterDropPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust)); OSL_ENSURE(aAfterDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: problems with on of the remaining entries!"); @@ -489,7 +489,7 @@ DBG_NAME(DbaIndexDialog) void DbaIndexDialog::OnRenameIndex() { // the selected index - SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); OSL_ENSURE(pSelected, "DbaIndexDialog::OnRenameIndex: invalid call!"); // save the changes made 'til here @@ -506,7 +506,7 @@ DBG_NAME(DbaIndexDialog) { // the selected index #if OSL_DEBUG_LEVEL > 0 - SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); OSL_ENSURE( pSelected, "DbaIndexDialog::OnSaveIndex: invalid call!" ); #endif @@ -518,7 +518,7 @@ DBG_NAME(DbaIndexDialog) void DbaIndexDialog::OnResetIndex() { // the selected index - SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); OSL_ENSURE(pSelected, "DbaIndexDialog::OnResetIndex: invalid call!"); Indexes::iterator aResetPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData()); @@ -587,7 +587,7 @@ DBG_NAME(DbaIndexDialog) } // the currently selected entry - const SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); + const SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); OSL_ENSURE(pSelected == m_pPreviousSelection, "DbaIndexDialog::OnCloseDialog: inconsistence!"); sal_Int32 nResponse = RET_NO; @@ -621,7 +621,7 @@ DBG_NAME(DbaIndexDialog) } //------------------------------------------------------------------ - IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvLBoxEntry*, _pEntry ) + IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry ) { m_bEditAgain = sal_False; m_aIndexes.EditEntry(_pEntry); @@ -629,7 +629,7 @@ DBG_NAME(DbaIndexDialog) } //------------------------------------------------------------------ - IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry ) + IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry ) { Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); @@ -767,7 +767,7 @@ DBG_NAME(DbaIndexDialog) } //------------------------------------------------------------------ - void DbaIndexDialog::updateControls(const SvLBoxEntry* _pEntry) + void DbaIndexDialog::updateControls(const SvTreeListEntry* _pEntry) { if (_pEntry) { @@ -823,7 +823,7 @@ DBG_NAME(DbaIndexDialog) m_aFieldsLabel.Enable(bHaveSelection); m_pFields->Enable(bHaveSelection); - SvLBoxEntry* pNewSelection = m_aIndexes.FirstSelected(); + SvTreeListEntry* pNewSelection = m_aIndexes.FirstSelected(); updateControls(pNewSelection); if (bHaveSelection) m_aIndexes.GrabFocus(); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 323d819ef61d..f0b5d32c643a 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -296,7 +296,7 @@ namespace void lcl_insertExceptionEntry( SvTreeListBox& _rList, size_t _nElementPos, const ExceptionDisplayInfo& _rEntry ) { Image aEntryImage( _rEntry.pImageProvider->getImage() ); - SvLBoxEntry* pListEntry = + SvTreeListEntry* pListEntry = _rList.InsertEntry( _rEntry.pLabelProvider->getLabel(), aEntryImage, aEntryImage ); pListEntry->SetUserData( reinterpret_cast< void* >( _nElementPos ) ); } @@ -390,7 +390,7 @@ OExceptionChainDialog::~OExceptionChainDialog() //------------------------------------------------------------------------------ IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected) { - SvLBoxEntry* pSelected = m_aExceptionList.FirstSelected(); + SvTreeListEntry* pSelected = m_aExceptionList.FirstSelected(); OSL_ENSURE(!pSelected || !m_aExceptionList.NextSelected(pSelected), "OExceptionChainDialog::OnExceptionSelected : multi selection ?"); String sText; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 3259a87d3f28..6113743b19b8 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -173,7 +173,7 @@ DBG_NAME(OTableSubscriptionPage) String aListBoxTable; ::rtl::OUString sCatalog, sSchema, sName; - SvLBoxEntry* pRootEntry = m_aTablesList.getAllObjectsEntry(); + SvTreeListEntry* pRootEntry = m_aTablesList.getAllObjectsEntry(); sal_Bool bAllTables = sal_False; sal_Bool bAllSchemas = sal_False; @@ -189,7 +189,7 @@ DBG_NAME(OTableSubscriptionPage) bAllSchemas = (1 == sSchema.getLength()) && ('%' == sSchema[0]); // the catalog entry - SvLBoxEntry* pCatalog = m_aTablesList.GetEntryPosByName(sCatalog, pRootEntry); + SvTreeListEntry* pCatalog = m_aTablesList.GetEntryPosByName(sCatalog, pRootEntry); if (!(pCatalog || sCatalog.isEmpty())) // the table (resp. its catalog) refered in this filter entry does not exist anymore continue; @@ -201,7 +201,7 @@ DBG_NAME(OTableSubscriptionPage) } // the schema entry - SvLBoxEntry* pSchema = m_aTablesList.GetEntryPosByName(sSchema, (pCatalog ? pCatalog : pRootEntry)); + SvTreeListEntry* pSchema = m_aTablesList.GetEntryPosByName(sSchema, (pCatalog ? pCatalog : pRootEntry)); if (!(pSchema || sSchema.isEmpty())) // the table (resp. its schema) refered in this filter entry does not exist anymore continue; @@ -212,7 +212,7 @@ DBG_NAME(OTableSubscriptionPage) continue; } - SvLBoxEntry* pEntry = m_aTablesList.GetEntryPosByName(sName, pSchema ? pSchema : (pCatalog ? pCatalog : pRootEntry) ); + SvTreeListEntry* pEntry = m_aTablesList.GetEntryPosByName(sName, pSchema ? pSchema : (pCatalog ? pCatalog : pRootEntry) ); if (pEntry) m_aTablesList.SetCheckButtonState(pEntry, SV_BUTTON_CHECKED); } @@ -384,7 +384,7 @@ DBG_NAME(OTableSubscriptionPage) implCompleteTablesCheck( aTableFilter ); // expand the first entry by default - SvLBoxEntry* pExpand = m_aTablesList.getAllObjectsEntry(); + SvTreeListEntry* pExpand = m_aTablesList.getAllObjectsEntry(); while (pExpand) { m_aTablesList.Expand(pExpand); @@ -401,7 +401,7 @@ DBG_NAME(OTableSubscriptionPage) void OTableSubscriptionPage::CheckAll( sal_Bool _bCheck ) { SvButtonState eState = _bCheck ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED; - SvLBoxEntry* pEntry = m_aTablesList.First(); + SvTreeListEntry* pEntry = m_aTablesList.First(); while (pEntry) { m_aTablesList.SetCheckButtonState( pEntry, eState); @@ -434,8 +434,8 @@ DBG_NAME(OTableSubscriptionPage) //------------------------------------------------------------------------ IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData*, _pSortData ) { - SvLBoxEntry* pLHS = static_cast<SvLBoxEntry*>(_pSortData->pLeft); - SvLBoxEntry* pRHS = static_cast<SvLBoxEntry*>(_pSortData->pRight); + SvTreeListEntry* pLHS = static_cast<SvTreeListEntry*>(_pSortData->pLeft); + SvTreeListEntry* pRHS = static_cast<SvTreeListEntry*>(_pSortData->pRight); OSL_ENSURE(pLHS && pRHS, "SbaTableQueryBrowser::OnTreeEntryCompare: invalid tree entries!"); SvLBoxString* pLeftTextItem = static_cast<SvLBoxString*>(pLHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); @@ -472,16 +472,16 @@ DBG_NAME(OTableSubscriptionPage) static const ::rtl::OUString sWildcard(RTL_CONSTASCII_USTRINGPARAM("%")); ::rtl::OUString sComposedName; - const SvLBoxEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry(); + const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry(); if (!pAllObjectsEntry) return aTableFilter; - SvLBoxEntry* pEntry = m_aTablesList.GetModel()->Next(const_cast<SvLBoxEntry*>(pAllObjectsEntry)); + SvTreeListEntry* pEntry = m_aTablesList.GetModel()->Next(const_cast<SvTreeListEntry*>(pAllObjectsEntry)); while(pEntry) { sal_Bool bCatalogWildcard = sal_False; sal_Bool bSchemaWildcard = sal_False; - SvLBoxEntry* pSchema = NULL; - SvLBoxEntry* pCatalog = NULL; + SvTreeListEntry* pSchema = NULL; + SvTreeListEntry* pCatalog = NULL; if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChildren(pEntry)) { // checked and a leaf, which means it's no catalog, no schema, but a real table @@ -559,9 +559,9 @@ DBG_NAME(OTableSubscriptionPage) } //------------------------------------------------------------------------ - SvLBoxEntry* OTableSubscriptionPage::implNextSibling(SvLBoxEntry* _pEntry) const + SvTreeListEntry* OTableSubscriptionPage::implNextSibling(SvTreeListEntry* _pEntry) const { - SvLBoxEntry* pReturn = NULL; + SvTreeListEntry* pReturn = NULL; if (_pEntry) { pReturn = m_aTablesList.NextSibling(_pEntry); diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 02c9aa4c45f4..6a64c2e2c31c 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -88,7 +88,7 @@ namespace dbaui void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables); /// returns the next sibling, if not available, the next sibling of the parent, a.s.o. - SvLBoxEntry* implNextSibling(SvLBoxEntry* _pEntry) const; + SvTreeListEntry* implNextSibling(SvTreeListEntry* _pEntry) const; /** return the current selection in <member>m_aTablesList</member> */ diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index a7d15480e972..65326d9a1b74 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <functional> -class SvLBoxEntry; +class SvTreeListEntry; //........................................................................ namespace dbaui { @@ -79,7 +79,7 @@ namespace dbaui String aUrl; SotStorageStreamRef aHtmlRtfStorage; ElementType nType; - SvLBoxEntry* pDroppedAt; + SvTreeListEntry* pDroppedAt; sal_Int8 nAction; sal_Bool bHtml; sal_Bool bError; diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index ecdfcae164f2..bffde7216eb0 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -31,7 +31,7 @@ #include <comphelper/containermultiplexer.hxx> #include "cppuhelper/basemutex.hxx" -class SvLBoxEntry; +class SvTreeListEntry; namespace dbaui { ////////////////////////////////////////////////////////////////////////// @@ -88,7 +88,7 @@ namespace dbaui sal_Bool FillListBox(); // wird in JEDEM Init aufgerufen - virtual void OnEntryDoubleClicked(SvLBoxEntry* /*pEntry*/) { } + virtual void OnEntryDoubleClicked(SvTreeListEntry* /*pEntry*/) { } // wird aus dem DoubleClickHdl der ListBox heraus aufgerufen /** HandleKeyInput triues to handle the KeyEvent. Movement or deletion diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 890f69887e6e..e42658f23363 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -31,7 +31,7 @@ namespace dbaui { public: OTableWindowListBox* pListBox; // die ListBox innerhalb desselben (daraus kann man sich das TabWin und daraus den WinName besorgen) - SvLBoxEntry* pEntry; // der Eintrag, der gedraggt oder auf den gedroppt wurde + SvTreeListEntry* pEntry; // der Eintrag, der gedraggt oder auf den gedroppt wurde OJoinExchangeData(OTableWindowListBox* pBox); OJoinExchangeData() : pListBox(NULL), pEntry(NULL) { } @@ -88,7 +88,7 @@ namespace dbaui virtual void Command(const CommandEvent& rEvt); OTableWindow* GetTabWin(){ return m_pTabWin; } - SvLBoxEntry* GetEntryFromText( const String& rEntryText ); + SvTreeListEntry* GetEntryFromText( const String& rEntryText ); private: using SvTreeListBox::ExecuteDrop; diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index ba5cb519f565..038b7032a8e6 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -35,14 +35,14 @@ namespace dbaui { sal_Bool m_bReadOnly; protected: - virtual void InitEntry(SvLBoxEntry* pEntry, const String& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); + virtual void InitEntry(SvTreeListEntry* pEntry, const String& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); public: OColumnTreeBox( Window* pParent, const ResId& rResId ); void FillListBox( const ODatabaseExport::TColumnVector& _rList); void SetReadOnly(sal_Bool _bRo=sal_True) { m_bReadOnly = _bRo; } - virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); private: using OMarkableTreeListBox::Select; diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index b49b7aadc3ba..9aaf4a1fc96a 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -24,7 +24,7 @@ #include <sot/formats.hxx> #include <com/sun/star/container/XContainer.hpp> -class SvLBoxEntry; +class SvTreeListEntry; class String; class Point; class PopupMenu; @@ -49,7 +49,7 @@ namespace dbaui /** requests a quick help text to display @return <FALSE/> if the default quick help text should be used */ - virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const = 0; + virtual sal_Bool requestQuickHelp( const SvTreeListEntry* _pEntry, String& _rText ) const = 0; /** handler for StartDrag requests @return <TRUE/> if a drag operation was started diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 77ee4e95a6a8..de6e45a9d6e3 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -34,14 +34,14 @@ namespace dbaui { struct DBTreeEditedEntry { - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; XubString aNewText; }; class IEntryFilter { public: - virtual bool includeEntry( SvLBoxEntry* _pEntry ) const = 0; + virtual bool includeEntry( SvTreeListEntry* _pEntry ) const = 0; protected: ~IEntryFilter() {} @@ -56,8 +56,8 @@ namespace dbaui OScrollHelper m_aScrollHelper; Timer m_aTimer; // is needed for table updates Point m_aMousePos; - std::set<SvLBoxEntry*> m_aSelectedEntries; - SvLBoxEntry* m_pDragedEntry; + std::set<SvTreeListEntry*> m_aSelectedEntries; + SvTreeListEntry* m_pDragedEntry; IControlActionListener* m_pActionListener; IContextMenuProvider* m_pContextMenuProvider; @@ -81,7 +81,7 @@ namespace dbaui private: void init(); DECL_LINK( OnTimeOut, void* ); - DECL_LINK( OnResetEntry, SvLBoxEntry* ); + DECL_LINK( OnResetEntry, SvTreeListEntry* ); DECL_LINK( ScrollUpHdl, SvTreeListBox* ); DECL_LINK( ScrollDownHdl, SvTreeListBox* ); @@ -113,21 +113,21 @@ namespace dbaui // modified the given entry so that the expand handler is called whenever the entry is expanded // (normally, the expand handler is called only once) - void EnableExpandHandler(SvLBoxEntry* _pEntry); + void EnableExpandHandler(SvTreeListEntry* _pEntry); - SvLBoxEntry* GetEntryPosByName( const String& aName, SvLBoxEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; - virtual void RequestingChildren( SvLBoxEntry* pParent ); + SvTreeListEntry* GetEntryPosByName( const String& aName, SvTreeListEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; + virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual void SelectHdl(); virtual void DeselectHdl(); // Window virtual void KeyInput( const KeyEvent& rKEvt ); virtual void StateChanged( StateChangedType nStateChange ); - virtual void InitEntry( SvLBoxEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); + virtual void InitEntry( SvTreeListEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); // enable editing for tables/views and queries - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); virtual sal_Bool DoubleClickHdl(); @@ -148,8 +148,8 @@ namespace dbaui virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); - virtual void ModelHasRemoved( SvListEntry* pEntry ); - virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); + virtual void ModelHasRemoved( SvTreeListEntry* pEntry ); + virtual void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ); void implStopSelectionTimer(); void implStartSelectionTimer(); diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 61ae42971402..b8f2bd64be54 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -59,12 +59,12 @@ namespace dbaui void SetEndEditHdl(const Link& _rHdl) { m_aEndEditHdl = _rHdl; } Link GetEndEditHdl() const { return m_aEndEditHdl; } - virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect ); + virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect ); void enableSelectHandler(); void disableSelectHandler(); - void SelectNoHandlerCall( SvLBoxEntry* pEntry ); + void SelectNoHandlerCall( SvTreeListEntry* pEntry ); inline void setConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection) { @@ -72,7 +72,7 @@ namespace dbaui } protected: - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); private: using SvTreeListBox::Select; @@ -102,7 +102,7 @@ namespace dbaui HelpButton m_aHelp; OIndexCollection* m_pIndexes; - SvLBoxEntry* m_pPreviousSelection; + SvTreeListEntry* m_pPreviousSelection; sal_Bool m_bEditAgain; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > @@ -136,16 +136,16 @@ namespace dbaui protected: void fillIndexList(); void updateToolbox(); - void updateControls(const SvLBoxEntry* _pEntry); + void updateControls(const SvTreeListEntry* _pEntry); protected: DECL_LINK( OnIndexSelected, DbaIndexList* ); DECL_LINK( OnIndexAction, ToolBox* ); - DECL_LINK( OnEntryEdited, SvLBoxEntry* ); + DECL_LINK( OnEntryEdited, SvTreeListEntry* ); DECL_LINK( OnModified, void* ); DECL_LINK( OnCloseDialog, void* ); - DECL_LINK( OnEditIndexAgain, SvLBoxEntry* ); + DECL_LINK( OnEditIndexAgain, SvTreeListEntry* ); private: void OnNewIndex(); @@ -154,11 +154,11 @@ namespace dbaui void OnSaveIndex(); void OnResetIndex(); - sal_Bool implCommit(SvLBoxEntry* _pEntry); + sal_Bool implCommit(SvTreeListEntry* _pEntry); sal_Bool implSaveModified(sal_Bool _bPlausibility = sal_True); sal_Bool implCommitPreviouslySelected(); - sal_Bool implDropIndex(SvLBoxEntry* _pEntry, sal_Bool _bRemoveFromCollection); + sal_Bool implDropIndex(SvTreeListEntry* _pEntry, sal_Bool _bRemoveFromCollection); sal_Bool implCheckPlausibility(const ConstIndexesIterator& _rPos); diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index 99aca2095a40..c9d076cc9ca4 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -37,7 +37,7 @@ namespace dbaui sal_Bool m_bEmphasized; public: - OBoldListboxString(SvLBoxEntry* _pEntry, sal_uInt16 _nFlags, const XubString& _rStr) + OBoldListboxString(SvTreeListEntry* _pEntry, sal_uInt16 _nFlags, const XubString& _rStr) :SvLBoxString(_pEntry, _nFlags, _rStr) ,m_bEmphasized(sal_False) { @@ -45,8 +45,8 @@ namespace dbaui virtual sal_uInt16 IsA(); - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); - virtual void InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry); + virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData); sal_Bool isEmphasized() const { return m_bEmphasized; } void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; } diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index adda68952197..0567e22d8947 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -60,9 +60,9 @@ public: protected: virtual void Paint(const Rectangle& _rRect); - virtual void checkedButton_noBroadcast(SvLBoxEntry* _pEntry); + virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry); - SvButtonState implDetermineState(SvLBoxEntry* _pEntry); + SvButtonState implDetermineState(SvTreeListEntry* _pEntry); // determines the check state of the given entry, by analyzing the states of all descendants private: diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index e545ef081a67..50688d9a8519 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -77,11 +77,11 @@ public: /** determines whether the given entry denotes a tables folder */ - bool isFolderEntry( const SvLBoxEntry* _pEntry ) const; + bool isFolderEntry( const SvTreeListEntry* _pEntry ) const; /** determines whether the given entry denotes a table or view */ - bool isTableOrViewEntry( const SvLBoxEntry* _pEntry ) const + bool isTableOrViewEntry( const SvTreeListEntry* _pEntry ) const { return !isFolderEntry( _pEntry ); } @@ -112,11 +112,11 @@ public: /** returns a NamedDatabaseObject record which describes the given entry */ ::com::sun::star::sdb::application::NamedDatabaseObject - describeObject( SvLBoxEntry* _pEntry ); + describeObject( SvTreeListEntry* _pEntry ); /** to be used if a foreign instance added a table */ - SvLBoxEntry* addedTable( const ::rtl::OUString& _rName ); + SvTreeListEntry* addedTable( const ::rtl::OUString& _rName ); /** to be used if a foreign instance removed a table */ @@ -126,37 +126,37 @@ public: @param _pEntry the entry whose name is to be obtained. Must not denote a folder entry. */ - String getQualifiedTableName( SvLBoxEntry* _pEntry ) const; + String getQualifiedTableName( SvTreeListEntry* _pEntry ) const; - SvLBoxEntry* getEntryByQualifiedName( const ::rtl::OUString& _rName ); + SvTreeListEntry* getEntryByQualifiedName( const ::rtl::OUString& _rName ); - SvLBoxEntry* getAllObjectsEntry() const; + SvTreeListEntry* getAllObjectsEntry() const; /** does a wildcard check of the given entry <p>There are two different 'checked' states: If the user checks all children of an entry, this is different from checking the entry itself. The second is called 'wildcard' checking, 'cause in the resulting table filter it's represented by a wildcard.</p> */ - void checkWildcard(SvLBoxEntry* _pEntry); + void checkWildcard(SvTreeListEntry* _pEntry); /** determine if the given entry is 'wildcard checked' @see checkWildcard */ - sal_Bool isWildcardChecked(SvLBoxEntry* _pEntry) const; + sal_Bool isWildcardChecked(SvTreeListEntry* _pEntry) const; protected: - virtual void InitEntry(SvLBoxEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind); + virtual void InitEntry(SvTreeListEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind); - virtual void checkedButton_noBroadcast(SvLBoxEntry* _pEntry); + virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry); - void implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, sal_Bool _bUpdateDescendants = sal_True, sal_Bool _bUpdateAncestors = sal_True); + void implEmphasize(SvTreeListEntry* _pEntry, sal_Bool _bChecked, sal_Bool _bUpdateDescendants = sal_True, sal_Bool _bUpdateAncestors = sal_True); /** adds the given entry to our list @precond our image provider must already have been reset to the connection to which the meta data belong. */ - SvLBoxEntry* implAddEntry( + SvTreeListEntry* implAddEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMeta, const ::rtl::OUString& _rTableName, sal_Bool _bCheckName = sal_True diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 323b98c54ef8..6ad76e7d4280 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -44,7 +44,7 @@ #include "commontypes.hxx" // ========================================================================= -class SvLBoxEntry; +class SvTreeListEntry; class Splitter; struct SvSortData; @@ -110,7 +110,7 @@ namespace dbaui DBTreeView* m_pTreeView; Splitter* m_pSplitter; SvLBoxTreeList* m_pTreeModel; // contains the datasources of the registry - SvLBoxEntry* m_pCurrentlyDisplayed; + SvTreeListEntry* m_pCurrentlyDisplayed; sal_uLong m_nAsyncDrop; sal_Int16 m_nBorder; // sal_True when border should be shown @@ -234,7 +234,7 @@ namespace dbaui virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); // IControlActionListener overridables - virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const; + virtual sal_Bool requestQuickHelp( const SvTreeListEntry* _pEntry, String& _rText ) const; virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); @@ -262,11 +262,11 @@ namespace dbaui // methods for handling the 'selection' (paintin them bold) of SvLBoxEntries // returns <TRUE/> if the entry is selected (which means it's part of the selected path) - sal_Bool isSelected(SvLBoxEntry* _pEntry) const; + sal_Bool isSelected(SvTreeListEntry* _pEntry) const; // select the entry (and only the entry, not the whole path) - void select(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); + void select(SvTreeListEntry* _pEntry, sal_Bool _bSelect = sal_True); // select the path of the entry (which must be an entry without children) - void selectPath(SvLBoxEntry* _pEntry, sal_Bool _bSelect = sal_True); + void selectPath(SvTreeListEntry* _pEntry, sal_Bool _bSelect = sal_True); virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); @@ -311,52 +311,52 @@ namespace dbaui void unloadAndCleanup( sal_Bool _bDisposeConnection = sal_True ); // disposes the connection associated with the given entry (which must represent a data source) - void disposeConnection( SvLBoxEntry* _pDSEntry ); + void disposeConnection( SvTreeListEntry* _pDSEntry ); /// flushs and disposes the given connection, and de-registers as listener void impl_releaseConnection( SharedConnection& _rxConnection ); /** close the connection (and collapse the list entries) of the given list entries */ - void closeConnection(SvLBoxEntry* _pEntry,sal_Bool _bDisposeConnection = sal_True); + void closeConnection(SvTreeListEntry* _pEntry,sal_Bool _bDisposeConnection = sal_True); - void populateTree(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xNameAccess, SvLBoxEntry* _pParent, EntryType _eEntryType); + void populateTree(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xNameAccess, SvTreeListEntry* _pParent, EntryType _eEntryType); void initializeTreeModel(); /** search in the tree for query- or tablecontainer equal to this interface and return this container entry */ - SvLBoxEntry* getEntryFromContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxNameAccess); + SvTreeListEntry* getEntryFromContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxNameAccess); // return true when there is connection available - sal_Bool ensureConnection(SvLBoxEntry* _pDSEntry, void * pDSData, SharedConnection& _rConnection ); - sal_Bool ensureConnection(SvLBoxEntry* _pAnyEntry, SharedConnection& _rConnection ); + sal_Bool ensureConnection(SvTreeListEntry* _pDSEntry, void * pDSData, SharedConnection& _rConnection ); + sal_Bool ensureConnection(SvTreeListEntry* _pAnyEntry, SharedConnection& _rConnection ); - sal_Bool getExistentConnectionFor( SvLBoxEntry* _pDSEntry, SharedConnection& _rConnection ); + sal_Bool getExistentConnectionFor( SvTreeListEntry* _pDSEntry, SharedConnection& _rConnection ); /** returns an image provider which works with the connection belonging to the given entry */ ::std::auto_ptr< ImageProvider > - getImageProviderFor( SvLBoxEntry* _pAnyEntry ); + getImageProviderFor( SvTreeListEntry* _pAnyEntry ); - void implAdministrate( SvLBoxEntry* _pApplyTo ); + void implAdministrate( SvTreeListEntry* _pApplyTo ); TransferableHelper* - implCopyObject( SvLBoxEntry* _pApplyTo, sal_Int32 _nCommandType, sal_Bool _bAllowConnection = sal_True ); + implCopyObject( SvTreeListEntry* _pApplyTo, sal_Int32 _nCommandType, sal_Bool _bAllowConnection = sal_True ); - EntryType getEntryType( SvLBoxEntry* _pEntry ) const; - EntryType getChildType( SvLBoxEntry* _pEntry ) const; + EntryType getEntryType( SvTreeListEntry* _pEntry ) const; + EntryType getChildType( SvTreeListEntry* _pEntry ) const; sal_Bool isObject( EntryType _eType ) const { return ( etTableOrView== _eType ) || ( etQuery == _eType ); } sal_Bool isContainer( EntryType _eType ) const { return (etTableContainer == _eType) || (etQueryContainer == _eType); } - sal_Bool isContainer( SvLBoxEntry* _pEntry ) const { return isContainer( getEntryType( _pEntry ) ); } + sal_Bool isContainer( SvTreeListEntry* _pEntry ) const { return isContainer( getEntryType( _pEntry ) ); } // ensure that the xObject for the given entry is set on the user data - sal_Bool ensureEntryObject( SvLBoxEntry* _pEntry ); + sal_Bool ensureEntryObject( SvTreeListEntry* _pEntry ); // get the display text of the entry given - String GetEntryText( SvLBoxEntry* _pEntry ) const; + String GetEntryText( SvTreeListEntry* _pEntry ) const; // is called when a table or a query was selected DECL_LINK( OnSelectionChange, void* ); - DECL_LINK( OnExpandEntry, SvLBoxEntry* ); + DECL_LINK( OnExpandEntry, SvTreeListEntry* ); DECL_LINK( OnCopyEntry, void* ); @@ -367,7 +367,7 @@ namespace dbaui void implRemoveStatusListeners(); sal_Bool implSelect(const ::svx::ODataAccessDescriptor& _rDescriptor,sal_Bool _bSelectDirect = sal_False); - bool implSelect( SvLBoxEntry* _pEntry ); + bool implSelect( SvTreeListEntry* _pEntry ); /// selects the entry given and loads the grid control with the object's data sal_Bool implSelect( @@ -379,10 +379,10 @@ namespace dbaui sal_Bool _bSelectDirect = sal_False ); - SvLBoxEntry* implGetConnectionEntry(SvLBoxEntry* _pEntry) const; + SvTreeListEntry* implGetConnectionEntry(SvTreeListEntry* _pEntry) const; /// inserts an entry into the tree - SvLBoxEntry* implAppendEntry( - SvLBoxEntry* _pParent, + SvTreeListEntry* implAppendEntry( + SvTreeListEntry* _pParent, const String& _rName, void* _pUserData, EntryType _eEntryType @@ -402,8 +402,8 @@ namespace dbaui @param _bExpandAncestors If <TRUE/>, all ancestor on the way to the entry will be expanded */ - SvLBoxEntry* getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor, - SvLBoxEntry** _ppDataSourceEntry = NULL, SvLBoxEntry** _ppContainerEntry = NULL, + SvTreeListEntry* getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor, + SvTreeListEntry** _ppDataSourceEntry = NULL, SvTreeListEntry** _ppContainerEntry = NULL, sal_Bool _bExpandAncestors = sal_True ); /** retrieves the tree entry for the object described by data source name, command and command type @@ -422,9 +422,9 @@ namespace dbaui @param _bExpandAncestors If <TRUE/>, all ancestor on the way to the entry will be expanded */ - SvLBoxEntry* getObjectEntry( + SvTreeListEntry* getObjectEntry( const ::rtl::OUString& _rDataSource, const ::rtl::OUString& _rCommand, sal_Int32 _nCommandType, - SvLBoxEntry** _ppDataSourceEntry = NULL, SvLBoxEntry** _ppContainerEntry = NULL, + SvTreeListEntry** _ppDataSourceEntry = NULL, SvTreeListEntry** _ppContainerEntry = NULL, sal_Bool _bExpandAncestors = sal_True, const SharedConnection& _rxConnection = SharedConnection() ); @@ -444,20 +444,20 @@ namespace dbaui #if OSL_DEBUG_LEVEL > 0 // checks whether the given tree entry denotes a data source - bool impl_isDataSourceEntry( SvLBoxEntry* _pEntry ) const; + bool impl_isDataSourceEntry( SvTreeListEntry* _pEntry ) const; #endif /// retrieves the data source URL/name for the given entry representing a data source - String getDataSourceAcessor( SvLBoxEntry* _pDataSourceEntry ) const; + String getDataSourceAcessor( SvTreeListEntry* _pDataSourceEntry ) const; /** get the signature (command/escape processing) of the query the form is based on <p>If the for is not based on a query or not even loaded, nothing happens and <FALSE/> is returned.</p> */ sal_Bool implGetQuerySignature( ::rtl::OUString& _rCommand, sal_Bool& _bEscapeProcessing ); - sal_Bool isEntryCopyAllowed(SvLBoxEntry* _pEntry) const; + sal_Bool isEntryCopyAllowed(SvTreeListEntry* _pEntry) const; - void copyEntry(SvLBoxEntry* _pEntry); + void copyEntry(SvTreeListEntry* _pEntry); // remove all grid columns and dispose them void clearGridColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xColContainer); @@ -470,7 +470,7 @@ namespace dbaui @return <TRUE/> if it is the currently displayed otherwise <FALSE/> */ - sal_Bool isCurrentlyDisplayedChanged(const String& _sName,SvLBoxEntry* _pContainer); + sal_Bool isCurrentlyDisplayedChanged(const String& _sName,SvTreeListEntry* _pContainer); /** called whenever the content of the browser is used for preview, as the very last action of the load process diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index b68b329a3162..44d8da76293d 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -138,8 +138,8 @@ sal_Bool OWizNameMatching::LeavePage() sal_Int32 nParamPos = 0; - SvLBoxEntry* pLeftEntry = m_CTRL_LEFT.GetModel()->First(); - SvLBoxEntry* pRightEntry = m_CTRL_RIGHT.GetModel()->First(); + SvTreeListEntry* pLeftEntry = m_CTRL_LEFT.GetModel()->First(); + SvTreeListEntry* pRightEntry = m_CTRL_RIGHT.GetModel()->First(); while(pLeftEntry && pRightEntry) { OFieldDescription* pSrcField = static_cast<OFieldDescription*>(pLeftEntry->GetUserData()); @@ -189,7 +189,7 @@ String OWizNameMatching::GetTitle() const { return String(ModuleRes(STR_WIZ_NAME // ----------------------------------------------------------------------- IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) { - SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected(); + SvTreeListEntry* pEntry = m_CTRL_LEFT.FirstSelected(); if ( pEntry ) { sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); @@ -219,7 +219,7 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) //------------------------------------------------------------------------------ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) { - SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); + SvTreeListEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); if ( pEntry ) { sal_Int32 nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); @@ -243,11 +243,11 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) //------------------------------------------------------------------------------ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ ) { - SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected(); + SvTreeListEntry* pEntry = m_CTRL_LEFT.FirstSelected(); if(pEntry) { sal_uLong nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); - SvLBoxEntry* pOldEntry = m_CTRL_RIGHT.FirstSelected(); + SvTreeListEntry* pOldEntry = m_CTRL_RIGHT.FirstSelected(); if(pOldEntry && nPos != m_CTRL_RIGHT.GetModel()->GetAbsPos(pOldEntry)) { if(pOldEntry) @@ -277,11 +277,11 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ ) //------------------------------------------------------------------------------ IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/ ) { - SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); + SvTreeListEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); if(pEntry) { sal_uLong nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); - SvLBoxEntry* pOldEntry = m_CTRL_LEFT.FirstSelected(); + SvTreeListEntry* pOldEntry = m_CTRL_LEFT.FirstSelected(); if(pOldEntry && nPos != m_CTRL_LEFT.GetModel()->GetAbsPos(pOldEntry)) { if(pOldEntry) @@ -312,7 +312,7 @@ IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/ IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton ) { sal_Bool bAll = pButton == &m_pbAll; - SvLBoxEntry* pEntry = m_CTRL_LEFT.First(); + SvTreeListEntry* pEntry = m_CTRL_LEFT.First(); while(pEntry) { m_CTRL_LEFT.SetCheckButtonState( pEntry, bAll ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED); @@ -329,16 +329,16 @@ class OColumnString : public SvLBoxString { sal_Bool m_bReadOnly; public: - OColumnString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr,sal_Bool _RO) + OColumnString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr,sal_Bool _RO) :SvLBoxString(pEntry,nFlags,rStr) ,m_bReadOnly(_RO) { } - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry); }; //------------------------------------------------------------------------ -void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ ) +void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvTreeListEntry* /*pEntry*/ ) { if(m_bReadOnly) { @@ -358,7 +358,7 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, const ResId& rResId ) SetSelectionMode( SINGLE_SELECTION ); } //------------------------------------------------------------------------ -void OColumnTreeBox::InitEntry(SvLBoxEntry* pEntry, const String& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) +void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const String& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) { DBTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind ); SvLBoxString* pString = new OColumnString(pEntry, 0, rStr,sal_False); @@ -366,7 +366,7 @@ void OColumnTreeBox::InitEntry(SvLBoxEntry* pEntry, const String& rStr, const Im pEntry->ReplaceItem( pString, pEntry->ItemCount() - 1 ); } //------------------------------------------------------------------------ -sal_Bool OColumnTreeBox::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) +sal_Bool OColumnTreeBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { if(bSelect) { @@ -386,7 +386,7 @@ void OColumnTreeBox::FillListBox( const ODatabaseExport::TColumnVector& _rList) ODatabaseExport::TColumnVector::const_iterator aEnd = _rList.end(); for(;aIter != aEnd;++aIter) { - SvLBoxEntry* pEntry = InsertEntry((*aIter)->first,0,sal_False,LIST_APPEND,(*aIter)->second); + SvTreeListEntry* pEntry = InsertEntry((*aIter)->first,0,sal_False,LIST_APPEND,(*aIter)->second); SvButtonState eState = !(m_bReadOnly && (*aIter)->second->IsAutoIncrement()) ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED; SetCheckButtonState( pEntry, eState ); } diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 10c0cad4701c..89df41cae188 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -82,7 +82,7 @@ namespace @param _rNewConPos (in/out) the connection pos @param _rNewDescrPos (in/out) the description pos */ - void calcPointsYValue(const OTableWindow* _pWin,SvLBoxEntry* _pEntry,Point& _rNewConPos,Point& _rNewDescrPos) + void calcPointsYValue(const OTableWindow* _pWin,SvTreeListEntry* _pEntry,Point& _rNewConPos,Point& _rNewDescrPos) { const OTableWindowListBox* pListBox = _pWin->GetListBox(); _rNewConPos.Y() = _pWin->GetPosPixel().Y(); @@ -232,8 +232,8 @@ sal_Bool OConnectionLine::RecalcLine() if( !pSourceWin || !pDestWin ) return sal_False; - SvLBoxEntry* pSourceEntry = pSourceWin->GetListBox()->GetEntryFromText( GetData()->GetSourceFieldName() ); - SvLBoxEntry* pDestEntry = pDestWin->GetListBox()->GetEntryFromText( GetData()->GetDestFieldName() ); + SvTreeListEntry* pSourceEntry = pSourceWin->GetListBox()->GetEntryFromText( GetData()->GetSourceFieldName() ); + SvTreeListEntry* pDestEntry = pDestWin->GetListBox()->GetEntryFromText( GetData()->GetDestFieldName() ); ////////////////////////////////////////////////////////////////////// // X-Koordinaten bestimmen diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 022f38668a91..de041132fb80 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -968,8 +968,8 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) pSourceBox->SelectAll(sal_False); pDestBox->SelectAll(sal_False); - SvLBoxEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView(); - SvLBoxEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView(); + SvTreeListEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView(); + SvTreeListEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView(); const ::std::vector<OConnectionLine*>* pLines = pConn->GetConnLineList(); ::std::vector<OConnectionLine*>::const_reverse_iterator aIter = pLines->rbegin(); @@ -977,14 +977,14 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) { if ((*aIter)->IsValid()) { - SvLBoxEntry* pSourceEntry = pSourceBox->GetEntryFromText((*aIter)->GetData()->GetSourceFieldName()); + SvTreeListEntry* pSourceEntry = pSourceBox->GetEntryFromText((*aIter)->GetData()->GetSourceFieldName()); if (pSourceEntry) { pSourceBox->Select(pSourceEntry, sal_True); pSourceBox->MakeVisible(pSourceEntry); } - SvLBoxEntry* pDestEntry = pDestBox->GetEntryFromText((*aIter)->GetData()->GetDestFieldName()); + SvTreeListEntry* pDestEntry = pDestBox->GetEntryFromText((*aIter)->GetData()->GetDestFieldName()); if (pDestEntry) { pDestBox->Select(pDestEntry, sal_True); diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 0bcbb0e0ed48..d07ab1eb3408 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -151,7 +151,7 @@ void OQueryTableWindow::deleteUserData(void*& _pUserData) _pUserData = NULL; } //------------------------------------------------------------------------------ -void OQueryTableWindow::OnEntryDoubleClicked(SvLBoxEntry* pEntry) +void OQueryTableWindow::OnEntryDoubleClicked(SvTreeListEntry* pEntry) { OSL_ENSURE(pEntry != NULL, "OQueryTableWindow::OnEntryDoubleClicked : pEntry darf nicht NULL sein !"); // man koennte das auch abfragen und dann ein return hinsetzen, aber so weist es vielleicht auf Fehler bei Aufrufer hin @@ -182,7 +182,7 @@ sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTa sal_Bool bExists = sal_False; if(xConnection.is()) { - SvLBoxEntry* pEntry = m_pListBox->First(); + SvTreeListEntry* pEntry = m_pListBox->First(); try { Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index 7f6b8921cb0c..247bb68ec375 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -57,7 +57,7 @@ namespace dbaui protected: virtual void KeyInput( const KeyEvent& rEvt ); - virtual void OnEntryDoubleClicked(SvLBoxEntry* pEntry); + virtual void OnEntryDoubleClicked(SvTreeListEntry* pEntry); // wird aus dem DoubleClickHdl der ListBox heraus aufgerufen /** delete the user data with the equal type as created within createUserData @param _pUserData diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index a78a05c22638..27cd818442fb 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -183,7 +183,7 @@ sal_Bool OTableWindow::FillListBox() if (GetData()->IsShowAll()) { - SvLBoxEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ); + SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ); pEntry->SetUserData( createUserData(NULL,false) ); } @@ -205,7 +205,7 @@ sal_Bool OTableWindow::FillListBox() const ::rtl::OUString* pIter = aColumns.getConstArray(); const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; for (; pIter != pEnd; ++pIter) { bool bPrimaryKeyColumn = xPKeyColumns.is() && xPKeyColumns->hasByName( *pIter ); @@ -244,13 +244,13 @@ void OTableWindow::clearListBox() { if ( m_pListBox ) { - SvLBoxEntry* pEntry = m_pListBox->First(); + SvTreeListEntry* pEntry = m_pListBox->First(); while(pEntry) { void* pUserData = pEntry->GetUserData(); deleteUserData(pUserData); - SvLBoxEntry* pNextEntry = m_pListBox->Next(pEntry); + SvTreeListEntry* pNextEntry = m_pListBox->Next(pEntry); m_pListBox->GetModel()->Remove(pEntry); pEntry = pNextEntry; } @@ -563,7 +563,7 @@ void OTableWindow::EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields if ( m_pListBox ) { arrstrFields.reserve(m_pListBox->GetEntryCount()); - SvLBoxEntry* pEntryLoop = m_pListBox->First(); + SvTreeListEntry* pEntryLoop = m_pListBox->First(); while (pEntryLoop) { arrstrFields.push_back(m_pListBox->GetEntryText(pEntryLoop)); @@ -613,7 +613,7 @@ void OTableWindow::Command(const CommandEvent& rEvt) ptWhere = rEvt.GetMousePosPixel(); else { - SvLBoxEntry* pCurrent = m_pListBox->GetCurEntry(); + SvTreeListEntry* pCurrent = m_pListBox->GetCurEntry(); if ( pCurrent ) ptWhere = m_pListBox->GetEntryPosition(pCurrent); else diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 227727bf0020..f6047d901821 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -86,12 +86,12 @@ OTableWindowListBox::~OTableWindowListBox() } //------------------------------------------------------------------------------ -SvLBoxEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText ) +SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText ) { ////////////////////////////////////////////////////////////////////// // Liste durchiterieren SvLBoxTreeList* pTreeList = GetModel(); - SvLBoxEntry* pEntry = pTreeList->First(); + SvTreeListEntry* pEntry = pTreeList->First(); OJoinDesignView* pView = m_pTabWin->getDesignView(); OJoinController& rController = pView->getController(); @@ -174,7 +174,7 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) //------------------------------------------------------------------------------ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) { - SvLBoxEntry* pEntry = GetEntry( m_aMousePos ); + SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) return 0; @@ -191,7 +191,7 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) //------------------------------------------------------------------------------ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ ) { - SvLBoxEntry* pEntry = GetEntry( m_aMousePos ); + SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) return 0; @@ -240,7 +240,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) // hit test m_aMousePos = _rEvt.maPosPixel; Size aOutputSize = GetOutputSizePixel(); - SvLBoxEntry* pEntry = GetEntry( m_aMousePos ); + SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) return DND_ACTION_NONE; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 9bdd3a7f6208..be43be186163 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -141,7 +141,7 @@ namespace dbaui namespace { // ----------------------------------------------------------------------------- - void insertParseTree(SvTreeListBox* _pBox,::connectivity::OSQLParseNode* _pNode,SvLBoxEntry* _pParent = NULL) + void insertParseTree(SvTreeListBox* _pBox,::connectivity::OSQLParseNode* _pNode,SvTreeListEntry* _pParent = NULL) { ::rtl::OUString rString; if (!_pNode->isToken()) @@ -1598,7 +1598,7 @@ struct CommentStrip static ::std::vector< CommentStrip > getComment( const ::rtl::OUString& rQuery ) { ::std::vector< CommentStrip > aRet; - // First a quick search if there is any "--" or "//" or "/*", if not then + // First a quick search if there is any "--" or "//" or "/*", if not then // the whole copying loop is pointless. if (rQuery.indexOfAsciiL( "--", 2, 0) < 0 && rQuery.indexOfAsciiL( "//", 2, 0) < 0 && rQuery.indexOfAsciiL( "/*", 2, 0) < 0) @@ -1667,10 +1667,10 @@ static ::std::vector< CommentStrip > getComment( const ::rtl::OUString& rQuery ) /** Concat/insert comments that were previously obtained with getComment(). - NOTE: The current parser implementation does not preserve newlines, so all - comments are always appended to the entire query, also inline comments - that would need positioning anyway that can't be obtained after - recomposition. This is ugly but at least allows commented queries while + NOTE: The current parser implementation does not preserve newlines, so all + comments are always appended to the entire query, also inline comments + that would need positioning anyway that can't be obtained after + recomposition. This is ugly but at least allows commented queries while preserving the comments _somehow_. */ static ::rtl::OUString concatComment( const ::rtl::OUString& rQuery, const ::std::vector< CommentStrip >& rComments ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 0b6a8df76fde..27ca935f394f 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -662,7 +662,7 @@ void UpdateDialog::CheckListBox::KeyInput(KeyEvent const & event) { //------------------------------------------------------------------------------ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos ) { - SvListEntry *pData = GetEntry( rPos ); + SvTreeListEntry *pData = GetEntry( rPos ); if ( pData ) { diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 3aed96675c01..fa90a38a58bf 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -596,7 +596,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) const ::rtl::OUString* pSourceNames = rSources.getConstArray(); for(int i = 0; i < rSources.getLength(); i++) { - SvLBoxEntry* pEntry = aSelectionLB.InsertEntry(pSourceNames[i]); + SvTreeListEntry* pEntry = aSelectionLB.InsertEntry(pSourceNames[i]); if(pSourceNames[i] == sActiveSource) { aSelectionLB.Select(pEntry); @@ -623,7 +623,7 @@ DBChangeDialog_Impl::~DBChangeDialog_Impl() String DBChangeDialog_Impl::GetCurrentURL()const { String sRet; - SvLBoxEntry* pEntry = aSelectionLB.FirstSelected(); + SvTreeListEntry* pEntry = aSelectionLB.FirstSelected(); if(pEntry) { sRet = aSelectionLB.GetEntryText(pEntry, 0); diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index e559ca678b56..4356533f4890 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -124,7 +124,7 @@ namespace pcr // insert the root Image aRootImage = m_aModelImages.GetImage(RID_SVXIMG_FORMS); - SvLBoxEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage); + SvTreeListEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage); // build the tree m_pInitialSelection = NULL; @@ -162,7 +162,7 @@ namespace pcr OSelectLabelDialog::~OSelectLabelDialog() { // delete the entry datas of the listbox entries - SvLBoxEntry* pLoop = m_aControlTree.First(); + SvTreeListEntry* pLoop = m_aControlTree.First(); while (pLoop) { void* pData = pLoop->GetUserData(); @@ -175,7 +175,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int32 OSelectLabelDialog::InsertEntries(const Reference< XInterface > & _xContainer, SvLBoxEntry* pContainerEntry) + sal_Int32 OSelectLabelDialog::InsertEntries(const Reference< XInterface > & _xContainer, SvTreeListEntry* pContainerEntry) { Reference< XIndexAccess > xContainer(_xContainer, UNO_QUERY); if (!xContainer.is()) @@ -209,7 +209,7 @@ namespace pcr if (xCont.is() && xCont->getCount()) { // yes -> step down Image aFormImage = m_aModelImages.GetImage( RID_SVXIMG_FORM ); - SvLBoxEntry* pCont = m_aControlTree.InsertEntry(sName, aFormImage, aFormImage, pContainerEntry); + SvTreeListEntry* pCont = m_aControlTree.InsertEntry(sName, aFormImage, aFormImage, pContainerEntry); sal_Int32 nContChildren = InsertEntries(xCont, pCont); if (nContChildren) { @@ -236,7 +236,7 @@ namespace pcr makeStringAndClear(); // all requirements met -> insert - SvLBoxEntry* pCurrent = m_aControlTree.InsertEntry(sDisplayName, m_aRequiredControlImage, m_aRequiredControlImage, pContainerEntry); + SvTreeListEntry* pCurrent = m_aControlTree.InsertEntry(sDisplayName, m_aRequiredControlImage, m_aRequiredControlImage, pContainerEntry); pCurrent->SetUserData(new Reference< XPropertySet > (xAsSet)); ++nChildren; @@ -254,7 +254,7 @@ namespace pcr { DBG_ASSERT(pLB == &m_aControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?"); (void)pLB; - SvLBoxEntry* pSelected = m_aControlTree.FirstSelected(); + SvTreeListEntry* pSelected = m_aControlTree.FirstSelected(); void* pData = pSelected ? pSelected->GetUserData() : NULL; if (pData) @@ -279,7 +279,7 @@ namespace pcr { DBG_ASSERT(m_bHaveAssignableControl, "OSelectLabelDialog::OnNoAssignmentClicked"); // search the first assignable entry - SvLBoxEntry* pSearch = m_aControlTree.First(); + SvTreeListEntry* pSearch = m_aControlTree.First(); while (pSearch) { if (pSearch->GetUserData()) diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 314b7c43daed..9b193d645178 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -51,11 +51,11 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; ::rtl::OUString m_sRequiredService; Image m_aRequiredControlImage; - SvLBoxEntry* m_pInitialSelection; + SvTreeListEntry* m_pInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xInitialLabelControl; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSelectedControl; - SvLBoxEntry* m_pLastSelected; + SvTreeListEntry* m_pLastSelected; sal_Bool m_bHaveAssignableControl; public: @@ -65,7 +65,7 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetSelected() const { return m_aNoAssignment.IsChecked() ? ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > () : m_xSelectedControl; } protected: - sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvLBoxEntry* pContainerEntry); + sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry); DECL_LINK(OnEntrySelected, SvTreeListBox*); DECL_LINK(OnNoAssignmentClicked, Button*); diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 8049ec877411..2da9c576864e 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -225,7 +225,7 @@ namespace pcr } // select first entry - SvLBoxEntry* pFirstEntry = aLB_Controls.GetEntry( 0 ); + SvTreeListEntry* pFirstEntry = aLB_Controls.GetEntry( 0 ); if ( pFirstEntry ) aLB_Controls.Select( pFirstEntry ); } @@ -284,7 +284,7 @@ namespace pcr for (sal_uLong i=0; i < nEntryCount; i++) { - SvLBoxEntry* pEntry = aLB_Controls.GetEntry(i); + SvTreeListEntry* pEntry = aLB_Controls.GetEntry(i); for( sal_Int32 j=0; j<aControlModels.getLength(); j++ ) { @@ -326,7 +326,7 @@ namespace pcr } //------------------------------------------------------------------------ - void TabOrderListBox::ModelHasMoved( SvListEntry* _pSource ) + void TabOrderListBox::ModelHasMoved( SvTreeListEntry* _pSource ) { SvTreeListBox::ModelHasMoved( _pSource ); @@ -346,16 +346,16 @@ namespace pcr // move entries if( nRelPos < 0 ) { - SvLBoxEntry* pFirstSelected = FirstSelected(); + SvTreeListEntry* pFirstSelected = FirstSelected(); if( !pFirstSelected ) return; sal_uLong nFirstSelPos = GetModel()->GetAbsPos( pFirstSelected ); if( nFirstSelPos == 0 ) return; - SvLBoxEntry* pSelEntry = pFirstSelected; + SvTreeListEntry* pSelEntry = pFirstSelected; while( pSelEntry ) { sal_uLong nSelEntryPos = GetModel()->GetAbsPos( pSelEntry ); - SvLBoxEntry* pSelEntryPrev = GetEntry( nSelEntryPos-1 ); + SvTreeListEntry* pSelEntryPrev = GetEntry( nSelEntryPos-1 ); aSelEntryPrevText = GetEntryText( pSelEntryPrev ); aImage = GetExpandedEntryBmp(pSelEntryPrev); void* pData = pSelEntryPrev->GetUserData(); @@ -369,7 +369,7 @@ namespace pcr else if( nRelPos > 0 ) { - SvLBoxEntry* pLastSelected = LastSelected(); + SvTreeListEntry* pLastSelected = LastSelected(); if( !pLastSelected ) return; sal_uLong nLastSelPos = GetModel()->GetAbsPos( pLastSelected ); @@ -381,11 +381,11 @@ namespace pcr #endif - SvLBoxEntry* pSelEntry = pLastSelected; + SvTreeListEntry* pSelEntry = pLastSelected; while( pSelEntry ) { sal_uLong nSelEntryPos = GetModel()->GetAbsPos( pSelEntry ); - SvLBoxEntry* pSelEntryNext = GetEntry( nSelEntryPos+1 ); + SvTreeListEntry* pSelEntryNext = GetEntry( nSelEntryPos+1 ); void* pData = pSelEntryNext->GetUserData(); aSelEntryNextText = GetEntryText( pSelEntryNext ); diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 6e3d96925757..58e9b34db0ba 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -51,7 +51,7 @@ namespace pcr void MoveSelection( long nRelPos ); protected: - virtual void ModelHasMoved(SvListEntry* pSource ); + virtual void ModelHasMoved(SvTreeListEntry* pSource ); private: using SvTreeListBox::MoveSelection; diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index ba446451ae11..9a8f703d5453 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -370,7 +370,7 @@ void SaneDlg::InitFields() ); // fill OptionBox maOptionBox.Clear(); - SvLBoxEntry* pParentEntry = 0; + SvTreeListEntry* pParentEntry = 0; sal_Bool bGroupRejected = sal_False; for( i = 1; i < mrSane.CountOptions(); i++ ) { diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 7ecfddecc144..31814cf2534b 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -196,7 +196,7 @@ void XMLFilterSettingsDialog::ShowWindow() void XMLFilterSettingsDialog::updateStates() { - SvLBoxEntry* pSelectedEntry = mpFilterListBox->FirstSelected(); + SvTreeListEntry* pSelectedEntry = mpFilterListBox->FirstSelected(); bool bHasSelection = pSelectedEntry != NULL; @@ -261,7 +261,7 @@ void XMLFilterSettingsDialog::onNew() void XMLFilterSettingsDialog::onEdit() { // get selected filter entry - SvLBoxEntry* pEntry = mpFilterListBox->FirstSelected(); + SvTreeListEntry* pEntry = mpFilterListBox->FirstSelected(); if( pEntry ) { // get its filter info @@ -791,7 +791,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi void XMLFilterSettingsDialog::onTest() { // get the first selected filter - SvLBoxEntry* pEntry = mpFilterListBox->FirstSelected(); + SvTreeListEntry* pEntry = mpFilterListBox->FirstSelected(); if( pEntry ) { filter_info_impl* pInfo = (filter_info_impl*)pEntry->GetUserData(); @@ -805,7 +805,7 @@ void XMLFilterSettingsDialog::onTest() void XMLFilterSettingsDialog::onDelete() { - SvLBoxEntry* pEntry = mpFilterListBox->FirstSelected(); + SvTreeListEntry* pEntry = mpFilterListBox->FirstSelected(); if( pEntry ) { filter_info_impl* pInfo = (filter_info_impl*)pEntry->GetUserData(); @@ -901,7 +901,7 @@ void XMLFilterSettingsDialog::onSave() int nFilters = 0; - SvLBoxEntry* pEntry = mpFilterListBox->FirstSelected(); + SvTreeListEntry* pEntry = mpFilterListBox->FirstSelected(); while( pEntry ) { filter_info_impl* pInfo = (filter_info_impl*)pEntry->GetUserData(); @@ -1243,7 +1243,7 @@ void XMLFilterSettingsDialog::initFilterList() delete pTempFilter; } - SvLBoxEntry* pEntry = mpFilterListBox->GetEntry( 0 ); + SvTreeListEntry* pEntry = mpFilterListBox->GetEntry( 0 ); if( pEntry ) mpFilterListBox->Select( pEntry ); } @@ -1516,7 +1516,7 @@ void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo ) sal_uLong nPos; for( nPos = 0; nPos < nCount; nPos++ ) { - SvLBoxEntry* pEntry = GetEntry( nPos ); + SvTreeListEntry* pEntry = GetEntry( nPos ); if( (filter_info_impl*)pEntry->GetUserData() == pInfo ) { XubString aEntryText( getEntryString( pInfo ) ); diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx index 0682f68d2075..c876ccad7f56 100644 --- a/formula/inc/formula/IFunctionDescription.hxx +++ b/formula/inc/formula/IFunctionDescription.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/sheet/XFormulaParser.hpp> #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp> -class SvLBoxEntry; +class SvTreeListEntry; namespace formula { @@ -115,11 +115,11 @@ namespace formula { public: IStructHelper(){} - virtual SvLBoxEntry* InsertEntry(const XubString& rText, SvLBoxEntry* pParent, + virtual SvTreeListEntry* InsertEntry(const XubString& rText, SvTreeListEntry* pParent, sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) = 0; - virtual String GetEntryText(SvLBoxEntry* pEntry) const = 0; - virtual SvLBoxEntry* GetParent(SvLBoxEntry* pEntry) const = 0; + virtual String GetEntryText(SvTreeListEntry* pEntry) const = 0; + virtual SvTreeListEntry* GetParent(SvTreeListEntry* pEntry) const = 0; protected: ~IStructHelper() {} diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 03f41dc6b914..409059335c30 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -98,7 +98,7 @@ namespace formula xub_StrLen GetFunctionPos(xub_StrLen nPos); void ClearAllParas(); - void MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,FormulaToken* _pToken,long Count); + void MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count); void fillTree(IStructHelper* _pTree); void UpdateTokenArray( const String& rStrExp); String RepairFormula(const String& aFormula); @@ -648,7 +648,7 @@ sal_Bool FormulaDlg_Impl::CalcStruct( const String& rStrExp) } // ----------------------------------------------------------------------------- -void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,FormulaToken* _pToken,long Count) +void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count) { if( _pToken != NULL && Count > 0 ) { @@ -670,7 +670,7 @@ void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,Formul if ( nParas > 0 ) { - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; String aTest=_pTree->GetEntryText(pParent); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 280a7b8c8d7d..dfdaa5f1e108 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -43,12 +43,12 @@ StructListBox::StructListBox(Window* pParent, const ResId& rResId ): SetFont( aFont ); } -SvLBoxEntry* StructListBox::InsertStaticEntry( +SvTreeListEntry* StructListBox::InsertStaticEntry( const XubString& rText, const Image& rEntryImg, - SvLBoxEntry* pParent, sal_uLong nPos, IFormulaToken* pToken ) + SvTreeListEntry* pParent, sal_uLong nPos, IFormulaToken* pToken ) { - SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, sal_False, nPos, pToken ); + SvTreeListEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, sal_False, nPos, pToken ); return pEntry; } @@ -108,12 +108,12 @@ void StructPage::ClearStruct() aTlbStruct.Clear(); } -SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, +SvTreeListEntry* StructPage::InsertEntry( const XubString& rText, SvTreeListEntry* pParent, sal_uInt16 nFlag,sal_uLong nPos,IFormulaToken* pIFormulaToken) { aTlbStruct.SetActiveFlag( sal_False ); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; switch( nFlag ) { case STRUCT_FOLDER: @@ -132,7 +132,7 @@ SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pPare return pEntry; } -String StructPage::GetEntryText(SvLBoxEntry* pEntry) const +String StructPage::GetEntryText(SvTreeListEntry* pEntry) const { String aString; if(pEntry!=NULL) @@ -140,11 +140,11 @@ String StructPage::GetEntryText(SvLBoxEntry* pEntry) const return aString; } -SvLBoxEntry* StructPage::GetParent(SvLBoxEntry* pEntry) const +SvTreeListEntry* StructPage::GetParent(SvTreeListEntry* pEntry) const { return aTlbStruct.GetParent(pEntry); } -IFormulaToken* StructPage::GetFunctionEntry(SvLBoxEntry* pEntry) +IFormulaToken* StructPage::GetFunctionEntry(SvTreeListEntry* pEntry) { if(pEntry!=NULL) { @@ -170,7 +170,7 @@ IMPL_LINK( StructPage, SelectHdl, SvTreeListBox*, pTlb ) { if(pTlb==&aTlbStruct) { - SvLBoxEntry* pCurEntry=aTlbStruct.GetCurEntry(); + SvTreeListEntry* pCurEntry=aTlbStruct.GetCurEntry(); if(pCurEntry!=NULL) { pSelectedToken=(IFormulaToken *)pCurEntry->GetUserData(); diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 151c57e1c088..ec48d27a3510 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -51,10 +51,10 @@ public: StructListBox(Window* pParent, const ResId& rResId ); /** Inserts an entry with static image (no difference between collapsed/expanded). */ - SvLBoxEntry* InsertStaticEntry( + SvTreeListEntry* InsertStaticEntry( const XubString& rText, const Image& rEntryImg, - SvLBoxEntry* pParent = NULL, + SvTreeListEntry* pParent = NULL, sal_uLong nPos = LIST_APPEND, IFormulaToken* pToken = NULL ); @@ -86,18 +86,18 @@ private: protected: - IFormulaToken* GetFunctionEntry(SvLBoxEntry* pEntry); + IFormulaToken* GetFunctionEntry(SvTreeListEntry* pEntry); public: StructPage( Window* pParent); void ClearStruct(); - virtual SvLBoxEntry* InsertEntry(const XubString& rText, SvLBoxEntry* pParent, + virtual SvTreeListEntry* InsertEntry(const XubString& rText, SvTreeListEntry* pParent, sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL); - virtual String GetEntryText(SvLBoxEntry* pEntry) const; - virtual SvLBoxEntry* GetParent(SvLBoxEntry* pEntry) const; + virtual String GetEntryText(SvTreeListEntry* pEntry) const; + virtual SvTreeListEntry* GetParent(SvTreeListEntry* pEntry) const; void SetSelectionHdl( const Link& rLink ) { aSelLink = rLink; } const Link& GetSelectionHdl() const { return aSelLink; } diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index f514296673d0..9c27d948be60 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -144,7 +144,7 @@ void PlacesListBox::RemovePlace( sal_uInt16 nPos ) mbUpdated = true; } maPlaces.erase( maPlaces.begin() + nPos ); - SvLBoxEntry* pEntry = mpImpl->GetEntry( nPos ); + SvTreeListEntry* pEntry = mpImpl->GetEntry( nPos ); mpImpl->RemoveEntry( pEntry ); } } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index f44c4c3f34ce..2eef8ee1b60e 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1523,7 +1523,7 @@ void SvtFileDialog::OpenMultiSelection_Impl() { String aPath; sal_uLong nCount = _pFileView->GetSelectionCount(); - SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL; + SvTreeListEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL; if ( nCount && pEntry ) _aPath = _pFileView->GetURL( pEntry ); @@ -1598,7 +1598,7 @@ void SvtFileDialog::UpdateControls( const String& rURL ) IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox ) { - SvLBoxEntry* pEntry = pBox->FirstSelected(); + SvTreeListEntry* pEntry = pBox->FirstSelected(); DBG_ASSERT( pEntry, "SelectHandler without selected entry" ); SvtContentEntry* pUserData = (SvtContentEntry*)pEntry->GetUserData(); @@ -2458,7 +2458,7 @@ std::vector<rtl::OUString> SvtFileDialog::GetPathList() const { std::vector<rtl::OUString> aList; sal_uLong nCount = _pFileView->GetSelectionCount(); - SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL; + SvTreeListEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL; if ( ! pEntry ) { diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index d57bef7cc600..4cadd0b2aa48 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -88,7 +88,7 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDe { uno::Sequence< beans::PropertyValue > aArgs(GetSelectionCount()); sal_Int32 i = 0; - SvLBoxEntry* pSelected = FirstSelected(); + SvTreeListEntry* pSelected = FirstSelected(); while( pSelected ) { // build a descriptor for the currently selected field @@ -422,7 +422,7 @@ uno::Reference< sdbc::XConnection> OAddFieldWindow::getConnection() const return uno::Reference< sdbc::XConnection>(m_xRowSet->getPropertyValue( PROPERTY_ACTIVECONNECTION ),uno::UNO_QUERY); } // ----------------------------------------------------------------------------- -void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessDescriptor& _rDescriptor) +void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAccessDescriptor& _rDescriptor) { if ( _pSelected && m_xColumns.is() ) { diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 28b7604c6950..7d12616f3ea3 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -144,15 +144,15 @@ class NavigatorTree : public ::cppu::BaseMutex Point m_aTimerTriggered; // die Position, an der der DropTimer angeschaltet wurde DROP_ACTION m_aDropActionType; OReportController& m_rController; - SvLBoxEntry* m_pMasterReport; - SvLBoxEntry* m_pDragedEntry; + SvTreeListEntry* m_pMasterReport; + SvTreeListEntry* m_pDragedEntry; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener; unsigned short m_nTimerCounter; - SvLBoxEntry* insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData); - void traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition = LIST_APPEND); - void traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvLBoxEntry* _pParent); + SvTreeListEntry* insertEntry(const ::rtl::OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData); + void traverseSection(const uno::Reference< report::XSection>& _xSection,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition = LIST_APPEND); + void traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent); NavigatorTree(const NavigatorTree&); void operator =(const NavigatorTree&); @@ -200,8 +200,8 @@ public: virtual void traverseDetail(const uno::Reference< report::XSection>& _xSection); - SvLBoxEntry* find(const uno::Reference< uno::XInterface >& _xContent); - void removeEntry(SvLBoxEntry* _pEntry,bool _bRemove = true); + SvTreeListEntry* find(const uno::Reference< uno::XInterface >& _xContent); + void removeEntry(SvTreeListEntry* _pEntry,bool _bRemove = true); private: using SvTreeListBox::ExecuteDrop; }; @@ -248,7 +248,7 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) // ----------------------------------------------------------------------------- NavigatorTree::~NavigatorTree() { - SvLBoxEntry* pCurrent = First(); + SvTreeListEntry* pCurrent = First(); while ( pCurrent ) { delete static_cast<UserData*>(pCurrent->GetUserData()); @@ -267,7 +267,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) case COMMAND_CONTEXTMENU: { // die Stelle, an der geklickt wurde - SvLBoxEntry* ptClickedOn = NULL; + SvTreeListEntry* ptClickedOn = NULL; ::Point aWhere; if (rEvt.IsMouseEvent()) { @@ -368,7 +368,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) } else { - SvLBoxEntry* pDropppedOn = GetEntry(aDropPos); + SvTreeListEntry* pDropppedOn = GetEntry(aDropPos); if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn)) { m_aDropActionType = DA_EXPANDNODE; @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) { case DA_EXPANDNODE: { - SvLBoxEntry* pToExpand = GetEntry(m_aTimerTriggered); + SvTreeListEntry* pToExpand = GetEntry(m_aTimerTriggered); if (pToExpand && (GetChildCount(pToExpand) > 0) && !IsExpanded(pToExpand)) // tja, eigentlich muesste ich noch testen, ob die Node nicht schon expandiert ist, aber ich // habe dazu weder in den Basisklassen noch im Model eine Methode gefunden ... @@ -452,7 +452,7 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) if ( !m_pSelectionListener->locked() ) { m_pSelectionListener->lock(); - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); uno::Any aSelection; if ( IsSelected(pEntry) ) aSelection <<= static_cast<UserData*>(pEntry->GetUserData())->getContent(); @@ -473,7 +473,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( if ( !aSelection.getLength() ) { uno::Reference< uno::XInterface> xSelection(aSec,uno::UNO_QUERY); - SvLBoxEntry* pEntry = find(xSelection); + SvTreeListEntry* pEntry = find(xSelection); if ( pEntry && !IsSelected(pEntry) ) { Select(pEntry, sal_True); @@ -488,7 +488,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( const uno::Reference< report::XReportComponent >* pEnd = pIter + aSelection.getLength(); for (; pIter != pEnd; ++pIter) { - SvLBoxEntry* pEntry = find(*pIter); + SvTreeListEntry* pEntry = find(*pIter); if ( pEntry && !IsSelected(pEntry) ) { Select(pEntry, sal_True); @@ -499,9 +499,9 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( m_pSelectionListener->unlock(); } // ----------------------------------------------------------------------------- -SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) +SvTreeListEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( _nImageId ) { const Image aImage( m_aNavigatorImages.GetImage( _nImageId ) ); @@ -512,9 +512,9 @@ SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntr return pEntry; } // ----------------------------------------------------------------------------- -void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition) +void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xSection,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition) { - SvLBoxEntry* pSection = insertEntry(_xSection->getName(),_pParent,_nImageId,_nPosition,new UserData(this,_xSection)); + SvTreeListEntry* pSection = insertEntry(_xSection->getName(),_pParent,_nImageId,_nPosition,new UserData(this,_xSection)); const sal_Int32 nCount = _xSection->getCount(); for (sal_Int32 i = 0; i < nCount; ++i) { @@ -531,9 +531,9 @@ void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xS } } // ----------------------------------------------------------------------------- -void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvLBoxEntry* _pParent) +void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent) { - SvLBoxEntry* pFunctions = insertEntry(String(ModuleRes(RID_STR_FUNCTIONS)),_pParent,SID_RPT_NEW_FUNCTION,LIST_APPEND,new UserData(this,_xFunctions)); + SvTreeListEntry* pFunctions = insertEntry(String(ModuleRes(RID_STR_FUNCTIONS)),_pParent,SID_RPT_NEW_FUNCTION,LIST_APPEND,new UserData(this,_xFunctions)); const sal_Int32 nCount = _xFunctions->getCount(); for (sal_Int32 i = 0; i< nCount; ++i) { @@ -542,12 +542,12 @@ void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& } } // ----------------------------------------------------------------------------- -SvLBoxEntry* NavigatorTree::find(const uno::Reference< uno::XInterface >& _xContent) +SvTreeListEntry* NavigatorTree::find(const uno::Reference< uno::XInterface >& _xContent) { - SvLBoxEntry* pRet = NULL; + SvTreeListEntry* pRet = NULL; if ( _xContent.is() ) { - SvLBoxEntry* pCurrent = First(); + SvTreeListEntry* pCurrent = First(); while ( pCurrent ) { UserData* pData = static_cast<UserData*>(pCurrent->GetUserData()); @@ -572,64 +572,64 @@ void NavigatorTree::traverseReport(const uno::Reference< report::XReportDefiniti // ----------------------------------------------------------------------------- void NavigatorTree::traverseReportFunctions(const uno::Reference< report::XFunctions>& _xFunctions) { - SvLBoxEntry* pReport = find(_xFunctions->getParent()); + SvTreeListEntry* pReport = find(_xFunctions->getParent()); traverseFunctions(_xFunctions,pReport); } // ----------------------------------------------------------------------------- void NavigatorTree::traverseReportHeader(const uno::Reference< report::XSection>& _xSection) { - SvLBoxEntry* pReport = find(_xSection->getReportDefinition()); + SvTreeListEntry* pReport = find(_xSection->getReportDefinition()); traverseSection(_xSection,pReport,SID_REPORTHEADERFOOTER); } // ----------------------------------------------------------------------------- void NavigatorTree::traverseReportFooter(const uno::Reference< report::XSection>& _xSection) { - SvLBoxEntry* pReport = find(_xSection->getReportDefinition()); + SvTreeListEntry* pReport = find(_xSection->getReportDefinition()); traverseSection(_xSection,pReport,SID_REPORTHEADERFOOTER); } // ----------------------------------------------------------------------------- void NavigatorTree::traversePageHeader(const uno::Reference< report::XSection>& _xSection) { - SvLBoxEntry* pReport = find(_xSection->getReportDefinition()); + SvTreeListEntry* pReport = find(_xSection->getReportDefinition()); traverseSection(_xSection,pReport,SID_PAGEHEADERFOOTER); } // ----------------------------------------------------------------------------- void NavigatorTree::traversePageFooter(const uno::Reference< report::XSection>& _xSection) { - SvLBoxEntry* pReport = find(_xSection->getReportDefinition()); + SvTreeListEntry* pReport = find(_xSection->getReportDefinition()); traverseSection(_xSection,pReport,SID_PAGEHEADERFOOTER); } // ----------------------------------------------------------------------------- void NavigatorTree::traverseGroups(const uno::Reference< report::XGroups>& _xGroups) { - SvLBoxEntry* pReport = find(_xGroups->getReportDefinition()); + SvTreeListEntry* pReport = find(_xGroups->getReportDefinition()); insertEntry(String(ModuleRes(RID_STR_GROUPS)),pReport,SID_SORTINGANDGROUPING,LIST_APPEND,new UserData(this,_xGroups)); } // ----------------------------------------------------------------------------- void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup) { uno::Reference< report::XGroups> xGroups(_xGroup->getParent(),uno::UNO_QUERY); - SvLBoxEntry* pGroups = find(xGroups); + SvTreeListEntry* pGroups = find(xGroups); OSL_ENSURE(pGroups,"No Groups inserted so far. Why!"); insertEntry(_xGroup->getExpression(),pGroups,SID_GROUP,rptui::getPositionInIndexAccess(xGroups.get(),_xGroup),new UserData(this,_xGroup)); } // ----------------------------------------------------------------------------- void NavigatorTree::traverseGroupFunctions(const uno::Reference< report::XFunctions>& _xFunctions) { - SvLBoxEntry* pGroup = find(_xFunctions->getParent()); + SvTreeListEntry* pGroup = find(_xFunctions->getParent()); traverseFunctions(_xFunctions,pGroup); } // ----------------------------------------------------------------------------- void NavigatorTree::traverseGroupHeader(const uno::Reference< report::XSection>& _xSection) { - SvLBoxEntry* pGroup = find(_xSection->getGroup()); + SvTreeListEntry* pGroup = find(_xSection->getGroup()); OSL_ENSURE(pGroup,"No group found"); traverseSection(_xSection,pGroup,SID_GROUPHEADER,1); } // ----------------------------------------------------------------------------- void NavigatorTree::traverseGroupFooter(const uno::Reference< report::XSection>& _xSection) { - SvLBoxEntry* pGroup = find(_xSection->getGroup()); + SvTreeListEntry* pGroup = find(_xSection->getGroup()); OSL_ENSURE(pGroup,"No group found"); traverseSection(_xSection,pGroup,SID_GROUPFOOTER); } @@ -637,7 +637,7 @@ void NavigatorTree::traverseGroupFooter(const uno::Reference< report::XSection>& void NavigatorTree::traverseDetail(const uno::Reference< report::XSection>& _xSection) { uno::Reference< report::XReportDefinition> xReport = _xSection->getReportDefinition(); - SvLBoxEntry* pParent = find(xReport); + SvTreeListEntry* pParent = find(xReport); traverseSection(_xSection,pParent,SID_ICON_DETAIL); } // ----------------------------------------------------------------------------- @@ -650,7 +650,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) _rEvent.NewValue >>= bEnabled; if ( bEnabled ) { - SvLBoxEntry* pParent = find(xReport); + SvTreeListEntry* pParent = find(xReport); if ( _rEvent.PropertyName == PROPERTY_REPORTHEADERON ) { sal_uLong nPos = xReport->getReportHeaderOn() ? 2 : 1; @@ -673,7 +673,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) // ----------------------------------------------------------------------------- void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) { - SvLBoxEntry* pEntry = find(_rEvent.Source); + SvTreeListEntry* pEntry = find(_rEvent.Source); uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY_THROW); ::rtl::OUString sName; uno::Reference< beans::XPropertySetInfo> xInfo = xProp->getPropertySetInfo(); @@ -704,12 +704,12 @@ void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) void NavigatorTree::_elementRemoved( const container::ContainerEvent& _rEvent ) { uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY); - SvLBoxEntry* pEntry = find(xProp); + SvTreeListEntry* pEntry = find(xProp); OSL_ENSURE(pEntry,"NavigatorTree::_elementRemoved: No Entry found!"); if ( pEntry ) { - SvLBoxEntry* pParent = GetParent(pEntry); + SvTreeListEntry* pParent = GetParent(pEntry); removeEntry(pEntry); PaintEntry(pParent); } @@ -718,7 +718,7 @@ void NavigatorTree::_elementRemoved( const container::ContainerEvent& _rEvent ) void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent ) { uno::Reference<beans::XPropertySet> xProp(_rEvent.ReplacedElement,uno::UNO_QUERY); - SvLBoxEntry* pEntry = find(xProp); + SvTreeListEntry* pEntry = find(xProp); if ( pEntry ) { UserData* pData = static_cast<UserData*>(pEntry->GetUserData()); @@ -735,11 +735,11 @@ void NavigatorTree::_disposing(const lang::EventObject& _rSource)throw( uno::Run removeEntry(find(_rSource.Source)); } // ----------------------------------------------------------------------------- -void NavigatorTree::removeEntry(SvLBoxEntry* _pEntry,bool _bRemove) +void NavigatorTree::removeEntry(SvTreeListEntry* _pEntry,bool _bRemove) { if ( _pEntry ) { - SvLBoxEntry* pChild = FirstChild(_pEntry); + SvTreeListEntry* pChild = FirstChild(_pEntry); while( pChild ) { removeEntry(pChild,false); @@ -799,7 +799,7 @@ NavigatorTree::UserData::~UserData() // OPropertyChangeListener void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) { - SvLBoxEntry* pEntry = m_pTree->find(_rEvent.Source); + SvTreeListEntry* pEntry = m_pTree->find(_rEvent.Source); OSL_ENSURE(pEntry,"No entry could be found! Why not!"); const bool bFooterOn = (PROPERTY_FOOTERON == _rEvent.PropertyName); try diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index bcbb8446364a..fbaa6179833d 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -116,7 +116,7 @@ public: * \param _pSelected the currently selected * \param _rDescriptor the descriptor will be filled */ - void fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessDescriptor& _rDescriptor); + void fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAccessDescriptor& _rDescriptor); private: // FmXChangeListener diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index dc5bb8b3d6fe..6b3a48ed0dab 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -87,8 +87,8 @@ void ScCondFormatManagerWindow::Init() for(ScConditionalFormatList::iterator itr = mpFormatList->begin(); itr != mpFormatList->end(); ++itr) { - SvLBoxEntry* pEntry = InsertEntryToColumn( createEntryString(*itr), LIST_APPEND, 0xffff ); - maMapLBoxEntryToCondIndex.insert(std::pair<SvLBoxEntry*,sal_Int32>(pEntry,itr->GetKey())); + SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(*itr), LIST_APPEND, 0xffff ); + maMapLBoxEntryToCondIndex.insert(std::pair<SvTreeListEntry*,sal_Int32>(pEntry,itr->GetKey())); } SetUpdateMode(true); } @@ -97,7 +97,7 @@ void ScCondFormatManagerWindow::DeleteSelection() { if(GetSelectionCount()) { - for(SvLBoxEntry* pEntry = FirstSelected(); pEntry != NULL; pEntry = NextSelected(pEntry)) + for(SvTreeListEntry* pEntry = FirstSelected(); pEntry != NULL; pEntry = NextSelected(pEntry)) { sal_Int32 nIndex = maMapLBoxEntryToCondIndex.find(pEntry)->second; mpFormatList->erase(nIndex); @@ -108,7 +108,7 @@ void ScCondFormatManagerWindow::DeleteSelection() ScConditionalFormat* ScCondFormatManagerWindow::GetSelection() { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if(!pEntry) return NULL; diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index ea24d6c5f039..7ddb18e3a1af 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -406,7 +406,7 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) { if ( ((SvxCheckListBox*)pLb) == &aLbColumns ) { - SvLBoxEntry* pEntry = aLbColumns.GetHdlEntry(); + SvTreeListEntry* pEntry = aLbColumns.GetHdlEntry(); if ( pEntry ) { diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 385c969f2ad6..fd2ed6bdf159 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -181,31 +181,31 @@ protected: rtl::OUString* MakeTypeString(ScChangeActionType eType); - SvLBoxEntry* InsertChangeAction( + SvTreeListEntry* InsertChangeAction( const ScChangeAction* pScChangeAction,ScChangeActionState eState, - SvLBoxEntry* pParent=NULL,bool bDelMaster = false, + SvTreeListEntry* pParent=NULL,bool bDelMaster = false, bool bDisabled = false,sal_uLong nPos = LIST_APPEND); - SvLBoxEntry* InsertFilteredAction( + SvTreeListEntry* InsertFilteredAction( const ScChangeAction* pScChangeAction,ScChangeActionState eState, - SvLBoxEntry* pParent = NULL,bool bDelMaster = false, + SvTreeListEntry* pParent = NULL,bool bDelMaster = false, bool bDisabled = false, sal_uLong nPos = LIST_APPEND); - SvLBoxEntry* InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, - SvLBoxEntry* pParent,sal_uLong nSpecial); + SvTreeListEntry* InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, + SvTreeListEntry* pParent,sal_uLong nSpecial); void GetDependents( const ScChangeAction* pScChangeAction, ScChangeActionMap& aActionMap, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); - bool InsertContentChildren( ScChangeActionMap* pActionMap, SvLBoxEntry* pParent ); + bool InsertContentChildren( ScChangeActionMap* pActionMap, SvTreeListEntry* pParent ); - bool InsertAcceptedORejected(SvLBoxEntry* pParent); + bool InsertAcceptedORejected(SvTreeListEntry* pParent); bool InsertDeletedChildren( const ScChangeAction* pChangeAction, ScChangeActionMap* pActionMap, - SvLBoxEntry* pParent); + SvTreeListEntry* pParent); - bool InsertChildren( ScChangeActionMap* pActionMap, SvLBoxEntry* pParent ); + bool InsertChildren( ScChangeActionMap* pActionMap, SvTreeListEntry* pParent ); void AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction, sal_uLong nPos=LIST_APPEND); @@ -217,7 +217,7 @@ protected: void ClearView(); bool Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction, - SvLBoxEntry* pEntry, bool bFilter = false); + SvTreeListEntry* pEntry, bool bFilter = false); public: ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 5b0d1e8a9f82..cb41d20b0900 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -51,7 +51,7 @@ private: ScDocument* mpDoc; ScConditionalFormatList* mpFormatList; const ScAddress& mrPos; - std::map<SvLBoxEntry*, sal_Int32> maMapLBoxEntryToCondIndex; + std::map<SvTreeListEntry*, sal_Int32> maMapLBoxEntryToCondIndex; DECL_LINK( HeaderEndDragHdl, void* ); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index b2b3739c355e..00c050c1c45a 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -178,7 +178,7 @@ private: String GetActionString( const ScChangeAction* pAction, ScDocument* pDoc ); void HandleListBoxSelection( bool bSelectHandle ); - void SetConflictAction( SvLBoxEntry* pRootEntry, ScConflictAction eConflictAction ); + void SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction ); void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index f6f757fc783f..08722981ddee 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -56,7 +56,7 @@ class ScContentTree : public SvTreeListBox { ScNavigatorDlg* pParentWindow; ImageList aEntryImages; - SvLBoxEntry* pRootNodes[SC_CONTENT_COUNT]; + SvTreeListEntry* pRootNodes[SC_CONTENT_COUNT]; sal_uInt16 nRootType; // set as Root String aManualDoc; // Switched in Navigator (Title) sal_Bool bHiddenDoc; // Hidden active? @@ -97,12 +97,12 @@ class ScContentTree : public SvTreeListBox @param rnRootIndex Root index of specified entry is returned. @param rnChildIndex Index of the entry inside its root is returned (or SC_CONTENT_NOCHILD if entry is root). @param pEntry The entry to examine. */ - void GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvLBoxEntry* pEntry ) const; + void GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvTreeListEntry* pEntry ) const; /** Returns the child index of the specified listbox entry. @param pEntry The entry to examine or NULL for the selected entry. @return Index of the entry inside its root or SC_CONTENT_NOCHILD if entry is root. */ - sal_uLong GetChildIndex( SvLBoxEntry* pEntry ) const; + sal_uLong GetChildIndex( SvTreeListEntry* pEntry ) const; void DoDrag(); diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index 3646164a7d5e..f4c37c89ce59 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -71,10 +71,10 @@ private: // for performance, save which entries already have the formula entry // otherwise opening the dialog with a lot of range names is extremelly slow because // we would calculate all formula strings during opening - std::map<SvLBoxEntry*, bool> maCalculatedFormulaEntries; + std::map<SvTreeListEntry*, bool> maCalculatedFormulaEntries; const ScAddress maPos; - void GetLine(ScRangeNameLine& aLine, SvLBoxEntry* pEntry); + void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry); void Init(); void CheckForFormulaString(); const ScRangeData* findRangeData(const ScRangeNameLine& rLine); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 326e80f7f8fa..dfc0f93ec620 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -178,7 +178,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP aAcceptChgCtr.SetMinSizeHdl( LINK( this, ScAcceptChgDlg, MinSizeHandle )); UpdateView(); - SvLBoxEntry* pEntry=pTheView->First(); + SvTreeListEntry* pEntry=pTheView->First(); if(pEntry!=NULL) { pTheView->Select(pEntry); @@ -376,15 +376,15 @@ bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) return bFlag; } -SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction( +SvTreeListEntry* ScAcceptChgDlg::InsertChangeAction( const ScChangeAction* pScChangeAction, ScChangeActionState /*eState*/, - SvLBoxEntry* pParent, bool bDelMaster,bool bDisabled, sal_uLong nPos) + SvTreeListEntry* pParent, bool bDelMaster,bool bDisabled, sal_uLong nPos) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); if(pScChangeAction==NULL || pChanges==NULL) return NULL; - SvLBoxEntry* pEntry=NULL; + SvTreeListEntry* pEntry=NULL; bool bFlag = false; @@ -509,11 +509,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction( { pEntry = pTheView->InsertEntry( aBuf.makeStringAndClear(), pNewData, Color(COL_GREEN), pParent, nPos); - SvLBoxEntry* pExpEntry=pParent; + SvTreeListEntry* pExpEntry=pParent; while(pExpEntry!=NULL && !pTheView->IsExpanded(pExpEntry)) { - SvLBoxEntry* pTmpEntry=pTheView->GetParent(pExpEntry); + SvTreeListEntry* pTmpEntry=pTheView->GetParent(pExpEntry); if(pTmpEntry!=NULL) pTheView->Expand(pExpEntry); @@ -528,9 +528,9 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction( return pEntry; } -SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction( +SvTreeListEntry* ScAcceptChgDlg::InsertFilteredAction( const ScChangeAction* pScChangeAction, ScChangeActionState eState, - SvLBoxEntry* pParent, bool bDelMaster, bool bDisabled, sal_uLong nPos) + SvTreeListEntry* pParent, bool bDelMaster, bool bDisabled, sal_uLong nPos) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -539,7 +539,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction( bool bIsGenerated = pChanges->IsGenerated(pScChangeAction->GetActionNumber()); - SvLBoxEntry* pEntry=NULL; + SvTreeListEntry* pEntry=NULL; bool bFlag = false; @@ -654,11 +654,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction( return pEntry; } -SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, - SvLBoxEntry* pParent, sal_uLong nSpecial) +SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, + SvTreeListEntry* pParent, sal_uLong nSpecial) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); - SvLBoxEntry* pEntry=NULL; + SvTreeListEntry* pEntry=NULL; if(pScChangeAction==NULL || pChanges==NULL) return NULL; @@ -799,7 +799,7 @@ long ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt ) void ScAcceptChgDlg::UpdateView() { bNeedsUpdate=false; - SvLBoxEntry* pParent=NULL; + SvTreeListEntry* pParent=NULL; ScChangeTrack* pChanges=NULL; const ScChangeAction* pScChangeAction=NULL; bAcceptEnableFlag=true; @@ -878,19 +878,19 @@ void ScAcceptChgDlg::UpdateView() { pParent=pTheView->InsertEntry( aStrAllAccepted, static_cast< RedlinData * >(NULL), - static_cast< SvLBoxEntry * >(NULL)); + static_cast< SvTreeListEntry * >(NULL)); pParent->EnableChildrenOnDemand(true); } if(nRejectCount>0) { pParent=pTheView->InsertEntry( aStrAllRejected, static_cast< RedlinData * >(NULL), - static_cast< SvLBoxEntry * >(NULL)); + static_cast< SvTreeListEntry * >(NULL)); pParent->EnableChildrenOnDemand(true); } pTheView->SetUpdateMode(true); SetPointer(Pointer(POINTER_ARROW)); - SvLBoxEntry* pEntry=pTheView->First(); + SvTreeListEntry* pEntry=pTheView->First(); if(pEntry!=NULL) pTheView->Select(pEntry); } @@ -998,7 +998,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef ) if(pRef!=NULL) { - SvLBoxEntry* pEntry=pTheView->FirstSelected(); + SvTreeListEntry* pEntry=pTheView->FirstSelected(); while(pEntry!=NULL) { ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData()); @@ -1035,7 +1035,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef ) bIgnoreMsg=true; if(pRef!=NULL) { - SvLBoxEntry* pEntry=pTheView->FirstSelected(); + SvTreeListEntry* pEntry=pTheView->FirstSelected(); while(pEntry!=NULL) { ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData()); @@ -1172,11 +1172,11 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle) void ScAcceptChgDlg::GetDependents( const ScChangeAction* pScChangeAction, ScChangeActionMap& aActionMap, - SvLBoxEntry* pEntry) + SvTreeListEntry* pEntry) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); - SvLBoxEntry* pParent=pTheView->GetParent(pEntry); + SvTreeListEntry* pParent=pTheView->GetParent(pEntry); if(pParent!=NULL) { ScRedlinData *pParentData=(ScRedlinData *)(pParent->GetUserData()); @@ -1194,7 +1194,7 @@ void ScAcceptChgDlg::GetDependents( const ScChangeAction* pScChangeAction, aActionMap, pScChangeAction->IsMasterDelete() ); } -bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvLBoxEntry* pParent) +bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvTreeListEntry* pParent) { bool bTheTestFlag = true; ScRedlinData *pEntryData=(ScRedlinData *)(pParent->GetUserData()); @@ -1212,7 +1212,7 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvLBoxE const_cast<ScChangeAction*>( pScChangeAction ) ) ); bParentInserted = true; } - SvLBoxEntry* pEntry=NULL; + SvTreeListEntry* pEntry=NULL; ScChangeActionMap::iterator itChangeAction = pActionMap->begin(); while( itChangeAction != pActionMap->end() ) @@ -1225,7 +1225,7 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvLBoxE if( itChangeAction == pActionMap->end() ) return true; - SvLBoxEntry* pOriginal = InsertChangeActionContent( + SvTreeListEntry* pOriginal = InsertChangeActionContent( dynamic_cast<const ScChangeActionContent*>( itChangeAction->second ), pParent, RD_SPECIAL_CONTENT ); @@ -1273,7 +1273,7 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvLBoxE } -bool ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent) +bool ScAcceptChgDlg::InsertAcceptedORejected(SvTreeListEntry* pParent) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); bool bTheTestFlag = true; @@ -1301,11 +1301,11 @@ bool ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent) return bTheTestFlag; } -bool ScAcceptChgDlg::InsertChildren(ScChangeActionMap* pActionMap,SvLBoxEntry* pParent) +bool ScAcceptChgDlg::InsertChildren(ScChangeActionMap* pActionMap,SvTreeListEntry* pParent) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); bool bTheTestFlag = true; - SvLBoxEntry* pEntry=NULL; + SvTreeListEntry* pEntry=NULL; ScChangeActionMap::iterator itChangeAction; for( itChangeAction = pActionMap->begin(); itChangeAction != pActionMap->end(); ++itChangeAction ) @@ -1329,11 +1329,11 @@ bool ScAcceptChgDlg::InsertChildren(ScChangeActionMap* pActionMap,SvLBoxEntry* p } bool ScAcceptChgDlg::InsertDeletedChildren(const ScChangeAction* pScChangeAction, - ScChangeActionMap* pActionMap,SvLBoxEntry* pParent) + ScChangeActionMap* pActionMap,SvTreeListEntry* pParent) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); bool bTheTestFlag = true; - SvLBoxEntry* pEntry=NULL; + SvTreeListEntry* pEntry=NULL; ScChangeActionMap::iterator itChangeAction; for( itChangeAction = pActionMap->begin(); itChangeAction != pActionMap->end(); ++itChangeAction ) @@ -1362,7 +1362,7 @@ bool ScAcceptChgDlg::InsertDeletedChildren(const ScChangeAction* pScChangeAction bool ScAcceptChgDlg::Expand( ScChangeTrack* pChanges, const ScChangeAction* pScChangeAction, - SvLBoxEntry* pEntry, bool bFilter) + SvTreeListEntry* pEntry, bool bFilter) { bool bTheTestFlag = true; @@ -1408,7 +1408,7 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable ) if(pTable!=NULL && pChanges!=NULL) { ScChangeActionMap aActionMap; - SvLBoxEntry* pEntry=pTheView->GetHdlEntry(); + SvTreeListEntry* pEntry=pTheView->GetHdlEntry(); if(pEntry!=NULL) { ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData()); @@ -1469,7 +1469,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartActio { if(pChanges!=NULL) { - SvLBoxEntry* pParent=NULL; + SvTreeListEntry* pParent=NULL; const ScChangeAction* pScChangeAction=NULL; bAcceptEnableFlag=true; bRejectEnableFlag=true; @@ -1551,7 +1551,7 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction) pTheView->SetUpdateMode(false); - SvLBoxEntry* pEntry=pTheView->GetCurEntry(); + SvTreeListEntry* pEntry=pTheView->GetCurEntry(); ScRedlinData *pEntryData=NULL; @@ -1581,7 +1581,7 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction) } - SvLBoxEntry* pPrevEntry = pTheView->Prev(pEntry); + SvTreeListEntry* pPrevEntry = pTheView->Prev(pEntry); if(bRemove) pTheView->RemoveEntry(pEntry); @@ -1600,9 +1600,9 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, sal_uLong nStartActi bool bRemove = false; - SvLBoxEntry* pEntry=pTheView->First(); - SvLBoxEntry* pNextEntry = (pEntry ? pTheView->NextSibling(pEntry) : NULL); - SvLBoxEntry* pLastEntry=NULL; + SvTreeListEntry* pEntry=pTheView->First(); + SvTreeListEntry* pNextEntry = (pEntry ? pTheView->NextSibling(pEntry) : NULL); + SvTreeListEntry* pLastEntry=NULL; while(pEntry!=NULL) { bRemove=false; @@ -1712,7 +1712,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl) bool bContMark = false; pTabView->DoneBlockMode(); // clears old marking - SvLBoxEntry* pEntry = pTheView->FirstSelected(); + SvTreeListEntry* pEntry = pTheView->FirstSelected(); while( pEntry ) { ScRedlinData* pEntryData = (ScRedlinData*) pEntry->GetUserData(); @@ -1764,7 +1764,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl) aPopup.SetMenuFlags(MENU_FLAG_HIDEDISABLEDENTRIES); - SvLBoxEntry* pEntry=pTheView->GetCurEntry(); + SvTreeListEntry* pEntry=pTheView->GetCurEntry(); if(pEntry!=NULL) { pTheView->Select(pEntry); @@ -1944,8 +1944,8 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData ) if(pSortData) { - SvLBoxEntry* pLeft = (SvLBoxEntry*)(pSortData->pLeft ); - SvLBoxEntry* pRight = (SvLBoxEntry*)(pSortData->pRight ); + SvTreeListEntry* pLeft = (SvTreeListEntry*)(pSortData->pLeft ); + SvTreeListEntry* pRight = (SvTreeListEntry*)(pSortData->pRight ); if(CALC_DATE==nSortCol) { diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 58d20e24611f..ada696d07441 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -460,7 +460,7 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume UpdateView(); - SvLBoxEntry* pEntry = maLbConflicts.First(); + SvTreeListEntry* pEntry = maLbConflicts.First(); if ( pEntry != NULL ) { maLbConflicts.Select( pEntry ); @@ -519,7 +519,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) { - SvLBoxEntry* pSelEntry = maLbConflicts.GetCurEntry(); + SvTreeListEntry* pSelEntry = maLbConflicts.GetCurEntry(); if ( !pSelEntry ) { pSelEntry = maLbConflicts.FirstSelected(); @@ -529,7 +529,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) return; } - SvLBoxEntry* pRootEntry = maLbConflicts.GetRootLevelParent( pSelEntry ); + SvTreeListEntry* pRootEntry = maLbConflicts.GetRootLevelParent( pSelEntry ); if ( pRootEntry ) { if ( bSelectHandle ) @@ -540,7 +540,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) { maLbConflicts.Select( pRootEntry ); } - SvLBoxEntry* pEntry = maLbConflicts.FirstChild( pRootEntry ); + SvTreeListEntry* pEntry = maLbConflicts.FirstChild( pRootEntry ); while ( pEntry ) { if ( !maLbConflicts.IsSelected( pEntry ) ) @@ -591,7 +591,7 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl) ScTabView* pTabView = mpViewData->GetView(); pTabView->DoneBlockMode(); sal_Bool bContMark = false; - SvLBoxEntry* pEntry = maLbConflicts.FirstSelected(); + SvTreeListEntry* pEntry = maLbConflicts.FirstSelected(); while ( pEntry ) { if ( pEntry != maLbConflicts.GetRootLevelParent( pEntry ) ) @@ -619,7 +619,7 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl) return 0; } -void ScConflictsDlg::SetConflictAction( SvLBoxEntry* pRootEntry, ScConflictAction eConflictAction ) +void ScConflictsDlg::SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction ) { RedlinData* pUserData = static_cast< RedlinData* >( pRootEntry ? pRootEntry->GetUserData() : NULL ); ScConflictsListEntry* pConflictEntry = static_cast< ScConflictsListEntry* >( pUserData ? pUserData->pData : NULL ); @@ -631,8 +631,8 @@ void ScConflictsDlg::SetConflictAction( SvLBoxEntry* pRootEntry, ScConflictActio void ScConflictsDlg::KeepHandler( bool bMine ) { - SvLBoxEntry* pEntry = maLbConflicts.FirstSelected(); - SvLBoxEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL ); + SvTreeListEntry* pEntry = maLbConflicts.FirstSelected(); + SvTreeListEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL ); if ( !pRootEntry ) { return; @@ -650,8 +650,8 @@ void ScConflictsDlg::KeepHandler( bool bMine ) void ScConflictsDlg::KeepAllHandler( bool bMine ) { - SvLBoxEntry* pEntry = maLbConflicts.First(); - SvLBoxEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL ); + SvTreeListEntry* pEntry = maLbConflicts.First(); + SvTreeListEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL ); if ( !pRootEntry ) { return; @@ -770,7 +770,7 @@ void ScConflictsDlg::UpdateView() { RedlinData* pRootUserData = new RedlinData(); pRootUserData->pData = static_cast< void* >( pConflictEntry ); - SvLBoxEntry* pRootEntry = maLbConflicts.InsertEntry( GetConflictString( *aItr ), pRootUserData ); + SvTreeListEntry* pRootEntry = maLbConflicts.InsertEntry( GetConflictString( *aItr ), pRootUserData ); ScChangeActionList::const_iterator aEndShared = aItr->maSharedActions.end(); for ( ScChangeActionList::const_iterator aItrShared = aItr->maSharedActions.begin(); aItrShared != aEndShared; ++aItrShared ) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 4465052cbb9f..5dba814170ec 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -72,7 +72,7 @@ class ScSolverOptionsString : public SvLBoxString sal_Int32 mnIntValue; public: - ScSolverOptionsString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : + ScSolverOptionsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ), mbIsDouble( false ), mfDoubleValue( 0.0 ), @@ -85,10 +85,10 @@ public: void SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; } void SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; } - virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry ); }; -void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ ) +void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* /* pEntry */ ) { //! move position? (SvxLinguTabPage: aPos.X() += 20) String aNormalStr( GetText() ); @@ -200,7 +200,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties( for (sal_Int32 nEntryPos=0; nEntryPos<nEntryCount; ++nEntryPos) { uno::Any& rValue = maProperties[nEntryPos].Value; - SvLBoxEntry* pEntry = pModel->GetEntry(nEntryPos); + SvTreeListEntry* pEntry = pModel->GetEntry(nEntryPos); bool bHasData = false; sal_uInt16 nItemCount = pEntry->ItemCount(); @@ -268,7 +268,7 @@ void ScSolverOptionsDialog::FillListBox() mpCheckButtonData = new SvLBoxButtonData( &maLbSettings ); SvLBoxTreeList* pModel = maLbSettings.GetModel(); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; for (sal_Int32 nPos=0; nPos<nCount; nPos++) { @@ -279,7 +279,7 @@ void ScSolverOptionsDialog::FillListBox() if ( eClass == uno::TypeClass_BOOLEAN ) { // check box entry - pEntry = new SvLBoxEntry; + pEntry = new SvTreeListEntry; SvLBoxButton* pButton = new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, mpCheckButtonData ); if ( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ) pButton->SetStateChecked(); @@ -292,7 +292,7 @@ void ScSolverOptionsDialog::FillListBox() else { // value entry - pEntry = new SvLBoxEntry; + pEntry = new SvTreeListEntry; pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty ) ); // empty column pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); ScSolverOptionsString* pItem = new ScSolverOptionsString( pEntry, 0, aVisName ); @@ -323,7 +323,7 @@ void ScSolverOptionsDialog::ReadFromComponent() void ScSolverOptionsDialog::EditOption() { - SvLBoxEntry* pEntry = maLbSettings.GetCurEntry(); + SvTreeListEntry* pEntry = maLbSettings.GetCurEntry(); if (pEntry) { sal_uInt16 nItemCount = pEntry->ItemCount(); @@ -394,7 +394,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) { sal_Bool bCheckbox = false; - SvLBoxEntry* pEntry = maLbSettings.GetCurEntry(); + SvTreeListEntry* pEntry = maLbSettings.GetCurEntry(); if (pEntry) { SvLBoxItem* pItem = pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON); diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 941002c42250..30f4685633e2 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -107,18 +107,18 @@ ScRangeManagerTable::~ScRangeManagerTable() void ScRangeManagerTable::addEntry(const ScRangeNameLine& rLine, bool bSetCurEntry) { - SvLBoxEntry* pEntry = InsertEntryToColumn( createEntryString(rLine), LIST_APPEND, 0xffff); + SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(rLine), LIST_APPEND, 0xffff); if (bSetCurEntry) SetCurEntry(pEntry); } void ScRangeManagerTable::GetCurrentLine(ScRangeNameLine& rLine) { - SvLBoxEntry* pCurrentEntry = GetCurEntry(); + SvTreeListEntry* pCurrentEntry = GetCurEntry(); GetLine(rLine, pCurrentEntry); } -void ScRangeManagerTable::GetLine(ScRangeNameLine& rLine, SvLBoxEntry* pEntry) +void ScRangeManagerTable::GetLine(ScRangeNameLine& rLine, SvTreeListEntry* pEntry) { rLine.aName = GetEntryText( pEntry, 0); rLine.aExpression = GetEntryText(pEntry, 1); @@ -166,9 +166,9 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi void ScRangeManagerTable::CheckForFormulaString() { - for (SvLBoxEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry = GetNextEntryInView(pEntry)) + for (SvTreeListEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry = GetNextEntryInView(pEntry)) { - std::map<SvLBoxEntry*, bool>::const_iterator itr = maCalculatedFormulaEntries.find(pEntry); + std::map<SvTreeListEntry*, bool>::const_iterator itr = maCalculatedFormulaEntries.find(pEntry); if (itr == maCalculatedFormulaEntries.end() || itr->second == false) { ScRangeNameLine aLine; @@ -177,7 +177,7 @@ void ScRangeManagerTable::CheckForFormulaString() rtl::OUString aFormulaString; pData->GetSymbol(aFormulaString, maPos); SetEntryText(aFormulaString, pEntry, 1); - maCalculatedFormulaEntries.insert( std::pair<SvLBoxEntry*, bool>(pEntry, true) ); + maCalculatedFormulaEntries.insert( std::pair<SvTreeListEntry*, bool>(pEntry, true) ); } } @@ -199,13 +199,13 @@ std::vector<ScRangeNameLine> ScRangeManagerTable::GetSelectedEntries() std::vector<ScRangeNameLine> aSelectedEntries; if (GetSelectionCount()) { - for (SvLBoxEntry* pEntry = FirstSelected(); pEntry != LastSelected(); pEntry = NextSelected(pEntry)) + for (SvTreeListEntry* pEntry = FirstSelected(); pEntry != LastSelected(); pEntry = NextSelected(pEntry)) { ScRangeNameLine aLine; GetLine( aLine, pEntry ); aSelectedEntries.push_back(aLine); } - SvLBoxEntry* pEntry = LastSelected(); + SvTreeListEntry* pEntry = LastSelected(); ScRangeNameLine aLine; GetLine( aLine, pEntry ); aSelectedEntries.push_back(aLine); @@ -215,7 +215,7 @@ std::vector<ScRangeNameLine> ScRangeManagerTable::GetSelectedEntries() void ScRangeManagerTable::SetEntry(const ScRangeNameLine& rLine) { - for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry)) + for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry)) { if (rLine.aName == rtl::OUString(GetEntryText(pEntry, 0)) && rLine.aScope == rtl::OUString(GetEntryText(pEntry, 2))) diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index aa9cee00238e..14a2d47b3378 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -164,7 +164,7 @@ void ScContentTree::InitRoot( sal_uInt16 nType ) String aName( ScResId( SCSTR_CONTENT_ROOT + nType ) ); // wieder an die richtige Position: sal_uInt16 nPos = nRootType ? 0 : pPosList[nType]-1; - SvLBoxEntry* pNew = InsertEntry( aName, rImage, rImage, NULL, false, nPos ); + SvTreeListEntry* pNew = InsertEntry( aName, rImage, rImage, NULL, false, nPos ); pRootNodes[nType] = pNew; } @@ -182,7 +182,7 @@ void ScContentTree::ClearType(sal_uInt16 nType) ClearAll(); else { - SvLBoxEntry* pParent = pRootNodes[nType]; + SvTreeListEntry* pParent = pRootNodes[nType]; if ( !pParent || GetChildCount(pParent) ) // nicht, wenn ohne Children schon da { if (pParent) @@ -200,7 +200,7 @@ void ScContentTree::InsertContent( sal_uInt16 nType, const String& rValue ) return; } - SvLBoxEntry* pParent = pRootNodes[nType]; + SvTreeListEntry* pParent = pRootNodes[nType]; if (pParent) InsertEntry( rValue, pParent ); else @@ -209,7 +209,7 @@ void ScContentTree::InsertContent( sal_uInt16 nType, const String& rValue ) } } -void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvLBoxEntry* pEntry ) const +void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvTreeListEntry* pEntry ) const { rnRootIndex = SC_CONTENT_ROOT; rnChildIndex = SC_CONTENT_NOCHILD; @@ -217,7 +217,7 @@ void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChild if( !pEntry ) return; - SvLBoxEntry* pParent = GetParent( pEntry ); + SvTreeListEntry* pParent = GetParent( pEntry ); bool bFound = false; for( sal_uInt16 nRoot = 1; !bFound && (nRoot < SC_CONTENT_COUNT); ++nRoot ) { @@ -233,7 +233,7 @@ void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChild // search the entry in all child entries of the parent sal_uLong nEntry = 0; - SvLBoxEntry* pIterEntry = FirstChild( pParent ); + SvTreeListEntry* pIterEntry = FirstChild( pParent ); while( !bFound && pIterEntry ) { if ( pEntry == pIterEntry ) @@ -250,7 +250,7 @@ void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChild } } -sal_uLong ScContentTree::GetChildIndex( SvLBoxEntry* pEntry ) const +sal_uLong ScContentTree::GetChildIndex( SvTreeListEntry* pEntry ) const { sal_uInt16 nRoot; sal_uLong nChild; @@ -279,7 +279,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl) { sal_uInt16 nType; sal_uLong nChild; - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); GetEntryIndexes( nType, nChild, pEntry ); if( pEntry && (nType != SC_CONTENT_ROOT) && (nChild != SC_CONTENT_NOCHILD) ) @@ -370,7 +370,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) break; case 0: { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if( pEntry ) { sal_uInt16 nType; @@ -518,12 +518,12 @@ void ScContentTree::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if ( pEntry ) { sal_Bool bRet = false; String aHelpText; - SvLBoxEntry* pParent = GetParent(pEntry); + SvTreeListEntry* pParent = GetParent(pEntry); if ( !pParent ) // Top-Level ? { aHelpText = String::CreateFromInt32( GetChildCount(pEntry) ); @@ -916,11 +916,11 @@ sal_Bool ScContentTree::NoteStringsChanged() if (!pDoc) return false; - SvLBoxEntry* pParent = pRootNodes[SC_CONTENT_NOTE]; + SvTreeListEntry* pParent = pRootNodes[SC_CONTENT_NOTE]; if (!pParent) return false; - SvLBoxEntry* pEntry = FirstChild( pParent ); + SvTreeListEntry* pEntry = FirstChild( pParent ); bool bEqual = true; SCTAB nTabCount = pDoc->GetTableCount(); @@ -956,11 +956,11 @@ sal_Bool ScContentTree::DrawNamesChanged( sal_uInt16 nType ) if (!pDoc) return false; - SvLBoxEntry* pParent = pRootNodes[nType]; + SvTreeListEntry* pParent = pRootNodes[nType]; if (!pParent) return false; - SvLBoxEntry* pEntry = FirstChild( pParent ); + SvTreeListEntry* pEntry = FirstChild( pParent ); // iterate in flat mode for groups SdrIterMode eIter = ( nType == SC_CONTENT_DRAWING ) ? IM_FLAT : IM_DEEPNOGROUPS; @@ -1120,7 +1120,7 @@ void ScContentTree::DoDrag() sal_uInt16 nType; sal_uLong nChild; - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); GetEntryIndexes( nType, nChild, pEntry ); if( pEntry && @@ -1329,10 +1329,10 @@ void ScContentTree::ToggleRoot() // nach Selektion sal_uInt16 nNew = SC_CONTENT_ROOT; if ( nRootType == SC_CONTENT_ROOT ) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if (pEntry) { - SvLBoxEntry* pParent = GetParent(pEntry); + SvTreeListEntry* pParent = GetParent(pEntry); for (sal_uInt16 i=1; i<SC_CONTENT_COUNT; i++) if ( pEntry == pRootNodes[i] || pParent == pRootNodes[i] ) nNew = i; @@ -1462,7 +1462,7 @@ void ScContentTree::ApplySettings() // select if( nRootSel == nEntry ) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if( bExp && (nChildSel != SC_CONTENT_NOCHILD) ) pEntry = GetEntry( pRootNodes[ nEntry ], nChildSel ); Select( pEntry ? pEntry : pRootNodes[ nEntry ] ); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index c4df06a4c1a6..0167bfb4fa22 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -42,10 +42,10 @@ public: OptionString(const rtl::OUString& rDesc, const rtl::OUString& rValue) : maDesc(rDesc), maValue(rValue) {} - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry); }; -void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/) +void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvTreeListEntry* /*pEntry*/) { Point aPos = rPos; rtl::OUString aDesc = maDesc + rtl::OUString(": "); @@ -139,7 +139,7 @@ void ScCalcOptionsDialog::FillOptionsList() { // Syntax for INDIRECT function. - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString())); pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); OptionString* pItem = new OptionString( @@ -150,7 +150,7 @@ void ScCalcOptionsDialog::FillOptionsList() { // Treat empty string as zero. - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString())); pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); OptionString* pItem = new OptionString( @@ -236,7 +236,7 @@ void ScCalcOptionsDialog::ListOptionValueChanged() maLbSettings.SetUpdateMode(false); SvLBoxTreeList* pModel = maLbSettings.GetModel(); - SvLBoxEntry* pEntry = pModel->GetEntry(NULL, 0); + SvTreeListEntry* pEntry = pModel->GetEntry(NULL, 0); if (!pEntry) return; @@ -264,7 +264,7 @@ void ScCalcOptionsDialog::RadioValueChanged() maLbSettings.SetUpdateMode(false); SvLBoxTreeList* pModel = maLbSettings.GetModel(); - SvLBoxEntry* pEntry = pModel->GetEntry(NULL, 1); + SvTreeListEntry* pEntry = pModel->GetEntry(NULL, 1); if (!pEntry) return; diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index a9378697ab37..d63ac3b67fde 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -210,10 +210,10 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true ) class CustomAnimationListEntryItem : public SvLBoxString { public: - CustomAnimationListEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); + CustomAnimationListEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); virtual ~CustomAnimationListEntryItem(); - void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -225,7 +225,7 @@ private: // -------------------------------------------------------------------- -CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ) +CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ) : SvLBoxString( pEntry, nFlags, aDescription ) , mpParent( pParent ) , maDescription( aDescription ) @@ -241,7 +241,7 @@ CustomAnimationListEntryItem::~CustomAnimationListEntryItem() // -------------------------------------------------------------------- -void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData ) +void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData ) { if( !pViewData ) pViewData = pView->GetViewDataItem( pEntry, this ); @@ -254,7 +254,7 @@ void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEnt // -------------------------------------------------------------------- -void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) +void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry ) { SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this ); @@ -323,7 +323,7 @@ void CustomAnimationListEntryItem::Clone( SvLBoxItem* ) // ==================================================================== -class CustomAnimationListEntry : public SvLBoxEntry +class CustomAnimationListEntry : public SvTreeListEntry { public: CustomAnimationListEntry(); @@ -360,11 +360,11 @@ CustomAnimationListEntry::~CustomAnimationListEntry() class CustomAnimationTriggerEntryItem : public SvLBoxString { public: - CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription ); + CustomAnimationTriggerEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, OUString aDescription ); virtual ~CustomAnimationTriggerEntryItem(); virtual sal_uInt16 IsA(); - void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -374,7 +374,7 @@ private: // -------------------------------------------------------------------- -CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription ) +CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription ) : SvLBoxString( pEntry, nFlags, aDescription ), maDescription( aDescription ) { } @@ -394,7 +394,7 @@ sal_uInt16 CustomAnimationTriggerEntryItem::IsA() // -------------------------------------------------------------------- -void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData ) +void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData ) { if( !pViewData ) pViewData = pView->GetViewDataItem( pEntry, this ); @@ -407,7 +407,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvLBox // -------------------------------------------------------------------- -void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* ) +void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* ) { Size aSize( rDev.GetOutputSizePixel().Width(), static_cast< SvTreeListBox* >(&rDev)->GetEntryHeight() ); @@ -668,7 +668,7 @@ void CustomAnimationList::update() Reference< XShape > xShape( pIS->getTriggerShape() ); if( xShape.is() ) { - SvLBoxEntry* pLBoxEntry = new CustomAnimationListEntry; + SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry; pLBoxEntry->AddItem( new SvLBoxContextBmp( pLBoxEntry, 0, Image(), Image(), 0)); OUString aDescription = String( SdResId( STR_CUSTOMANIMATION_TRIGGER ) ); aDescription += ": "; @@ -766,7 +766,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) { aDescription = getDescription( aTarget, pEffect->getTargetSubItem() != ShapeAnimationSubType::ONLY_BACKGROUND ); - SvLBoxEntry* pParentEntry = 0; + SvTreeListEntry* pParentEntry = 0; Reference< XShape > xTargetShape( pEffect->getTargetShape() ); sal_Int32 nGroupId = pEffect->getGroupId(); @@ -777,7 +777,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) pParentEntry = mpLastParentEntry; // create an entry for the effect - SvLBoxEntry* pEntry = new CustomAnimationListEntry( pEffect ); + SvTreeListEntry* pEntry = new CustomAnimationListEntry( pEffect ); pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); pEntry->AddItem( new CustomAnimationListEntryItem( pEntry, 0, aDescription, pEffect, this ) ); diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 693d6e3422dc..65f7bfa282fe 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -112,7 +112,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxLastTargetShape; sal_Int32 mnLastGroupId; - SvLBoxEntry* mpLastParentEntry; + SvTreeListEntry* mpLastParentEntry; }; diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index e1436d43b2c6..b1974fd4f572 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -360,7 +360,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, for( SdCustomShow::PageVec::iterator it = rpCustomShow->PagesVector().begin(); it != rpCustomShow->PagesVector().end(); ++it ) { - SvLBoxEntry* pEntry = aLbCustomPages.InsertEntry( (*it)->GetName() ); + SvTreeListEntry* pEntry = aLbCustomPages.InsertEntry( (*it)->GetName() ); pEntry->SetUserData( (SdPage*) (*it) ); } } @@ -414,7 +414,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) if( nCount > 0 ) { sal_uLong nPosCP = LIST_APPEND; - SvLBoxEntry* pEntry = aLbCustomPages.FirstSelected(); + SvTreeListEntry* pEntry = aLbCustomPages.FirstSelected(); if( pEntry ) nPosCP = aLbCustomPages.GetModel()->GetAbsPos( pEntry ) + 1L; @@ -438,7 +438,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) else if( p == &aBtnRemove ) { //sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos(); - SvLBoxEntry* pEntry = aLbCustomPages.FirstSelected(); + SvTreeListEntry* pEntry = aLbCustomPages.FirstSelected(); if( pEntry ) { sal_uLong nPos = aLbCustomPages.GetModel()->GetAbsPos( pEntry ); @@ -470,7 +470,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() { sal_Bool bDifferent = sal_False; SdPage* pPage = NULL; - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; // Anzahl vergleichen if( rpCustomShow->PagesVector().size() != aLbCustomPages.GetEntryCount() ) diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index c5dcc2c70a30..3f042c39941b 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -63,7 +63,7 @@ SdPageListControl::SdPageListControl( IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl) { SvLBoxTreeList* pTreeModel = GetModel(); - SvLBoxEntry* pEntry = pTreeModel->First(); + SvTreeListEntry* pEntry = pTreeModel->First(); while( pEntry ) { @@ -88,9 +88,9 @@ void SdPageListControl::Clear() SvTreeListBox::Clear(); } -SvLBoxEntry* SdPageListControl::InsertPage( const String& rPageName ) +SvTreeListEntry* SdPageListControl::InsertPage( const String& rPageName ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, m_pCheckButton)); @@ -102,9 +102,9 @@ SvLBoxEntry* SdPageListControl::InsertPage( const String& rPageName ) return pEntry; } -void SdPageListControl::InsertTitle( SvLBoxEntry* pParent, const String& rTitle ) +void SdPageListControl::InsertTitle( SvTreeListEntry* pParent, const String& rTitle ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new SvLBoxString( pEntry, 0, rTitle ) ); @@ -122,7 +122,7 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) SdPage* pPage = (SdPage*) pDoc->GetPage( nPage ); if( pPage->GetPageKind() == PK_STANDARD ) { - SvLBoxEntry* pEntry = InsertPage( pPage->GetName() ); + SvTreeListEntry* pEntry = InsertPage( pPage->GetName() ); SetCheckButtonState(pEntry, SvButtonState( SV_BUTTON_CHECKED ) ); SdrTextObj* pTO = (SdrTextObj*)pPage->GetPresObj(PRESOBJ_TEXT); @@ -174,13 +174,13 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) sal_uInt16 SdPageListControl::GetSelectedPage() { - SvLBoxEntry* pSelEntry = GetCurEntry(); + SvTreeListEntry* pSelEntry = GetCurEntry(); sal_uInt16 nPage = 0; if ( pSelEntry ) { SvLBoxTreeList* pTreeModel = GetModel(); - SvLBoxEntry* pEntry = pTreeModel->First(); + SvTreeListEntry* pEntry = pTreeModel->First(); while( pEntry && pEntry != pSelEntry ) { @@ -197,7 +197,7 @@ sal_uInt16 SdPageListControl::GetSelectedPage() sal_Bool SdPageListControl::IsPageChecked( sal_uInt16 nPage ) { - SvLBoxEntry* pEntry = GetModel()->GetEntry(nPage); + SvTreeListEntry* pEntry = GetModel()->GetEntry(nPage); return pEntry?(sal_Bool)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): sal_False; } diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index f6f9b792bf35..cccd80e0b21e 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -38,8 +38,8 @@ class SdPageListControl : public SvTreeListBox private: SvLBoxButtonData* m_pCheckButton; - SvLBoxEntry* InsertPage( const String& rPageName ); - void InsertTitle( SvLBoxEntry* pEntry, const String& rTitle ); + SvTreeListEntry* InsertPage( const String& rPageName ); + void InsertTitle( SvTreeListEntry* pEntry, const String& rTitle ); public: SdPageListControl( Window* pParent, const ResId& rResId ); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 8637efa62936..04b60ea104d3 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -309,7 +309,7 @@ sal_Bool SdPageObjsTLB::SelectEntry( const String& rName ) if( rName.Len() ) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; String aTmp; for( pEntry = First(); pEntry && !bFound; pEntry = Next( pEntry ) ) @@ -338,7 +338,7 @@ sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName ) if( rName.Len() ) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; String aTmp; for( pEntry = First(); pEntry && !bFound; pEntry = Next( pEntry ) ) @@ -452,7 +452,7 @@ void SdPageObjsTLB::AddShapeList ( SdrObject* pShape, const ::rtl::OUString& rsName, const bool bIsExcluded, - SvLBoxEntry* pParentEntry, + SvTreeListEntry* pParentEntry, const IconProvider& rIconProvider) { Image aIcon (rIconProvider.maImgPage); @@ -465,7 +465,7 @@ void SdPageObjsTLB::AddShapeList ( if (pShape != NULL) pUserData = pShape; - SvLBoxEntry* pEntry = InsertEntry( + SvTreeListEntry* pEntry = InsertEntry( rsName, aIcon, aIcon, @@ -598,7 +598,7 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) SdrObject* pObj = NULL; SdPage* pPage = NULL; - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); String aName; // Alle Pages incl. Objekte vergleichen @@ -665,7 +665,7 @@ String SdPageObjsTLB::GetSelectEntry() std::vector<rtl::OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const { std::vector<rtl::OUString> aEntries; - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); while( pEntry ) { @@ -686,7 +686,7 @@ std::vector<rtl::OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 n |* \************************************************************************/ -void SdPageObjsTLB::RequestingChildren( SvLBoxEntry* pFileEntry ) +void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry ) { if( !pFileEntry->HasChildren() ) { @@ -694,7 +694,7 @@ void SdPageObjsTLB::RequestingChildren( SvLBoxEntry* pFileEntry ) { SdrObject* pObj = NULL; SdPage* pPage = NULL; - SvLBoxEntry* pPageEntry = NULL; + SvTreeListEntry* pPageEntry = NULL; Image aImgPage = Image( BitmapEx( SdResId( BMP_PAGE ) ) ); Image aImgPageObjs = Image( BitmapEx( SdResId( BMP_PAGEOBJS ) ) ); @@ -852,7 +852,7 @@ void SdPageObjsTLB::CloseBookmarkDoc() void SdPageObjsTLB::SelectHdl() { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); mbLinkableSelected = sal_True; @@ -878,7 +878,7 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt ) if( rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) { // Auskommentierter Code aus svtools/source/contnr/svimpbox.cxx - SvLBoxEntry* pCursor = GetCurEntry(); + SvTreeListEntry* pCursor = GetCurEntry(); if( pCursor->HasChildren() || pCursor->HasChildrenOnDemand() ) { if( IsExpanded( pCursor ) ) @@ -905,7 +905,7 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel) (void)rPosPixel; SdNavigatorWin* pNavWin = NULL; - SvLBoxEntry* pEntry = GetEntry(rPosPixel); + SvTreeListEntry* pEntry = GetEntry(rPosPixel); if( mpFrame->HasChildWindow( SID_NAVIGATOR ) ) pNavWin = (SdNavigatorWin*) ( mpFrame->GetChildWindow( SID_NAVIGATOR )->GetContextWindow( SD_MOD() ) ); @@ -926,12 +926,12 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel) // Enable only the entries as drop targets that are children of the // page under the mouse. - SvLBoxEntry* pParent = GetRootLevelParent(pEntry); + SvTreeListEntry* pParent = GetRootLevelParent(pEntry); if (pParent != NULL) { SelectAll(sal_False, sal_False); Select(pParent, sal_True); - // for (SvLBoxEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild)) + // for (SvTreeListEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild)) // Select(pChild, sal_True); EnableSelectionAsDropTarget(sal_True, sal_True);//sal_False); } @@ -1076,7 +1076,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) } else { - SvLBoxEntry* pEntry = GetDropTarget(rEvent.maPosPixel); + SvTreeListEntry* pEntry = GetDropTarget(rEvent.maPosPixel); if (rEvent.mbLeaving || !CheckDragAndDropMode( this, rEvent.mnAction )) { ImplShowTargetEmphasis( pTargetEntry, sal_False ); @@ -1201,12 +1201,12 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const sal_Bool SdPageObjsTLB::NotifyMoving( - SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) { - SvLBoxEntry* pDestination = pTarget; + SvTreeListEntry* pDestination = pTarget; while (GetParent(pDestination) != NULL && GetParent(GetParent(pDestination)) != NULL) pDestination = GetParent(pDestination); @@ -1256,9 +1256,9 @@ sal_Bool SdPageObjsTLB::NotifyMoving( -SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) +SvTreeListEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) { - SvLBoxEntry* pEntry = SvTreeListBox::GetDropTarget(rLocation); + SvTreeListEntry* pEntry = SvTreeListBox::GetDropTarget(rLocation); if (pEntry == NULL) return NULL; @@ -1276,11 +1276,11 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) pEntry = GetParent(pEntry); // Advance to next sibling. - SvLBoxEntry* pNext; + SvTreeListEntry* pNext; sal_uInt16 nDepth (0); while (pEntry != NULL) { - pNext = dynamic_cast<SvLBoxEntry*>(NextVisible(pEntry, &nDepth)); + pNext = dynamic_cast<SvTreeListEntry*>(NextVisible(pEntry, &nDepth)); if (pNext != NULL && nDepth > 0 && nDepth!=0xffff) pEntry = pNext; else @@ -1296,7 +1296,7 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) -bool SdPageObjsTLB::IsDropAllowed (SvLBoxEntry* pEntry) +bool SdPageObjsTLB::IsDropAllowed (SvTreeListEntry* pEntry) { if (pEntry == NULL) return false; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 21d89c9a6705..50ad60e4353d 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -47,7 +47,7 @@ class SdNavigatorWin; class SdrObject; class SdrObjList; class SdPage; -class SvLBoxEntry; +class SvTreeListEntry; namespace sd { class DrawDocShell; @@ -150,7 +150,7 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); void DoDrag(); void OnDragFinished( sal_uInt8 nDropAction ); @@ -179,13 +179,13 @@ protected: associated list box entries. */ virtual sal_Bool NotifyMoving( - SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos); using Window::GetDropTarget; - virtual SvLBoxEntry* GetDropTarget (const Point& rLocation); + virtual SvTreeListEntry* GetDropTarget (const Point& rLocation); public: @@ -238,7 +238,7 @@ private: /** Return <TRUE/> when the current transferable may be dropped at the given list box entry. */ - bool IsDropAllowed (SvLBoxEntry* pEntry); + bool IsDropAllowed (SvTreeListEntry* pEntry); /** This inner class is defined in sdtreelb.cxx and is basically a container for the icons used in the list box for the entries. @@ -265,7 +265,7 @@ private: SdrObject* pShape, const ::rtl::OUString& rsName, const bool bIsExcluded, - SvLBoxEntry* pParentEntry, + SvTreeListEntry* pParentEntry, const IconProvider& rIconProvider); /** Add the given object to a transferable object so that the object can diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx index 4bdc1c7c6622..6a2a001b991c 100644 --- a/sfx2/inc/docvor.hxx +++ b/sfx2/inc/docvor.hxx @@ -56,22 +56,22 @@ friend class SfxOrganizeDlg_Impl; DECL_LINK( OnAsyncExecuteDrop, ExecuteDropEvent* ); protected: - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection & ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); - virtual sal_Bool NotifyMoving(SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, sal_uIntPtr &); - virtual sal_Bool NotifyCopying(SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, sal_uIntPtr &); - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection & ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool NotifyMoving(SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &); + virtual sal_Bool NotifyCopying(SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &); + virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual long ExpandingHdl(); - virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); using SvTreeListBox::ExecuteDrop; // new d&d - virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual void DragFinished( sal_Int8 nDropAction ); @@ -96,27 +96,27 @@ public: virtual PopupMenu* CreateContextMenu(); private: - sal_Bool IsStandard_Impl( SvLBoxEntry *) const; + sal_Bool IsStandard_Impl( SvTreeListEntry *) const; sal_Bool MoveOrCopyTemplates(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy); sal_Bool MoveOrCopyContents(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy); inline sal_uInt16 GetDocLevel() const; SfxObjectShellRef GetObjectShell( const Path& ); sal_Bool IsUniqName_Impl( const String &rText, - SvLBoxEntry* pParent, SvLBoxEntry* pEntry = 0 ) const; - sal_uInt16 GetLevelCount_Impl( SvLBoxEntry* pParent ) const; + SvTreeListEntry* pParent, SvTreeListEntry* pEntry = 0 ) const; + sal_uInt16 GetLevelCount_Impl( SvTreeListEntry* pParent ) const; - SvLBoxEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType, - SvLBoxEntry* pParent = NULL, sal_Bool bChildrenOnDemand = sal_False, + SvTreeListEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType, + SvTreeListEntry* pParent = NULL, sal_Bool bChildrenOnDemand = sal_False, sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL ); }; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 09268a375e6c..1441c36db915 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -296,7 +296,7 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId ) ContentListBox_Impl::~ContentListBox_Impl() { sal_uInt16 nPos = 0; - SvLBoxEntry* pEntry = GetEntry( nPos++ ); + SvTreeListEntry* pEntry = GetEntry( nPos++ ); while ( pEntry ) { ::rtl::OUString aTemp( GetEntryText( pEntry ) ); @@ -325,7 +325,7 @@ void ContentListBox_Impl::InitRoot() aURL = aRow.GetToken( 0, '\t', nIdx ); sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0); sal_Bool bIsFolder = ( '1' == cFolder ); - SvLBoxEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, sal_True ); + SvTreeListEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, sal_True ); if ( bIsFolder ) pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) ); } @@ -333,9 +333,9 @@ void ContentListBox_Impl::InitRoot() // ----------------------------------------------------------------------- -void ContentListBox_Impl::ClearChildren( SvLBoxEntry* pParent ) +void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent ) { - SvLBoxEntry* pEntry = FirstChild( pParent ); + SvTreeListEntry* pEntry = FirstChild( pParent ); while ( pEntry ) { ::rtl::OUString aTemp( GetEntryText( pEntry ) ); @@ -347,7 +347,7 @@ void ContentListBox_Impl::ClearChildren( SvLBoxEntry* pParent ) // ----------------------------------------------------------------------- -void ContentListBox_Impl::RequestingChildren( SvLBoxEntry* pParent ) +void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) { try { @@ -370,7 +370,7 @@ void ContentListBox_Impl::RequestingChildren( SvLBoxEntry* pParent ) aURL = aRow.GetToken( 0, '\t', nIdx ); sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0); sal_Bool bIsFolder = ( '1' == cFolder ); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( bIsFolder ) { pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, sal_True ); @@ -414,7 +414,7 @@ long ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) String ContentListBox_Impl::GetSelectEntry() const { String aRet; - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if ( pEntry && !( (ContentEntry_Impl*)pEntry->GetUserData() )->bIsFolder ) aRet = ( (ContentEntry_Impl*)pEntry->GetUserData() )->aURL; return aRet; diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 74d73a32194c..cd69921be5b2 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -78,14 +78,14 @@ private: Image aDocumentImage; void InitRoot(); - void ClearChildren( SvLBoxEntry* pParent ); + void ClearChildren( SvTreeListEntry* pParent ); public: ContentListBox_Impl( Window* pParent, const ResId& rResId ); ~ContentListBox_Impl(); - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual long Notify( NotifyEvent& rNEvt ); inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index e92b7f085205..3e610b6600ba 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -421,7 +421,7 @@ typedef std::vector<rtl::OUString> ExpandedEntries_t; class StyleTreeListBox_Impl : public DropListBox_Impl { private: - SvLBoxEntry* pCurEntry; + SvTreeListEntry* pCurEntry; Link aDoubleClickLink; Link aDropLink; String aParent; @@ -433,9 +433,9 @@ protected: virtual sal_Bool DoubleClickHdl(); virtual long ExpandingHdl(); virtual void ExpandedHdl(); - virtual sal_Bool NotifyMoving(SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyMoving(SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uIntPtr& rNewChildPos); public: StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle = 0); @@ -455,8 +455,8 @@ public: void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries_t& rEntries) const { - SvLBoxEntry *pEntry; - for(pEntry=(SvLBoxEntry*)FirstVisible();pEntry;pEntry=(SvLBoxEntry*)NextVisible(pEntry)) + SvTreeListEntry *pEntry; + for(pEntry=(SvTreeListEntry*)FirstVisible();pEntry;pEntry=(SvTreeListEntry*)NextVisible(pEntry)) { if(IsExpanded(pEntry)) { @@ -520,9 +520,9 @@ long StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) //------------------------------------------------------------------------- -sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, +sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uIntPtr& lPos) /* [Description] @@ -539,7 +539,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry* pTarget, lPos=0; IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() ); const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator(); - for(SvLBoxEntry *pTmpEntry=FirstChild(pTarget); + for(SvTreeListEntry *pTmpEntry=FirstChild(pTarget); pTmpEntry && COMPARE_LESS==pCollator->compareString( GetEntryText(pTmpEntry),GetEntryText(pEntry)); pTmpEntry=NextSibling(pTmpEntry),lPos++) ; @@ -578,7 +578,7 @@ void StyleTreeListBox_Impl::ExpandedHdl() */ { - SvLBoxEntry *pEntry = GetHdlEntry(); + SvTreeListEntry *pEntry = GetHdlEntry(); if(!IsExpanded(pEntry) && pCurEntry != GetCurEntry()) SelectAll( sal_False ); pCurEntry = 0; @@ -719,12 +719,12 @@ inline sal_Bool IsExpanded_Impl( const ExpandedEntries_t& rEntries, -SvLBoxEntry* FillBox_Impl(SvTreeListBox *pBox, +SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox, StyleTree_Impl* pEntry, const ExpandedEntries_t& rEntries, - SvLBoxEntry* pParent = 0) + SvTreeListEntry* pParent = 0) { - SvLBoxEntry* pNewEntry = pBox->InsertEntry(pEntry->aName, pParent); + SvTreeListEntry* pNewEntry = pBox->InsertEntry(pEntry->aName, pParent); const sal_uInt16 nCount = pEntry->pChildren ? pEntry->pChildren->size() : 0; for(sal_uInt16 i = 0; i < nCount; ++i) FillBox_Impl(pBox, (*pEntry->pChildren)[i], rEntries, pNewEntry); @@ -1072,7 +1072,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr) { if ( rStr.Len() ) { - SvLBoxEntry* pEntry = pTreeBox->First(); + SvTreeListEntry* pEntry = pTreeBox->First(); while ( pEntry ) { if ( pTreeBox->GetEntryText( pEntry ) == rStr ) @@ -1092,9 +1092,9 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr) sal_Bool bSelect = ( rStr.Len() > 0 ); if ( bSelect ) { - SvLBoxEntry* pEntry = (SvLBoxEntry*)aFmtLb.FirstVisible(); + SvTreeListEntry* pEntry = (SvTreeListEntry*)aFmtLb.FirstVisible(); while ( pEntry && aFmtLb.GetEntryText( pEntry ) != rStr ) - pEntry = (SvLBoxEntry*)aFmtLb.NextVisible( pEntry ); + pEntry = (SvTreeListEntry*)aFmtLb.NextVisible( pEntry ); if ( !pEntry ) bSelect = sal_False; else @@ -1121,13 +1121,13 @@ String SfxCommonTemplateDialog_Impl::GetSelectedEntry() const String aRet; if ( pTreeBox ) { - SvLBoxEntry* pEntry = pTreeBox->FirstSelected(); + SvTreeListEntry* pEntry = pTreeBox->FirstSelected(); if ( pEntry ) aRet = pTreeBox->GetEntryText( pEntry ); } else { - SvLBoxEntry* pEntry = aFmtLb.FirstSelected(); + SvTreeListEntry* pEntry = aFmtLb.FirstSelected(); if ( pEntry ) aRet = aFmtLb.GetEntryText( pEntry ); } @@ -1192,7 +1192,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() if ( nCount ) pTreeBox->Expand( pTreeBox->First() ); - for ( SvLBoxEntry* pEntry = pTreeBox->First(); pEntry; pEntry = pTreeBox->Next( pEntry ) ) + for ( SvTreeListEntry* pEntry = pTreeBox->First(); pEntry; pEntry = pTreeBox->Next( pEntry ) ) { if ( IsExpanded_Impl( aEntries, pTreeBox->GetEntryText( pEntry ) ) ) pTreeBox->Expand( pEntry ); @@ -1303,7 +1303,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) EnableItem(SID_STYLE_WATERCAN,sal_False); SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); - SvLBoxEntry* pEntry = aFmtLb.First(); + SvTreeListEntry* pEntry = aFmtLb.First(); std::vector<rtl::OUString> aStrings; comphelper::string::NaturalStringSorter aSorter( diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 1411287fab33..55702767d976 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -261,7 +261,7 @@ void SfxVersionDialog::Init_Impl() aEntry += pInfo->aAuthor; aEntry += '\t'; aEntry += ConvertWhiteSpaces_Impl( pInfo->aComment ); - SvLBoxEntry *pEntry = aVersionBox.InsertEntry( aEntry ); + SvTreeListEntry *pEntry = aVersionBox.InsertEntry( aEntry ); pEntry->SetUserData( pInfo ); } } @@ -290,7 +290,7 @@ void SfxVersionDialog::Open_Impl() { SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); - SvLBoxEntry *pEntry = aVersionBox.FirstSelected(); + SvTreeListEntry *pEntry = aVersionBox.FirstSelected(); sal_uIntPtr nPos = aVersionBox.GetModel()->GetRelPos( pEntry ); SfxInt16Item aItem( SID_VERSION, (short)nPos+1 ); SfxStringItem aTarget( SID_TARGETNAME, DEFINE_CONST_UNICODE("_blank") ); @@ -368,7 +368,7 @@ IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) { SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); - SvLBoxEntry *pEntry = aVersionBox.FirstSelected(); + SvTreeListEntry *pEntry = aVersionBox.FirstSelected(); if ( pButton == &aSaveCheckBox ) { diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index e976a393316b..59995db6e8d2 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -115,7 +115,7 @@ friend class SfxOrganizeListBox_Impl; // save pointer for asynchronous D&D SvTreeListBox* pSourceView; - SvLBoxEntry* pTargetEntry; + SvTreeListEntry* pTargetEntry; SfxOrganizeListBox_Impl* pFinishedBox; sal_Int8 nDropAction; bool bExecDropFinished; @@ -164,7 +164,7 @@ friend class SfxOrganizeListBox_Impl; DECL_LINK(ExportHdl, void *); DECL_LINK(AddFilesHdl, void *); - sal_Bool DontDelete_Impl( SvLBoxEntry* pEntry ); + sal_Bool DontDelete_Impl( SvTreeListEntry* pEntry ); public: SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, SfxDocumentTemplates* pTempl ); @@ -391,7 +391,7 @@ class Path { ImpPath_Impl *pData; public: - Path(SvTreeListBox *pBox, SvLBoxEntry *pEntry); + Path(SvTreeListBox *pBox, SvTreeListEntry *pEntry); Path(const Path &rPath): pData(rPath.pData) { @@ -422,13 +422,13 @@ public: //------------------------------------------------------------------------- -Path::Path(SvTreeListBox *pBox, SvLBoxEntry *pEntry) : +Path::Path(SvTreeListBox *pBox, SvTreeListEntry *pEntry) : pData(new ImpPath_Impl) { DBG_ASSERT(pEntry != 0, "EntryPtr ist NULL"); if(!pEntry) return; - SvLBoxEntry *pParent = pBox->GetParent(pEntry); + SvTreeListEntry *pParent = pBox->GetParent(pEntry); do { pData->aUS.insert(pData->aUS.begin(), (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry)); @@ -441,8 +441,8 @@ Path::Path(SvTreeListBox *pBox, SvLBoxEntry *pEntry) : //------------------------------------------------------------------------- -SvLBoxEntry *GetIndices_Impl(SvTreeListBox *pBox, - SvLBoxEntry *pEntry, +SvTreeListEntry *GetIndices_Impl(SvTreeListBox *pBox, + SvTreeListEntry *pEntry, sal_uInt16 &rRegion, sal_uInt16 &rOffset) /* [Description] @@ -452,7 +452,7 @@ SvLBoxEntry *GetIndices_Impl(SvTreeListBox *pBox, [Parameter] SvTreeListBox *pBox Listbox where the event occurred - SvLBoxEntry *pEntry Entry whose position is to be determined + SvTreeListEntry *pEntry Entry whose position is to be determined sal_uInt16 &rRegion the region within the region of the document template (Out-Parameter) sal_uInt16 &rOffset the position within the region of the @@ -477,7 +477,7 @@ SvLBoxEntry *GetIndices_Impl(SvTreeListBox *pBox, rOffset = USHRT_MAX; return pEntry; } - SvLBoxEntry *pParent = pBox->GetParent(pEntry); + SvTreeListEntry *pParent = pBox->GetParent(pEntry); rRegion = (sal_uInt16)pBox->GetModel()->GetRelPos(pParent); rOffset = (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry); return pEntry; @@ -485,7 +485,7 @@ SvLBoxEntry *GetIndices_Impl(SvTreeListBox *pBox, //------------------------------------------------------------------------- -sal_Bool SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) +sal_Bool SfxOrganizeListBox_Impl::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { if(!bSelect) return SvTreeListBox::Select(pEntry,bSelect); @@ -505,9 +505,9 @@ sal_Bool SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, sal_Bool bSelect //------------------------------------------------------------------------- sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy) /* [Description] @@ -517,9 +517,9 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox, [Parameter] SvTreeListBox *pSourceBox Source Listbox, at which the event occurred - SvLBoxEntry* pTarget Target entry, to where it will be moved - SvLBoxEntry *pSource Source entry, to be copied / moved - SvLBoxEntry *&pNewParent the parent of the target position generated + SvTreeListEntry* pTarget Target entry, to where it will be moved + SvTreeListEntry *pSource Source entry, to be copied / moved + SvTreeListEntry *&pNewParent the parent of the target position generated at entry (out parameter) sal_uIntPtr &rIdx Index of the target entry sal_Bool bCopy Flag for Copy / Move @@ -530,18 +530,18 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox, [Cross-references] <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy)> - <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry *&pNewParent, + <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvTreeListEntry *pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx)> - <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry *&pNewParent, + <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvTreeListEntry *pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx)> */ @@ -596,9 +596,9 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox, //------------------------------------------------------------------------- sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy) /* [Description] @@ -608,9 +608,9 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, [Parameter] SvTreeListBox *pSourceBox Source Listbox, at which the event occurred - SvLBoxEntry* pTarget Target entry, to where it will be moved - SvLBoxEntry *pSource Source entry, to be copied / moved - SvLBoxEntry *&pNewParent the parent of the target position generated + SvTreeListEntry* pTarget Target entry, to where it will be moved + SvTreeListEntry *pSource Source entry, to be copied / moved + SvTreeListEntry *&pNewParent the parent of the target position generated at entry (out parameter) sal_uIntPtr &rIdx Index of the target entry sal_Bool bCopy Flag for Copy / Move @@ -621,18 +621,18 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, [Cross-references] <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy)> - <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry *&pNewParent, + <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvTreeListEntry *pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx)> - <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry *&pNewParent, + <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvTreeListEntry *pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx)> */ @@ -679,7 +679,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, // Delete duplicate entries if(bOk) { - SvLBoxEntry *pParentIter = pTarget; + SvTreeListEntry *pParentIter = pTarget; // Up to the document level as // the general reference point while(GetModel()->GetDepth(pParentIter) != nTLevel) @@ -687,7 +687,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, if(pParentIter->HasChildrenOnDemand() && !GetModel()->HasChildren(pParentIter)) RequestingChildren(pParentIter); - SvLBoxEntry *pChildIter = 0; + SvTreeListEntry *pChildIter = 0; sal_uInt16 i = 0; while(i < 2 && p[i+1] != INDEX_IGNORE) @@ -746,9 +746,9 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, //------------------------------------------------------------------------- -sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry *&pNewParent, +sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvTreeListEntry *pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx) /* [Description] @@ -758,9 +758,9 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget, [Parameter] - SvLBoxEntry* pTarget Target entry, to where it will be moved - SvLBoxEntry *pSource Source entry, to be moved - SvLBoxEntry *&pNewParent the parent of the target position generated + SvTreeListEntry* pTarget Target entry, to where it will be moved + SvTreeListEntry *pSource Source entry, to be moved + SvTreeListEntry *&pNewParent the parent of the target position generated at entry (out parameter) sal_uIntPtr &rIdx Index of the target entry @@ -770,20 +770,20 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget, [Cross-references] <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy)> <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy)> - <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry *&pNewParent, + <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvTreeListEntry *pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx)> */ @@ -807,9 +807,9 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget, //------------------------------------------------------------------------- -sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry *&pNewParent, +sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvTreeListEntry *pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx) /* [Description] @@ -818,9 +818,9 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget, [Parameter] - SvLBoxEntry* pTarget Target entry, to where it will be copied - SvLBoxEntry *pSource Source entry, to be copied - SvLBoxEntry *&pNewParent the parent of the target position generated + SvTreeListEntry* pTarget Target entry, to where it will be copied + SvTreeListEntry *pSource Source entry, to be copied + SvTreeListEntry *&pNewParent the parent of the target position generated at entry (out parameter) sal_uIntPtr &rIdx Index of the target entry @@ -829,20 +829,20 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget, [Cross-references] <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy)> <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox, - SvLBoxEntry *pSource, - SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, + SvTreeListEntry *pSource, + SvTreeListEntry* pTarget, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx, sal_Bool bCopy)> - <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry *&pNewParent, + <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvTreeListEntry *pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry *&pNewParent, sal_uIntPtr &rIdx)> */ { @@ -864,7 +864,7 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget, //------------------------------------------------------------------------- -sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection& ) +sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) /* [Description] @@ -872,7 +872,7 @@ sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection& (SV-Handler) [Cross-references] - <SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const rtl::OUString& rText)> + <SfxOrganizeListBox_Impl::EditedEntry(SvTreeListEntry* pEntry, const rtl::OUString& rText)> */ { @@ -887,7 +887,7 @@ sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection& //------------------------------------------------------------------------- -sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const rtl::OUString& rText) +sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvTreeListEntry* pEntry, const rtl::OUString& rText) /* [Description] @@ -901,14 +901,14 @@ sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const rtl::OU sal_False: The name should not be changed [Cross-references] - <SfxOrganizeListBox_Impl::EditingEntry(SvLBoxEntry* pEntry, const String& rText)> + <SfxOrganizeListBox_Impl::EditingEntry(SvTreeListEntry* pEntry, const String& rText)> */ { DBG_ASSERT(pEntry, "No Entry selected"); delete pDlg->pSuspend; pDlg->pSuspend = NULL; - SvLBoxEntry* pParent = GetParent(pEntry); + SvTreeListEntry* pParent = GetParent(pEntry); if( rText.isEmpty() ) { ErrorBox aBox( this, SfxResId( MSG_ERROR_EMPTY_NAME ) ); @@ -944,7 +944,7 @@ sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const rtl::OU //------------------------------------------------------------------------- -DragDropMode SfxOrganizeListBox_Impl::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry ) +DragDropMode SfxOrganizeListBox_Impl::NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* pEntry ) { sal_uInt16 nSourceLevel = GetModel()->GetDepth( pEntry ); if ( VIEW_FILES == GetViewType() ) @@ -959,12 +959,12 @@ DragDropMode SfxOrganizeListBox_Impl::NotifyStartDrag( TransferDataContainer&, S //------------------------------------------------------------------------- -sal_Bool SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvLBoxEntry* pEntry ) +sal_Bool SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvTreeListEntry* pEntry ) { if(!pEntry) return sal_False; SvTreeListBox *pSource = GetSourceView(); - SvLBoxEntry *pSourceEntry = pSource->FirstSelected(); + SvTreeListEntry *pSourceEntry = pSource->FirstSelected(); if(pEntry == pSourceEntry) return sal_False; sal_uInt16 nSourceLevel = pSource->GetModel()->GetDepth(pSourceEntry); @@ -1110,7 +1110,7 @@ SfxObjectShellRef SfxOrganizeListBox_Impl::GetObjectShell(const Path &rPath) //------------------------------------------------------------------------- -void SfxOrganizeListBox_Impl::RequestingChildren( SvLBoxEntry* pEntry ) +void SfxOrganizeListBox_Impl::RequestingChildren( SvTreeListEntry* pEntry ) /* [Description] @@ -1119,7 +1119,7 @@ void SfxOrganizeListBox_Impl::RequestingChildren( SvLBoxEntry* pEntry ) [Parameter] - SvLBoxEntry* pEntry the entry whose children is requested + SvTreeListEntry* pEntry the entry whose children is requested */ { @@ -1167,7 +1167,7 @@ void SfxOrganizeListBox_Impl::RequestingChildren( SvLBoxEntry* pEntry ) Image aClosedImage( aClosedBmp, aMaskColor ); Image aOpenedImage( aOpenedBmp, aMaskColor ); - SvLBoxEntry *pNew = SvTreeListBox::InsertEntry( + SvTreeListEntry *pNew = SvTreeListBox::InsertEntry( aText, aOpenedImage, aClosedImage, pEntry, bCanHaveChildren); pNew->SetUserData(bDeletable ? &bDeletable : 0); @@ -1191,7 +1191,7 @@ long SfxOrganizeListBox_Impl::ExpandingHdl() { if ( !(nImpFlags & SVLBOX_IS_EXPANDING) ) { - SvLBoxEntry* pEntry = GetHdlEntry(); + SvTreeListEntry* pEntry = GetHdlEntry(); const sal_uInt16 nLevel = GetModel()->GetDepth(pEntry); if((eViewType == VIEW_FILES && nLevel == 0) || (eViewType == VIEW_TEMPLATES && nLevel == 1)) @@ -1203,7 +1203,7 @@ long SfxOrganizeListBox_Impl::ExpandingHdl() else pMgr->DeleteObjectShell(aPath[0], aPath[1]); // Delete all SubEntries - SvLBoxEntry *pToDel = SvTreeListBox::GetEntry(pEntry, 0); + SvTreeListEntry *pToDel = SvTreeListBox::GetEntry(pEntry, 0); while(pToDel) { GetModel()->Remove(pToDel); @@ -1217,7 +1217,7 @@ long SfxOrganizeListBox_Impl::ExpandingHdl() //------------------------------------------------------------------------- sal_Bool SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText, - SvLBoxEntry* pParent, SvLBoxEntry *pEntry) const + SvTreeListEntry* pParent, SvTreeListEntry *pEntry) const /* [Description] @@ -1226,7 +1226,7 @@ sal_Bool SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText, [Parameter] const String & Name of the search entry - SvLBoxEntry* pSibling Siblings (referred to the level) + SvTreeListEntry* pSibling Siblings (referred to the level) [Return value] @@ -1234,7 +1234,7 @@ sal_Bool SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText, */ { - SvLBoxEntry* pChild = FirstChild(pParent); + SvTreeListEntry* pChild = FirstChild(pParent); while(pChild) { const String aEntryText(GetEntryText(pChild)); if(COMPARE_EQUAL == aEntryText.CompareIgnoreCaseToAscii(rText)&&(!pEntry || pEntry!=pChild)) @@ -1246,9 +1246,9 @@ sal_Bool SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText, //------------------------------------------------------------------------- -sal_uInt16 SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) const +sal_uInt16 SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvTreeListEntry* pParent) const { - SvLBoxEntry* pChild = FirstChild(pParent); + SvTreeListEntry* pChild = FirstChild(pParent); sal_uInt16 nCount = 0; while(pChild) { pChild = NextSibling(pChild); @@ -1259,16 +1259,16 @@ sal_uInt16 SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) con //------------------------------------------------------------------------- -SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType( +SvTreeListEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType, - SvLBoxEntry* pParent, + SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData ) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; const Image* pExp = NULL; const Image* pCol = NULL; @@ -1651,7 +1651,7 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool bOpen, const String& rFileNam //------------------------------------------------------------------------- -sal_Bool SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry ) +sal_Bool SfxOrganizeDlg_Impl::DontDelete_Impl( SvTreeListEntry* pEntry ) { sal_uInt16 nDepth = pFocusBox->GetModel()->GetDepth(pEntry); if(SfxOrganizeListBox_Impl::VIEW_FILES == @@ -1675,7 +1675,7 @@ sal_Bool SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry ) pEntry = pFocusBox->GetParent(pEntry); --nDepth; } - SvLBoxEntry *pTemplateEntry = pEntry; + SvTreeListEntry *pTemplateEntry = pEntry; sal_uInt16 nRegion = 0, nIndex = 0; GetIndices_Impl( pFocusBox, pTemplateEntry, nRegion, nIndex ); @@ -1709,7 +1709,7 @@ sal_Bool SfxOrganizeDlg_Impl::GetServiceName_Impl( String& rName, String& rFileU { sal_Bool bRet = sal_False; const SfxDocumentTemplates* pTemplates = aMgr.GetTemplates(); - SvLBoxEntry* pEntry = pFocusBox ? pFocusBox->FirstSelected() : NULL; + SvTreeListEntry* pEntry = pFocusBox ? pFocusBox->FirstSelected() : NULL; sal_uInt16 nRegion = 0, nIndex = 0; GetIndices_Impl( pFocusBox, pEntry, nRegion, nIndex ); rFileURL = pTemplates->GetPath( nRegion, nIndex ); @@ -1752,7 +1752,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu ) { SuspendAccel aTmp(&aEditAcc); - SvLBoxEntry *pEntry = pFocusBox? pFocusBox->FirstSelected(): 0; + SvTreeListEntry *pEntry = pFocusBox? pFocusBox->FirstSelected(): 0; sal_Bool bHandled = sal_True; switch(nId) { @@ -1765,7 +1765,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu ) if(0 == pFocusBox->GetModel()->GetDepth(pEntry)) { const rtl::OUString aNoName(SFX2_RESSTR(STR_NONAME)); - SvLBoxEntry* pParent = pFocusBox->GetParent(pEntry); + SvTreeListEntry* pParent = pFocusBox->GetParent(pEntry); rtl::OUString aName(aNoName); sal_Int32 n = 1; while(!pFocusBox->IsUniqName_Impl(aName, pParent)) @@ -1896,7 +1896,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu ) const sal_uInt16 nDocLevel = pFocusBox->GetDocLevel(); if ( !pPrt ) pPrt = new Printer; - SvLBoxEntry *pDocEntry = pEntry; + SvTreeListEntry *pDocEntry = pEntry; while ( pFocusBox->GetModel()->GetDepth( pDocEntry ) > nDocLevel ) pDocEntry = pFocusBox->GetParent( pDocEntry ); const String aName(pFocusBox->GetEntryText(pDocEntry)); @@ -1981,7 +1981,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AccelSelect_Impl, Accelerator *, pAccel ) */ { - SvLBoxEntry* pEntry = pFocusBox && pFocusBox->GetSelectionCount() ? + SvTreeListEntry* pEntry = pFocusBox && pFocusBox->GetSelectionCount() ? pFocusBox->FirstSelected() : NULL ; return pEntry && ( pAccel->GetCurItemId() == ID_NEW || !DontDelete_Impl( pEntry ) ) ? Dispatch_Impl( pAccel->GetCurItemId(), NULL ) : 0; @@ -2004,7 +2004,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu ) if ( pFocusBox && pFocusBox->IsEditingActive() ) pFocusBox->EndEditing( sal_False ); sal_Bool bEnable = ( pFocusBox && pFocusBox->GetSelectionCount() ); - SvLBoxEntry* pEntry = bEnable ? pFocusBox->FirstSelected() : NULL; + SvTreeListEntry* pEntry = bEnable ? pFocusBox->FirstSelected() : NULL; const sal_uInt16 nDepth = ( bEnable && pFocusBox->GetSelectionCount() ) ? pFocusBox->GetModel()->GetDepth( pEntry ) : 0; const sal_uInt16 nDocLevel = bEnable ? pFocusBox->GetDocLevel() : 0; diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index a2d686206ec6..fc74480a544b 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -467,11 +467,11 @@ sal_Bool SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller, { // deleting of a group - SvLBoxEntry *pGroupToDelete = pCaller->GetEntry(nRegion); + SvTreeListEntry *pGroupToDelete = pCaller->GetEntry(nRegion); if ( pGroupToDelete ) { sal_uInt16 nItemNum = (sal_uInt16)( pCaller->GetModel()->GetChildCount( pGroupToDelete ) ); - typedef std::deque<SvLBoxEntry*> BoxEntries; + typedef std::deque<SvTreeListEntry*> BoxEntries; BoxEntries pEntriesToDelete; sal_uInt16 nInd = 0; @@ -504,7 +504,7 @@ sal_Bool SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller, { bModified = 1; // Entry to be deleted. - SvLBoxEntry *pEntryToDelete = pCaller->GetEntry(pCaller->GetEntry(nRegion), nIdx); + SvTreeListEntry *pEntryToDelete = pCaller->GetEntry(pCaller->GetEntry(nRegion), nIdx); pCaller->GetModel()->Remove(pEntryToDelete); } @@ -540,7 +540,7 @@ sal_Bool SfxOrganizeMgr::InsertDir if(bOk) { bModified = 1; - SvLBoxEntry *pEntry = pCaller->InsertEntry(rText, + SvTreeListEntry *pEntry = pCaller->InsertEntry(rText, pCaller->GetOpenedBmp(0), pCaller->GetClosedBmp(0), 0, sal_True, nRegion); @@ -631,7 +631,7 @@ sal_Bool SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller, */ { - SvLBoxEntry *pParent = pCaller->FirstSelected(); + SvTreeListEntry *pParent = pCaller->FirstSelected(); if( nIdx!=USHRT_MAX ) pParent = pCaller->GetParent(pParent); if( pTemplates->CopyFrom( nRegion, nIdx, rName ) ) diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx index 00e8cd99273e..c9560722bd74 100644 --- a/svtools/inc/svtools/fileview.hxx +++ b/svtools/inc/svtools/fileview.hxx @@ -48,7 +48,7 @@ class ViewTabListBox_Impl; class SvtFileView_Impl; -class SvLBoxEntry; +class SvTreeListEntry; class HeaderBar; class IUrlFilter; @@ -94,7 +94,7 @@ public: ~SvtFileView(); const String& GetViewURL() const; - String GetURL( SvLBoxEntry* pEntry ) const; + String GetURL( SvTreeListEntry* pEntry ) const; String GetCurrentURL() const; sal_Bool GetParentURL( String& _rParentURL ) const; @@ -186,8 +186,8 @@ public: void SetOpenDoneHdl( const Link& rHdl ); sal_uLong GetSelectionCount() const; - SvLBoxEntry* FirstSelected() const; - SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const; + SvTreeListEntry* FirstSelected() const; + SvTreeListEntry* NextSelected( SvTreeListEntry* pEntry ) const; void EnableAutoResize(); void SetFocus(); diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx index 6bca37e7f492..a4e1d400c1e3 100644 --- a/svtools/inc/svtools/svlbitm.hxx +++ b/svtools/inc/svtools/svlbitm.hxx @@ -37,7 +37,7 @@ #include <vcl/image.hxx> #include <svtools/treelistbox.hxx> -class SvLBoxEntry; +class SvTreeListEntry; #define SV_BMP_UNCHECKED 0 @@ -79,11 +79,11 @@ public: // weil Buttons nicht von LinkHdl abgeleitet sind void CallLink(); - void StoreButtonState( SvLBoxEntry* pEntry, sal_uInt16 nItemFlags ); + void StoreButtonState( SvTreeListEntry* pEntry, sal_uInt16 nItemFlags ); SvButtonState ConvertToButtonState( sal_uInt16 nItemFlags ) const; inline SvButtonState GetActButtonState() const; - SvLBoxEntry* GetActEntry() const; + SvTreeListEntry* GetActEntry() const; Image aBmps[24]; // Indizes siehe Konstanten BMP_ .... @@ -119,14 +119,14 @@ class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem protected: rtl::OUString maText; public: - SvLBoxString(SvLBoxEntry*, sal_uInt16 nFlags, const rtl::OUString& rStr); + SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const rtl::OUString& rStr); SvLBoxString(); virtual ~SvLBoxString(); virtual sal_uInt16 IsA(); - virtual void InitViewData(SvTreeListBox*, SvLBoxEntry*, SvViewDataItem*); + virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*); rtl::OUString GetText() const { return maText; } void SetText( const rtl::OUString& rText ) { maText = rText; } - virtual void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); + virtual void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* ); virtual SvLBoxItem* Create() const; virtual void Clone( SvLBoxItem* pSource ); }; @@ -138,8 +138,8 @@ public: SvLBoxBmp(); virtual ~SvLBoxBmp(); virtual sal_uInt16 IsA(); - virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); - virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* ); + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* ); virtual SvLBoxItem* Create() const; virtual void Clone( SvLBoxItem* pSource ); }; @@ -165,15 +165,15 @@ public: // (which cannot be modified via UI), or a static image // (see SV_BMP_STATICIMAGE; nFlags are effectively ignored // for that kind). - SvLBoxButton( SvLBoxEntry* pEntry, + SvLBoxButton( SvTreeListEntry* pEntry, SvLBoxButtonKind eTheKind, sal_uInt16 nFlags, SvLBoxButtonData* pBData ); SvLBoxButton(); virtual ~SvLBoxButton(); - virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); virtual sal_uInt16 IsA(); - virtual sal_Bool ClickHdl(SvTreeListBox* pView, SvLBoxEntry* ); - virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* ); + virtual sal_Bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); + virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* ); virtual SvLBoxItem* Create() const; virtual void Clone( SvLBoxItem* pSource ); sal_uInt16 GetButtonFlags() const { return nItemFlags; } @@ -225,13 +225,13 @@ class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem { SvLBoxContextBmp_Impl* m_pImpl; public: - SvLBoxContextBmp( SvLBoxEntry*,sal_uInt16 nFlags,Image,Image, + SvLBoxContextBmp( SvTreeListEntry*,sal_uInt16 nFlags,Image,Image, sal_uInt16 nEntryFlagsBmp1); SvLBoxContextBmp(); virtual ~SvLBoxContextBmp(); virtual sal_uInt16 IsA(); - virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); - virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* ); + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* ); virtual SvLBoxItem* Create() const; virtual void Clone( SvLBoxItem* pSource ); diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx index ef9a2d1b1c3f..d219b93dc3ef 100644 --- a/svtools/inc/svtools/svtabbx.hxx +++ b/svtools/inc/svtools/svtabbx.hxx @@ -44,11 +44,11 @@ enum SvTabJustify struct TabListBoxEventData { - SvLBoxEntry* m_pEntry; + SvTreeListEntry* m_pEntry; sal_uInt16 m_nColumn; String m_sOldText; - TabListBoxEventData( SvLBoxEntry* pEntry, sal_uInt16 nColumn, const String& rOldText ) : + TabListBoxEventData( SvTreeListEntry* pEntry, sal_uInt16 nColumn, const String& rOldText ) : m_pEntry( pEntry ), m_nColumn( nColumn ), m_sOldText( rOldText ) {} }; @@ -60,16 +60,16 @@ private: XubString aCurEntry; protected: - SvLBoxEntry* pViewParent; + SvTreeListEntry* pViewParent; static const xub_Unicode* GetToken( const xub_Unicode* pPtr, sal_uInt16& rLen ); virtual void SetTabs(); - virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); + virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); String GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const; - SvLBoxEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const; - SvLBoxEntry* GetChildOnPos( SvLBoxEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const; + SvTreeListEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const; + SvTreeListEntry* GetChildOnPos( SvTreeListEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const; public: SvTabListBox( Window* pParent, WinBits = WB_BORDER ); @@ -82,36 +82,36 @@ public: void SetTab( sal_uInt16 nTab, long nValue, MapUnit = MAP_APPFONT ); long GetLogicTab( sal_uInt16 nTab ); - virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0, + virtual SvTreeListEntry* InsertEntry( const XubString& rText, SvTreeListEntry* pParent = 0, sal_Bool bChildrenOnDemand = sal_False, sal_uLong nPos=LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); - virtual SvLBoxEntry* InsertEntry( const XubString& rText, + virtual SvTreeListEntry* InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvLBoxEntry* pParent = 0, + SvTreeListEntry* pParent = 0, sal_Bool bChildrenOnDemand = sal_False, sal_uLong nPos = LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, + virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, SvLBoxEntry* pParent, + virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, - const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL, + virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, + const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); - virtual String GetEntryText( SvLBoxEntry* pEntry ) const; - String GetEntryText( SvLBoxEntry*, sal_uInt16 nCol ) const; + virtual String GetEntryText( SvTreeListEntry* pEntry ) const; + String GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ) const; String GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0xffff ) const; using SvTreeListBox::SetEntryText; void SetEntryText( const XubString&, sal_uLong, sal_uInt16 nCol=0xffff ); - void SetEntryText(const XubString&,SvLBoxEntry*,sal_uInt16 nCol=0xffff); + void SetEntryText(const XubString&,SvTreeListEntry*,sal_uInt16 nCol=0xffff); String GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const; sal_uLong GetEntryPos( const XubString&, sal_uInt16 nCol = 0xffff ); - sal_uLong GetEntryPos( const SvLBoxEntry* pEntry ) const; + sal_uLong GetEntryPos( const SvTreeListEntry* pEntry ) const; virtual void Resize(); void SetTabJustify( sal_uInt16 nTab, SvTabJustify ); @@ -155,18 +155,18 @@ public: virtual void Paint( const Rectangle& ); void InitHeaderBar( HeaderBar* pHeaderBar ); - sal_Bool IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const; + sal_Bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const; - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, + virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, SvLBoxEntry* pParent, + virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, - const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL, + virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, + const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); - virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND); - virtual sal_uLong Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos = LIST_APPEND ); - void RemoveEntry( SvLBoxEntry* _pEntry ); + virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=LIST_APPEND); + virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = LIST_APPEND ); + void RemoveEntry( SvTreeListEntry* _pEntry ); void Clear(); // Accessible ------------------------------------------------------------- diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index f7d04a95282a..2f4e06a323a7 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -52,7 +52,7 @@ #define LISTACTION_RESORTED 10 #define LISTACTION_CLEARED 11 -#define SV_TREELIST_ROOT_ENTRY (SvListEntry*)0 +#define SV_TREELIST_ROOT_ENTRY (SvTreeListEntry*)0 #define SV_TREELIST_ERROR 0xFFFFFFFF // Entryflags, die an der View haengen @@ -62,12 +62,12 @@ #define SVLISTENTRYFLAG_CURSORED 0x0008 #define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010 -class SvListEntry; +class SvTreeListEntry; class SVT_DLLPUBLIC SvTreeEntryList { private: - typedef std::vector<SvListEntry*> ListType; + typedef std::vector<SvTreeListEntry*> ListType; ListType maEntryList; public: @@ -78,28 +78,28 @@ public: SvTreeEntryList(const SvTreeEntryList& rList); void DestroyAll(); - void push_back(SvListEntry* pItem); - void insert(SvListEntry* pItem, size_t i); - void remove(SvListEntry* pItem); + void push_back(SvTreeListEntry* pItem); + void insert(SvTreeListEntry* pItem, size_t i); + void remove(SvTreeListEntry* pItem); void remove(size_t i); - void replace(SvListEntry* pNew, SvListEntry* pOld); + void replace(SvTreeListEntry* pNew, SvTreeListEntry* pOld); void clear(); bool empty() const; size_t size() const; - size_t GetPos(const SvListEntry* pItem) const; + size_t GetPos(const SvTreeListEntry* pItem) const; - SvListEntry* operator[](size_t i); - const SvListEntry* operator[](size_t i) const; + SvTreeListEntry* operator[](size_t i); + const SvTreeListEntry* operator[](size_t i) const; const_iterator begin() const; const_iterator end() const; iterator begin(); iterator end(); - SvListEntry* front(); - SvListEntry* back(); + SvTreeListEntry* front(); + SvTreeListEntry* back(); }; class SvListView; @@ -167,8 +167,8 @@ enum SvSortMode { SortAscending, SortDescending, SortNone }; // ( Compare(a,b) ==> b.Compare(a) ==> strcmp(a,b) ) struct SvSortData { - SvListEntry* pLeft; - SvListEntry* pRight; + SvTreeListEntry* pLeft; + SvTreeListEntry* pRight; }; class SVT_DLLPUBLIC SvTreeList @@ -188,35 +188,35 @@ class SVT_DLLPUBLIC SvTreeList sal_Bool bAbsPositionsValid; - SvListEntry* FirstVisible() const { return First(); } - SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=0 ) const; - SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const; - SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const; + SvTreeListEntry* FirstVisible() const { return First(); } + SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const; + SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const; - sal_Bool IsEntryVisible( const SvListView*,SvListEntry* pEntry ) const; - SvListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const; - sal_uLong GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const; + sal_Bool IsEntryVisible( const SvListView*,SvTreeListEntry* pEntry ) const; + SvTreeListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const; + sal_uLong GetVisiblePos( const SvListView*,SvTreeListEntry* pEntry ) const; sal_uLong GetVisibleCount( SvListView* ) const; - sal_uLong GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const; + sal_uLong GetVisibleChildCount( const SvListView*,SvTreeListEntry* pParent ) const; - SvListEntry* FirstSelected( const SvListView*) const; - SvListEntry* NextSelected( const SvListView*,SvListEntry* pEntry ) const; - SvListEntry* PrevSelected( const SvListView*,SvListEntry* pEntry ) const; - SvListEntry* LastSelected( const SvListView*) const; + SvTreeListEntry* FirstSelected( const SvListView*) const; + SvTreeListEntry* NextSelected( const SvListView*,SvTreeListEntry* pEntry ) const; + SvTreeListEntry* PrevSelected( const SvListView*,SvTreeListEntry* pEntry ) const; + SvTreeListEntry* LastSelected( const SvListView*) const; - sal_Bool Select( SvListView*,SvListEntry* pEntry, sal_Bool bSelect=sal_True ); + sal_Bool Select( SvListView*,SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); void SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl - sal_uLong GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const; + sal_uLong GetChildSelectionCount( const SvListView*,SvTreeListEntry* pParent ) const; - void Expand( SvListView*,SvListEntry* pParent ); - void Collapse( SvListView*,SvListEntry* pParent ); + void Expand( SvListView*,SvTreeListEntry* pParent ); + void Collapse( SvListView*,SvTreeListEntry* pParent ); SVT_DLLPRIVATE void SetAbsolutePositions(); SVT_DLLPRIVATE SvTreeEntryList*CloneChildren( SvTreeEntryList* pChildren, - SvListEntry* pNewParent, + SvTreeListEntry* pNewParent, sal_uLong& nCloneCount ) const; @@ -224,15 +224,15 @@ class SVT_DLLPUBLIC SvTreeList // rPos wird bei SortModeNone nicht geaendert SVT_DLLPRIVATE void GetInsertionPos( - SvListEntry* pEntry, - SvListEntry* pParent, + SvTreeListEntry* pEntry, + SvTreeListEntry* pParent, sal_uLong& rPos ); - SVT_DLLPRIVATE void ResortChildren( SvListEntry* pParent ); + SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent ); protected: - SvListEntry* pRootItem; + SvTreeListEntry* pRootItem; public: @@ -249,85 +249,85 @@ public: void Broadcast( sal_uInt16 nActionId, - SvListEntry* pEntry1=0, - SvListEntry* pEntry2=0, + SvTreeListEntry* pEntry1=0, + SvTreeListEntry* pEntry2=0, sal_uLong nPos=0 ); // informiert alle Listener - void InvalidateEntry( SvListEntry* ); + void InvalidateEntry( SvTreeListEntry* ); sal_uLong GetEntryCount() const { return nEntryCount; } - SvListEntry* First() const; - SvListEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvListEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvListEntry* Last() const; - - SvListEntry* FirstChild( SvListEntry* pParent ) const; - SvListEntry* NextSibling( SvListEntry* pEntry ) const; - SvListEntry* PrevSibling( SvListEntry* pEntry ) const; - SvListEntry* LastSibling( SvListEntry* pEntry ) const; - - sal_uLong Insert( SvListEntry* pEntry,SvListEntry* pPar,sal_uLong nPos=ULONG_MAX); - sal_uLong Insert( SvListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX ) + SvTreeListEntry* First() const; + SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* Last() const; + + SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; + SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const; + SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const; + SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ) const; + + sal_uLong Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pPar,sal_uLong nPos=ULONG_MAX); + sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX ) { return Insert(pEntry, pRootItem, nRootPos ); } - void InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent, sal_uLong nListPos ); + void InsertTree( SvTreeListEntry* pTree, SvTreeListEntry* pTargetParent, sal_uLong nListPos ); // Entries muessen im gleichen Model stehen! - void Move( SvListEntry* pSource, SvListEntry* pTarget ); + void Move( SvTreeListEntry* pSource, SvTreeListEntry* pTarget ); // erzeugt ggf. Child-List - sal_uLong Move( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos); - void Copy( SvListEntry* pSource, SvListEntry* pTarget ); - sal_uLong Copy( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos); + sal_uLong Move( SvTreeListEntry* pSource, SvTreeListEntry* pTargetParent, sal_uLong nListPos); + void Copy( SvTreeListEntry* pSource, SvTreeListEntry* pTarget ); + sal_uLong Copy( SvTreeListEntry* pSource, SvTreeListEntry* pTargetParent, sal_uLong nListPos); - sal_Bool Remove( SvListEntry* pEntry ); + sal_Bool Remove( SvTreeListEntry* pEntry ); void Clear(); - sal_Bool HasChildren( SvListEntry* pEntry ) const; - sal_Bool HasParent( SvListEntry* pEntry ) const + sal_Bool HasChildren( SvTreeListEntry* pEntry ) const; + sal_Bool HasParent( SvTreeListEntry* pEntry ) const { return (sal_Bool)(pEntry->pParent!=pRootItem); } - bool IsChild(const SvListEntry* pParent, const SvListEntry* pChild) const; - SvListEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const; - SvListEntry* GetEntry( sal_uLong nRootPos ) const; - SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const; - SvListEntry* GetParent( SvListEntry* pEntry ) const; - SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const; - SvTreeEntryList* GetChildList( SvListEntry* pParent ) const; + bool IsChild(const SvTreeListEntry* pParent, const SvTreeListEntry* pChild) const; + SvTreeListEntry* GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const; + SvTreeListEntry* GetEntry( sal_uLong nRootPos ) const; + SvTreeListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const; + SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const; + SvTreeListEntry* GetRootLevelParent( SvTreeListEntry* pEntry ) const; + SvTreeEntryList* GetChildList( SvTreeListEntry* pParent ) const; - sal_uLong GetAbsPos( SvListEntry* pEntry ) const; - sal_uLong GetRelPos( SvListEntry* pChild ) const + sal_uLong GetAbsPos( SvTreeListEntry* pEntry ) const; + sal_uLong GetRelPos( SvTreeListEntry* pChild ) const { return pChild->GetChildListPos(); } - sal_uLong GetChildCount( SvListEntry* pParent ) const; - sal_uInt16 GetDepth( SvListEntry* pEntry ) const; - sal_Bool IsAtRootDepth( SvListEntry* pEntry ) const + sal_uLong GetChildCount( SvTreeListEntry* pParent ) const; + sal_uInt16 GetDepth( SvTreeListEntry* pEntry ) const; + sal_Bool IsAtRootDepth( SvTreeListEntry* pEntry ) const { return (sal_Bool)(pEntry->pParent==pRootItem); } // das Model ruft zum Clonen von Entries den Clone-Link auf, // damit man sich nicht vom Model ableiten muss, wenn man - // sich von SvListEntry ableitet. + // sich von SvTreeListEntry ableitet. // Deklaration des Clone-Handlers: - // DECL_LINK(CloneHdl,SvListEntry*); - // der Handler muss einen SvListEntry* zurueckgeben - SvListEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const; + // DECL_LINK(CloneHdl,SvTreeListEntry*); + // der Handler muss einen SvTreeListEntry* zurueckgeben + SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const; void SetCloneLink( const Link& rLink ) { aCloneLink=rLink; } const Link& GetCloneLink() const { return aCloneLink; } - virtual SvListEntry* CloneEntry( SvListEntry* ) const; // ruft den Clone-Link - virtual SvListEntry* CreateEntry() const; // zum 'new'en von Entries + virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* ) const; // ruft den Clone-Link + virtual SvTreeListEntry* CreateEntry() const; // zum 'new'en von Entries sal_uInt16 GetRefCount() const { return nRefCount; } void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; } void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; } SvSortMode GetSortMode() const { return eSortMode; } - virtual StringCompare Compare( SvListEntry*, SvListEntry* ) const; + virtual StringCompare Compare( SvTreeListEntry*, SvTreeListEntry* ) const; void SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; } const Link& GetCompareHdl() const { return aCompareLink; } void Resort(); @@ -339,23 +339,23 @@ class SVT_DLLPUBLIC SvListView { friend class SvTreeList; - typedef boost::ptr_map<SvListEntry*, SvViewData> SvDataTable; + typedef boost::ptr_map<SvTreeListEntry*, SvViewData> SvDataTable; sal_uLong nVisibleCount; sal_uLong nSelectionCount; sal_Bool bVisPositionsValid; SVT_DLLPRIVATE void InitTable(); - SVT_DLLPRIVATE void RemoveViewData( SvListEntry* pParent ); + SVT_DLLPRIVATE void RemoveViewData( SvTreeListEntry* pParent ); - SvDataTable maDataTable; // Mapping SvListEntry -> ViewData + SvDataTable maDataTable; // Mapping SvTreeListEntry -> ViewData - void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos); - void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos); - void ActionInserted( SvListEntry* pEntry ); - void ActionInsertedTree( SvListEntry* pEntry ); - void ActionRemoving( SvListEntry* pEntry ); - void ActionRemoved( SvListEntry* pEntry ); + void ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry* pTargetPrnt,sal_uLong nChildPos); + void ActionMoved( SvTreeListEntry* pEntry,SvTreeListEntry* pTargetPrnt,sal_uLong nChildPos); + void ActionInserted( SvTreeListEntry* pEntry ); + void ActionInsertedTree( SvTreeListEntry* pEntry ); + void ActionRemoving( SvTreeListEntry* pEntry ); + void ActionRemoved( SvTreeListEntry* pEntry ); void ActionClear(); protected: @@ -369,107 +369,107 @@ public: virtual void SetModel( SvTreeList* ); virtual void ModelNotification( sal_uInt16 nActionId, - SvListEntry* pEntry1, - SvListEntry* pEntry2, + SvTreeListEntry* pEntry1, + SvTreeListEntry* pEntry2, sal_uLong nPos ); sal_uLong GetVisibleCount() const { return pModel->GetVisibleCount( (SvListView*)this ); } - SvListEntry* FirstVisible() const + SvTreeListEntry* FirstVisible() const { return pModel->FirstVisible(); } - SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const + SvTreeListEntry* NextVisible( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const { return pModel->NextVisible(this,pEntry,pDepth); } - SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const + SvTreeListEntry* PrevVisible( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const { return pModel->PrevVisible(this,pEntry,pDepth); } - SvListEntry* LastVisible( sal_uInt16* pDepth=0 ) const + SvTreeListEntry* LastVisible( sal_uInt16* pDepth=0 ) const { return pModel->LastVisible(this,pDepth); } - SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const + SvTreeListEntry* NextVisible( SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const { return pModel->NextVisible(this,pEntry,rDelta); } - SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const + SvTreeListEntry* PrevVisible( SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const { return pModel->PrevVisible(this,pEntry,rDelta); } sal_uLong GetSelectionCount() const { return nSelectionCount; } - SvListEntry* FirstSelected() const + SvTreeListEntry* FirstSelected() const { return pModel->FirstSelected(this); } - SvListEntry* NextSelected( SvListEntry* pEntry ) const + SvTreeListEntry* NextSelected( SvTreeListEntry* pEntry ) const { return pModel->NextSelected(this,pEntry); } - SvListEntry* PrevSelected( SvListEntry* pEntry ) const + SvTreeListEntry* PrevSelected( SvTreeListEntry* pEntry ) const { return pModel->PrevSelected(this,pEntry); } - SvListEntry* LastSelected() const + SvTreeListEntry* LastSelected() const { return pModel->LastSelected(this); } - SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const + SvTreeListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const { return pModel->GetEntryAtAbsPos(nAbsPos); } - SvListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const + SvTreeListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); } - sal_uLong GetAbsPos( SvListEntry* pEntry ) const + sal_uLong GetAbsPos( SvTreeListEntry* pEntry ) const { return pModel->GetAbsPos(pEntry); } - sal_uLong GetVisiblePos( SvListEntry* pEntry ) const + sal_uLong GetVisiblePos( SvTreeListEntry* pEntry ) const { return pModel->GetVisiblePos((SvListView*)this,pEntry); } - sal_uLong GetVisibleChildCount(SvListEntry* pParent ) const + sal_uLong GetVisibleChildCount(SvTreeListEntry* pParent ) const { return pModel->GetVisibleChildCount((SvListView*)this,pParent); } - sal_uLong GetChildSelectionCount( SvListEntry* pParent ) const + sal_uLong GetChildSelectionCount( SvTreeListEntry* pParent ) const { return pModel->GetChildSelectionCount((SvListView*)this,pParent); } - void Expand( SvListEntry* pParent ) + void Expand( SvTreeListEntry* pParent ) { pModel->Expand((SvListView*)this,pParent); } - void Collapse( SvListEntry* pParent ) + void Collapse( SvTreeListEntry* pParent ) { pModel->Collapse((SvListView*)this,pParent); } - sal_Bool Select( SvListEntry* pEntry, sal_Bool bSelect=sal_True ) + sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ) { return pModel->Select((SvListView*)this,pEntry,bSelect); } // ruft nicht Select-Hdl virtual void SelectAll( sal_Bool bSelect, sal_Bool ) { pModel->SelectAll((SvListView*)this, bSelect); } - sal_Bool IsEntryVisible( SvListEntry* pEntry ) const + sal_Bool IsEntryVisible( SvTreeListEntry* pEntry ) const { return pModel->IsEntryVisible((SvListView*)this,pEntry); } - sal_Bool IsExpanded( SvListEntry* pEntry ) const; - sal_Bool IsSelected( SvListEntry* pEntry ) const; - sal_Bool HasEntryFocus( SvListEntry* pEntry ) const; - void SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ); - const SvViewData* GetViewData( SvListEntry* pEntry ) const; - SvViewData* GetViewData( SvListEntry* pEntry ); + sal_Bool IsExpanded( SvTreeListEntry* pEntry ) const; + sal_Bool IsSelected( SvTreeListEntry* pEntry ) const; + sal_Bool HasEntryFocus( SvTreeListEntry* pEntry ) const; + void SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus ); + const SvViewData* GetViewData( SvTreeListEntry* pEntry ) const; + SvViewData* GetViewData( SvTreeListEntry* pEntry ); sal_Bool HasViewData() const { return maDataTable.size() > 1; } // eine ROOT gibts immer - virtual SvViewData* CreateViewData( SvListEntry* pEntry ); - virtual void InitViewData( SvViewData*, SvListEntry* pEntry ); + virtual SvViewData* CreateViewData( SvTreeListEntry* pEntry ); + virtual void InitViewData( SvViewData*, SvTreeListEntry* pEntry ); virtual void ModelHasCleared(); - virtual void ModelHasInserted( SvListEntry* pEntry ); - virtual void ModelHasInsertedTree( SvListEntry* pEntry ); + virtual void ModelHasInserted( SvTreeListEntry* pEntry ); + virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ); virtual void ModelIsMoving( - SvListEntry* pSource, - SvListEntry* pTargetParent, + SvTreeListEntry* pSource, + SvTreeListEntry* pTargetParent, sal_uLong nPos ); - virtual void ModelHasMoved( SvListEntry* pSource ); - virtual void ModelIsRemoving( SvListEntry* pEntry ); - virtual void ModelHasRemoved( SvListEntry* pEntry ); - virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); + virtual void ModelHasMoved( SvTreeListEntry* pSource ); + virtual void ModelIsRemoving( SvTreeListEntry* pEntry ); + virtual void ModelHasRemoved( SvTreeListEntry* pEntry ); + virtual void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ); }; -inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry ) const +inline sal_Bool SvListView::IsExpanded( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); SvDataTable::const_iterator itr = maDataTable.find(pEntry); @@ -477,7 +477,7 @@ inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry ) const return itr->second->IsExpanded(); } -inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const +inline sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); SvDataTable::const_iterator itr = maDataTable.find(pEntry ); @@ -485,7 +485,7 @@ inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const return itr->second->IsSelected(); } -inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const +inline sal_Bool SvListView::HasEntryFocus( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); SvDataTable::const_iterator itr = maDataTable.find(pEntry ); @@ -493,7 +493,7 @@ inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const return itr->second->HasFocus(); } -inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) +inline void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus ) { DBG_ASSERT(pEntry,"SetEntryFocus:No Entry"); SvDataTable::iterator itr = maDataTable.find(pEntry); @@ -501,7 +501,7 @@ inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) itr->second->SetFocus(bFocus); } -inline const SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) const +inline const SvViewData* SvListView::GetViewData( SvTreeListEntry* pEntry ) const { #ifndef DBG_UTIL return maDataTable.find( pEntry )->second; @@ -512,7 +512,7 @@ inline const SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) const #endif } -inline SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) +inline SvViewData* SvListView::GetViewData( SvTreeListEntry* pEntry ) { #ifndef DBG_UTIL return maDataTable.find( pEntry )->second; @@ -523,40 +523,40 @@ inline SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) #endif } -inline sal_Bool SvTreeList::HasChildren( SvListEntry* pEntry ) const +inline sal_Bool SvTreeList::HasChildren( SvTreeListEntry* pEntry ) const { if ( !pEntry ) pEntry = pRootItem; return (sal_Bool)(pEntry->pChildren != 0); } -inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, sal_uLong nPos ) const +inline SvTreeListEntry* SvTreeList::GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const { if ( !pParent ) pParent = pRootItem; - SvListEntry* pRet = 0; + SvTreeListEntry* pRet = 0; if ( pParent->pChildren ) pRet = (*pParent->pChildren)[ nPos ]; return pRet; } -inline SvListEntry* SvTreeList::GetEntry( sal_uLong nRootPos ) const +inline SvTreeListEntry* SvTreeList::GetEntry( sal_uLong nRootPos ) const { - SvListEntry* pRet = 0; + SvTreeListEntry* pRet = 0; if ( nEntryCount ) pRet = (*pRootItem->pChildren)[ nRootPos ]; return pRet; } -inline SvTreeEntryList* SvTreeList::GetChildList( SvListEntry* pParent ) const +inline SvTreeEntryList* SvTreeList::GetChildList( SvTreeListEntry* pParent ) const { if ( !pParent ) pParent = pRootItem; return pParent->pChildren; } -inline SvListEntry* SvTreeList::GetParent( SvListEntry* pEntry ) const +inline SvTreeListEntry* SvTreeList::GetParent( SvTreeListEntry* pEntry ) const { - SvListEntry* pParent = pEntry->pParent; + SvTreeListEntry* pParent = pEntry->pParent; if ( pParent==pRootItem ) pParent = 0; return pParent; diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx index bb97ed743965..ceb7497cac2c 100644 --- a/svtools/inc/svtools/treelistbox.hxx +++ b/svtools/inc/svtools/treelistbox.hxx @@ -48,7 +48,7 @@ class Application; class SvTreeListBox; -class SvLBoxEntry; +class SvTreeListEntry; class SvViewDataItem; class SvViewDataEntry; class SvInplaceEdit2; @@ -174,11 +174,11 @@ public: class SVT_DLLPUBLIC SvLBoxItem { public: - SvLBoxItem( SvLBoxEntry*, sal_uInt16 nFlags ); + SvLBoxItem( SvTreeListEntry*, sal_uInt16 nFlags ); SvLBoxItem(); virtual ~SvLBoxItem(); virtual sal_uInt16 IsA() = 0; - const Size& GetSize( SvTreeListBox* pView, SvLBoxEntry* pEntry ); + const Size& GetSize( SvTreeListBox* pView, SvTreeListEntry* pEntry ); const Size& GetSize( SvViewDataEntry* pData, sal_uInt16 nItemPos ) { SvViewDataItem* pIData=pData->pItemData+nItemPos; @@ -187,9 +187,9 @@ public: virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, sal_uInt16 nViewDataEntryFlags, - SvLBoxEntry* pEntry ) = 0; + SvTreeListEntry* pEntry ) = 0; - virtual void InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, + virtual void InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, // wenn != 0 muss dieser Pointer benutzt werden! // wenn == 0 muss er ueber die View geholt werden SvViewDataItem* pViewData = 0) = 0; @@ -201,19 +201,19 @@ public: class SVT_DLLPUBLIC SvLBoxTreeList : public SvTreeList { public: - SvLBoxEntry* First() const; - SvLBoxEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvLBoxEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvLBoxEntry* Last() const; - SvLBoxEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const; - SvLBoxEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const; - SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const; - SvLBoxEntry* GetParent( SvListEntry* pEntry ) const; - SvLBoxEntry* FirstChild( SvLBoxEntry* pParent ) const; - SvLBoxEntry* NextSibling( SvLBoxEntry* pEntry ) const; - SvLBoxEntry* PrevSibling( SvLBoxEntry* pEntry ) const; - SvLBoxEntry* LastSibling( SvLBoxEntry* pEntry ) const; - SvLBoxEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const; + SvTreeListEntry* First() const; + SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* Last() const; + SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const; + SvTreeListEntry* GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const; + SvTreeListEntry* GetEntry( sal_uLong nRootPos ) const; + SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const; + SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; + SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const; + SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const; + SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ) const; + SvTreeListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const; }; // ********************************************************************* @@ -281,7 +281,7 @@ class SVT_DLLPUBLIC SvTreeListBox long mnCheckboxItemWidth; - SvLBoxEntry* pHdlEntry; + SvTreeListEntry* pHdlEntry; SvLBoxItem* pHdlItem; DragDropMode nDragDropMode; @@ -289,12 +289,12 @@ class SVT_DLLPUBLIC SvTreeListBox SelectionMode eSelMode; sal_Int8 nDragOptions; - SvLBoxEntry* pEdEntry; + SvTreeListEntry* pEdEntry; SvLBoxItem* pEdItem; protected: Link aDoubleClickHdl; - SvLBoxEntry* pTargetEntry; + SvTreeListEntry* pTargetEntry; SvLBoxButtonData* pCheckButtonData; std::vector<SvLBoxTab*> aTabs; sal_uInt16 nTreeFlags; @@ -308,7 +308,7 @@ private: DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * ); DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * ); // Handler, der von TreeList zum Clonen eines Entries aufgerufen wird - DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvListEntry* ); + DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvTreeListEntry* ); // handler and methods for Drag - finished handler. // The with get GetDragFinishedHdl() get link can set on the @@ -323,13 +323,13 @@ private: protected: sal_Bool CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 ); - void ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow); + void ImplShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool bShow); void EnableSelectionAsDropTarget( sal_Bool bEnable = sal_True, sal_Bool bWithChildren = sal_True ); // standard impl gibt 0 zurueck; muss von abgeleiteten Klassen, die // D&D unterstuetzen, ueberladen werden using Window::GetDropTarget; - virtual SvLBoxEntry* GetDropTarget( const Point& ); + virtual SvTreeListEntry* GetDropTarget( const Point& ); // view-spezifische Daten in den Dragserver stellen // wird an der Source-View aufgerufen (im BeginDrag-Handler) @@ -340,8 +340,8 @@ protected: // invalidate children on enable/disable virtual void StateChanged( StateChangedType eType ); - virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND); - virtual sal_uLong Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos = LIST_APPEND ); + virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=LIST_APPEND); + virtual sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = LIST_APPEND ); // Inplace-Editing SvInplaceEdit2* pEdCtrl; @@ -353,14 +353,14 @@ protected: bool IsEmptyTextAllowed() const; // Rueckgabewert muss von SvViewDataEntry abgeleitet sein! - virtual SvViewData* CreateViewData( SvListEntry* ); + virtual SvViewData* CreateViewData( SvTreeListEntry* ); // InitViewData wird direkt nach CreateViewData aufgerufen // In InitViewData ist der Entry noch nicht in die View eingefuegt! - virtual void InitViewData( SvViewData*, SvListEntry* pEntry ); + virtual void InitViewData( SvViewData*, SvTreeListEntry* pEntry ); // ruft fuer Items aller Entries InitViewData auf void RecalcViewData(); // Callback von RecalcViewData - virtual void ViewDataInitialized( SvLBoxEntry* ); + virtual void ViewDataInitialized( SvTreeListEntry* ); // handler and methods for Drag - finished handler. This link can be set // to the TransferDataContainer. The AddBox/RemoveBox methods must be @@ -398,47 +398,40 @@ public: sal_uInt16 IsA(); sal_uLong GetEntryCount() const {return pModel->GetEntryCount();} - SvLBoxEntry* First() const { return (SvLBoxEntry*)(pModel->First()); } - SvLBoxEntry* Next( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Next(pEntry,pDepth));} - SvLBoxEntry* Prev( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));} - SvLBoxEntry* Last() const { return (SvLBoxEntry*)(pModel->Last()); } - - SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); } - SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); } - SvLBoxEntry* PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); } - - SvLBoxEntry* FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); } - using SvListView::NextSelected; - SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::NextSelected(pEntry)); } - using SvListView::PrevSelected; - SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); } - SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); } - - sal_Bool CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTarget ); - sal_Bool MoveSelection( SvTreeListBox* pSource, SvLBoxEntry* pTarget ); - sal_Bool MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback ); + SvTreeListEntry* First() const { return (SvTreeListEntry*)(pModel->First()); } + SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const { return pModel->Next(pEntry,pDepth); } + SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const { return pModel->Prev(pEntry,pDepth); } + SvTreeListEntry* Last() const { return pModel->Last(); } + + SvTreeListEntry* FirstChild(SvTreeListEntry* pParent ) const { return pModel->FirstChild(pParent); } + SvTreeListEntry* NextSibling(SvTreeListEntry* pEntry ) const { return pModel->NextSibling(pEntry); } + SvTreeListEntry* PrevSibling(SvTreeListEntry* pEntry ) const { return pModel->PrevSibling(pEntry); } + + sal_Bool CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); + sal_Bool MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); + sal_Bool MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, sal_Bool bAllowCopyFallback ); void RemoveSelection(); DragDropMode GetDragDropMode() const { return nDragDropMode; } SelectionMode GetSelectionMode() const { return eSelMode; } // pParent==0 -> Root-Ebene - SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uLong nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); } - SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); } + SvTreeListEntry* GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const { return pModel->GetEntry(pParent, nPos); } + SvTreeListEntry* GetEntry( sal_uLong nRootPos ) const { return pModel->GetEntry(nRootPos); } - SvLBoxEntry* GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const; - void FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const; + SvTreeListEntry* GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const; + void FillEntryPath( SvTreeListEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const; using Window::GetParent; - SvLBoxEntry* GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); } - SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));} + SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const { return pModel->GetParent(pEntry); } + SvTreeListEntry* GetRootLevelParent(SvTreeListEntry* pEntry ) const { return pModel->GetRootLevelParent(pEntry);} using Window::GetChildCount; - sal_uLong GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); } - sal_uLong GetLevelChildCount( SvLBoxEntry* pParent ) const; + sal_uLong GetChildCount( SvTreeListEntry* pParent ) const { return pModel->GetChildCount(pParent); } + sal_uLong GetLevelChildCount( SvTreeListEntry* pParent ) const; - SvViewDataEntry* GetViewDataEntry( SvListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); } - SvViewDataItem* GetViewDataItem( SvListEntry*, SvLBoxItem* ) const; + SvViewDataEntry* GetViewDataEntry( SvTreeListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); } + SvViewDataItem* GetViewDataItem( SvTreeListEntry*, SvLBoxItem* ) const; bool IsInplaceEditingEnabled() const { return ((nImpFlags & SVLBOX_EDT_ENABLED) != 0); } bool IsEditingActive() const { return ((nImpFlags & SVLBOX_IN_EDT) != 0); } @@ -498,12 +491,12 @@ public: virtual void DeselectHdl(); virtual sal_Bool DoubleClickHdl(); sal_Bool IsTravelSelect() const { return (sal_Bool)((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);} - SvLBoxEntry* GetHdlEntry() const { return pHdlEntry; } + SvTreeListEntry* GetHdlEntry() const { return pHdlEntry; } SvLBoxItem* GetHdlItem() const; // wird aufgerufen, wenn ein Eintrag mit gesetztem // ENTRYFLAG_CHILDREN_ON_DEMAND expandiert wird. - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); // Drag & Drop @@ -512,33 +505,33 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvLBoxEntry* ); + SvTreeListEntry* ); virtual void DragFinished( sal_Int8 nDropAction ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } sal_Int8 GetDragOptions() const { return nDragOptions; } SvTreeListBox* GetSourceView() const; - virtual void NotifyRemoving( SvLBoxEntry* ); - virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource ); - virtual SvLBoxEntry* CreateEntry() const; // zum 'new'en von Entries + virtual void NotifyRemoving( SvTreeListEntry* ); + virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ); + virtual SvTreeListEntry* CreateEntry() const; // zum 'new'en von Entries // Rueckgabe: sal_True==Ok, sal_False==Abbrechen virtual sal_Bool NotifyMoving( - SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() - SvLBoxEntry* pEntry, // Zu verschiebender Entry aus + SvTreeListEntry* pTarget, // D&D-Drop-Position in this->GetModel() + SvTreeListEntry* pEntry, // Zu verschiebender Entry aus // GetSourceListBox()->GetModel() - SvLBoxEntry*& rpNewParent, // Neuer Target-Parent + SvTreeListEntry*& rpNewParent, // Neuer Target-Parent sal_uLong& rNewChildPos); // Position in Childlist des Target-Parents // Rueckgabe: sal_True==Ok, sal_False==Abbrechen virtual sal_Bool NotifyCopying( - SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() - SvLBoxEntry* pEntry, // Zu kopierender Entry aus + SvTreeListEntry* pTarget, // D&D-Drop-Position in this->GetModel() + SvTreeListEntry* pEntry, // Zu kopierender Entry aus // GetSourceListBox()->GetModel() - SvLBoxEntry*& rpNewParent, // Neuer Target-Parent + SvTreeListEntry*& rpNewParent, // Neuer Target-Parent sal_uLong& rNewChildPos); // Position in Childlist des Target-Parents // ACCESSIBILITY ========================================================== @@ -551,13 +544,13 @@ public: virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const; /** Fills the StateSet of one entry. */ - virtual void FillAccessibleEntryStateSet( SvLBoxEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; + virtual void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; /** Calculate and returns the bounding rectangle of an entry. @param pEntry The entry. @return The bounding rectangle of an entry. */ - virtual Rectangle GetBoundingRect( SvLBoxEntry* pEntry ); + virtual Rectangle GetBoundingRect( SvTreeListEntry* pEntry ); /** Enables, that one cell of a tablistbox entry can be focused */ void EnableCellFocus(); @@ -571,23 +564,23 @@ protected: SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize); SVT_DLLPRIVATE short GetHeightOffset( const Font& rFont, Size& rLogicSize); - SVT_DLLPRIVATE void SetEntryHeight( SvLBoxEntry* pEntry ); + SVT_DLLPRIVATE void SetEntryHeight( SvTreeListEntry* pEntry ); SVT_DLLPRIVATE void AdjustEntryHeight( const Image& rBmp ); SVT_DLLPRIVATE void AdjustEntryHeight( const Font& rFont ); - SVT_DLLPRIVATE void ImpEntryInserted( SvLBoxEntry* pEntry ); - SVT_DLLPRIVATE long PaintEntry1( SvLBoxEntry*, long nLine, + SVT_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry ); + SVT_DLLPRIVATE long PaintEntry1( SvTreeListEntry*, long nLine, sal_uInt16 nTabFlagMask=0xffff, sal_Bool bHasClipRegion=sal_False ); SVT_DLLPRIVATE void InitTreeView(); - SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab, + SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab, sal_uInt16 nEmptyWidth ); SVT_DLLPRIVATE void ImplInitStyle(); protected: - void EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem, + void EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem, const Selection& ); void EditedText( const XubString& ); @@ -603,10 +596,10 @@ protected: SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const; SvLBoxTab* GetFirstTab( sal_uInt16 nFlagMask, sal_uInt16& rTabPos ); SvLBoxTab* GetLastTab( sal_uInt16 nFlagMask, sal_uInt16& rTabPos ); - SvLBoxTab* GetTab( SvLBoxEntry*, SvLBoxItem* ) const; + SvLBoxTab* GetTab( SvTreeListEntry*, SvLBoxItem* ) const; void ClearTabList(); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); virtual void NotifyBeginScroll(); virtual void NotifyEndScroll(); @@ -622,13 +615,13 @@ protected: // in das Control hineingezeichnet werden virtual void NotifyInvalidating(); - virtual sal_uLong GetAscInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); - virtual sal_uLong GetDescInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); + virtual sal_uLong GetAscInsertionPos( SvTreeListEntry*, SvTreeListEntry* pParent ); + virtual sal_uLong GetDescInsertionPos( SvTreeListEntry*, SvTreeListEntry* pParent ); virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void CursorMoved( SvLBoxEntry* pNewCursor ); - virtual void PreparePaint( SvLBoxEntry* ); + virtual void CursorMoved( SvTreeListEntry* pNewCursor ); + virtual void PreparePaint( SvTreeListEntry* ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); void InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground); @@ -637,7 +630,7 @@ protected: sal_uInt16 GetCurrentTabPos() const; void CallImplEventListeners(sal_uLong nEvent, void* pData); - void ImplEditEntry( SvLBoxEntry* pEntry ); + void ImplEditEntry( SvTreeListEntry* pEntry ); sal_Bool AreChildrenTransient() const; void SetChildrenNotTransient(); @@ -672,15 +665,15 @@ public: ); } - virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0, + virtual SvTreeListEntry* InsertEntry( const XubString& rText, SvTreeListEntry* pParent = 0, sal_Bool bChildrenOnDemand = sal_False, sal_uLong nPos=LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); - virtual SvLBoxEntry* InsertEntry( const XubString& rText, + virtual SvTreeListEntry* InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvLBoxEntry* pParent = 0, + SvTreeListEntry* pParent = 0, sal_Bool bChildrenOnDemand = sal_False, sal_uLong nPos = LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); @@ -691,19 +684,19 @@ public: void SetDefaultExpandedEntryBmp( const Image& rBmp ); void SetDefaultCollapsedEntryBmp( const Image& rBmp ); - void SetCheckButtonState( SvLBoxEntry*, SvButtonState ); - SvButtonState GetCheckButtonState( SvLBoxEntry* ) const; + void SetCheckButtonState( SvTreeListEntry*, SvButtonState ); + SvButtonState GetCheckButtonState( SvTreeListEntry* ) const; sal_Bool IsExpandBitmapOnCursor() const { return (sal_Bool)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; } - void SetEntryText(SvLBoxEntry*, const XubString& ); - void SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage ); - void SetCollapsedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage ); + void SetEntryText(SvTreeListEntry*, const XubString& ); + void SetExpandedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage ); + void SetCollapsedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage ); - virtual String GetEntryText( SvLBoxEntry* pEntry ) const; - String SearchEntryText( SvLBoxEntry* pEntry ) const; - const Image& GetExpandedEntryBmp(SvLBoxEntry* _pEntry ) const; - const Image& GetCollapsedEntryBmp(SvLBoxEntry* _pEntry ) const; + virtual String GetEntryText( SvTreeListEntry* pEntry ) const; + String SearchEntryText( SvTreeListEntry* pEntry ) const; + const Image& GetExpandedEntryBmp(SvTreeListEntry* _pEntry ) const; + const Image& GetCollapsedEntryBmp(SvTreeListEntry* _pEntry ) const; void SetCheckButtonHdl( const Link& rLink ) { aCheckButtonHdl=rLink; } Link GetCheckButtonHdl() const { return aCheckButtonHdl; } @@ -714,9 +707,9 @@ public: void EnableInplaceEditing( bool bEnable ); // Editiert das erste StringItem des Entries, 0==Cursor - void EditEntry( SvLBoxEntry* pEntry = NULL ); - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); + void EditEntry( SvTreeListEntry* pEntry = NULL ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -729,16 +722,16 @@ public: void SetUpdateMode( sal_Bool ); virtual void ModelHasCleared(); - virtual void ModelHasInserted( SvListEntry* pEntry ); - virtual void ModelHasInsertedTree( SvListEntry* pEntry ); - virtual void ModelIsMoving(SvListEntry* pSource, - SvListEntry* pTargetParent, sal_uLong nChildPos ); - virtual void ModelHasMoved(SvListEntry* pSource ); - virtual void ModelIsRemoving( SvListEntry* pEntry ); - virtual void ModelHasRemoved( SvListEntry* pEntry ); - void ModelHasEntryInvalidated( SvListEntry* pEntry ); - - void ShowTargetEmphasis( SvLBoxEntry*, sal_Bool bShow ); + virtual void ModelHasInserted( SvTreeListEntry* pEntry ); + virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ); + virtual void ModelIsMoving(SvTreeListEntry* pSource, + SvTreeListEntry* pTargetParent, sal_uLong nChildPos ); + virtual void ModelHasMoved(SvTreeListEntry* pSource ); + virtual void ModelIsRemoving( SvTreeListEntry* pEntry ); + virtual void ModelHasRemoved( SvTreeListEntry* pEntry ); + void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ); + + void ShowTargetEmphasis( SvTreeListEntry*, sal_Bool bShow ); void ScrollOutputArea( short nDeltaEntries ); short GetEntryHeight() const { return nEntryHeight; } @@ -748,10 +741,10 @@ public: void SetIndent( short nIndent ); void SetSpaceBetweenEntries( short nSpace ); short GetSpaceBetweenEntries() const {return nEntryHeightOffs;} - Point GetEntryPosition( SvLBoxEntry* ) const; - void ShowEntry( SvLBoxEntry* ); // !!!OBSOLETE, use MakeVisible - void MakeVisible( SvLBoxEntry* pEntry ); - void MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop ); + Point GetEntryPosition( SvTreeListEntry* ) const; + void ShowEntry( SvTreeListEntry* ); // !!!OBSOLETE, use MakeVisible + void MakeVisible( SvTreeListEntry* pEntry ); + void MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop ); void SetCollapsedNodeBmp( const Image& ); void SetExpandedNodeBmp( const Image& ); @@ -760,31 +753,31 @@ public: void SetFont( const Font& rFont ); using Window::SetCursor; - void SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect = sal_False ); + void SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect = sal_False ); - SvLBoxEntry* GetEntry( const Point& rPos, sal_Bool bHit = sal_False ) const; + SvTreeListEntry* GetEntry( const Point& rPos, sal_Bool bHit = sal_False ) const; - void PaintEntry( SvLBoxEntry* ); - long PaintEntry( SvLBoxEntry*, long nLine, + void PaintEntry( SvTreeListEntry* ); + long PaintEntry( SvTreeListEntry*, long nLine, sal_uInt16 nTabFlagMask=0xffff ); - virtual Rectangle GetFocusRect( SvLBoxEntry*, long nLine ); + virtual Rectangle GetFocusRect( SvTreeListEntry*, long nLine ); // Beruecksichtigt Einrueckung - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - void InvalidateEntry( SvLBoxEntry* ); - SvLBoxItem* GetItem( SvLBoxEntry*, long nX, SvLBoxTab** ppTab); - SvLBoxItem* GetItem( SvLBoxEntry*, long nX ); + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + void InvalidateEntry( SvTreeListEntry* ); + SvLBoxItem* GetItem( SvTreeListEntry*, long nX, SvLBoxTab** ppTab); + SvLBoxItem* GetItem( SvTreeListEntry*, long nX ); void SetDragDropMode( DragDropMode ); void SetSelectionMode( SelectionMode ); - sal_Bool Expand( SvLBoxEntry* pParent ); - sal_Bool Collapse( SvLBoxEntry* pParent ); - sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); - sal_uLong SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect ); + sal_Bool Expand( SvTreeListEntry* pParent ); + sal_Bool Collapse( SvTreeListEntry* pParent ); + sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); + sal_uLong SelectChildren( SvTreeListEntry* pParent, sal_Bool bSelect ); virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint = sal_True ); - void SetCurEntry( SvLBoxEntry* _pEntry ); - SvLBoxEntry* GetCurEntry() const; + void SetCurEntry( SvTreeListEntry* _pEntry ); + SvTreeListEntry* GetCurEntry() const; using Window::Invalidate; virtual void Invalidate( sal_uInt16 nFlags = 0); @@ -795,11 +788,11 @@ public: virtual Region GetDragRegion() const; // Children des Parents werden Children des naechstoberen Parents - void RemoveParentKeepChildren( SvLBoxEntry* pParent ); + void RemoveParentKeepChildren( SvTreeListEntry* pParent ); DECL_LINK( DefaultCompare, SvSortData* ); - virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uLong nPos ); + virtual void ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1, + SvTreeListEntry* pEntry2, sal_uLong nPos ); void EndSelection(); void RepaintScrollBars() const; @@ -807,12 +800,12 @@ public: ScrollBar* GetHScroll(); void EnableAsyncDrag( sal_Bool b ); - SvLBoxEntry* GetFirstEntryInView() const; - SvLBoxEntry* GetNextEntryInView(SvLBoxEntry*) const; - SvLBoxEntry* GetLastEntryInView() const; + SvTreeListEntry* GetFirstEntryInView() const; + SvTreeListEntry* GetNextEntryInView(SvTreeListEntry*) const; + SvTreeListEntry* GetLastEntryInView() const; void ScrollToAbsPos( long nPos ); - void ShowFocusRect( const SvLBoxEntry* pEntry ); + void ShowFocusRect( const SvTreeListEntry* pEntry ); void InitStartEntry(); virtual PopupMenu* CreateContextMenu( void ); @@ -830,7 +823,7 @@ struct SvLBoxDDInfo { Application* pApp; SvTreeListBox* pSource; - SvLBoxEntry* pDDStartEntry; + SvTreeListEntry* pDDStartEntry; // relative Position im Eintrag bei Drag-Beginn (IconView) long nMouseRelX,nMouseRelY; sal_uLong nRes1,nRes2,nRes3,nRes4; @@ -865,14 +858,14 @@ public: void Hide(); }; -inline SvViewDataItem* SvTreeListBox::GetViewDataItem( SvListEntry* pEntry, +inline SvViewDataItem* SvTreeListBox::GetViewDataItem( SvTreeListEntry* pEntry, SvLBoxItem* pItem) const { SvViewDataEntry* pEntryData = (SvViewDataEntry*)SvListView::GetViewData(pEntry); DBG_ASSERT(pEntryData,"Entry not in View"); DBG_ASSERT(pEntryData->pItemData,"No ItemData"); - sal_uInt16 nItemPos = ((SvLBoxEntry*)pEntry)->GetPos( pItem ); + sal_uInt16 nItemPos = ((SvTreeListEntry*)pEntry)->GetPos( pItem ); return (pEntryData->pItemData+nItemPos); } diff --git a/svtools/inc/svtools/treelistentry.hxx b/svtools/inc/svtools/treelistentry.hxx index 16876aa811a5..d34f27454d9a 100644 --- a/svtools/inc/svtools/treelistentry.hxx +++ b/svtools/inc/svtools/treelistentry.hxx @@ -34,49 +34,6 @@ #include <vector> -class SvTreeEntryList; -class SvLBoxItem; - -class SVT_DLLPUBLIC SvListEntry -{ -friend class SvTreeList; -friend class SvListView; - -private: - SvListEntry* pParent; - SvTreeEntryList* pChildren; - sal_uLong nAbsPos; - sal_uLong nListPos; - - void SetListPositions(); - void InvalidateChildrensListPositions() - { - nListPos |= 0x80000000; - } - -public: - SvListEntry(); - SvListEntry( const SvListEntry& ); - virtual ~SvListEntry(); - sal_Bool HasChildren() { return (sal_Bool)(pChildren!=0); } - sal_Bool HasChildListPos() const - { - if( pParent && !(pParent->nListPos & 0x80000000) ) - return sal_True; - else return sal_False; - } - - sal_uLong GetChildListPos() const - { - if( pParent && (pParent->nListPos & 0x80000000) ) - pParent->SetListPositions(); - return ( nListPos & 0x7fffffff ); - } - - virtual void Clone( SvListEntry* pSource ); -}; - - // Flags, die am Model haengen #define SV_ENTRYFLAG_CHILDREN_ON_DEMAND 0x0001 #define SV_ENTRYFLAG_DISABLE_DROP 0x0002 @@ -89,37 +46,57 @@ public: #define SV_ENTRYFLAG_USER_FLAGS 0xF000 #define SV_ENTRYFLAG_SEMITRANSPARENT 0x8000 // draw semi-transparent entry bitmaps -class SVT_DLLPUBLIC SvLBoxEntry : public SvListEntry +class SvTreeEntryList; +class SvLBoxItem; + +class SVT_DLLPUBLIC SvTreeListEntry { + friend class SvTreeList; + friend class SvListView; friend class SvTreeListBox; + SvTreeListEntry* pParent; + SvTreeEntryList* pChildren; + sal_uLong nAbsPos; + sal_uLong nListPos; std::vector<SvLBoxItem*> aItems; void* pUserData; sal_uInt16 nEntryFlags; - SVT_DLLPRIVATE void DeleteItems_Impl(); + +private: + SVT_DLLPRIVATE void SetListPositions(); + SVT_DLLPRIVATE void InvalidateChildrensListPositions(); + SVT_DLLPRIVATE void DeleteItems_Impl(); + public: + SvTreeListEntry(); + SvTreeListEntry(const SvTreeListEntry& r); + virtual ~SvTreeListEntry(); + + bool HasChildren() const; + bool HasChildListPos() const; + sal_uLong GetChildListPos() const; + + void Clone(SvTreeListEntry* pSource); - SvLBoxEntry(); - virtual ~SvLBoxEntry(); + sal_uInt16 ItemCount() const; - sal_uInt16 ItemCount() const { return (sal_uInt16)aItems.size(); } // DARF NUR GERUFEN WERDEN, WENN DER EINTRAG NOCH NICHT IM MODEL // EINGEFUEGT IST, DA SONST FUER DAS ITEM KEINE VIEW-ABHAENGIGEN // DATEN ALLOZIERT WERDEN! void AddItem( SvLBoxItem* pItem ); void ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos ); - SvLBoxItem* GetItem( sal_uInt16 nPos ) const { return aItems[nPos]; } + SvLBoxItem* GetItem( sal_uInt16 nPos ) const; SvLBoxItem* GetFirstItem( sal_uInt16 nId ); sal_uInt16 GetPos( SvLBoxItem* pItem ) const; - void* GetUserData() const { return pUserData; } - void SetUserData( void* pPtr ) { pUserData = pPtr; } - virtual void Clone( SvListEntry* pSource ); - void EnableChildrenOnDemand( sal_Bool bEnable=sal_True ); - sal_Bool HasChildrenOnDemand() const { return (sal_Bool)((nEntryFlags & SV_ENTRYFLAG_CHILDREN_ON_DEMAND)!=0); } - sal_Bool HasInUseEmphasis() const { return (sal_Bool)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); } - - sal_uInt16 GetFlags() const { return nEntryFlags; } - void SetFlags( sal_uInt16 nFlags ) { nEntryFlags = nFlags; } + void* GetUserData() const; + void SetUserData( void* pPtr ); + void EnableChildrenOnDemand( bool bEnable=true ); + bool HasChildrenOnDemand() const; + bool HasInUseEmphasis() const; + + sal_uInt16 GetFlags() const; + void SetFlags( sal_uInt16 nFlags ); }; #endif diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 2087bb843649..7e9c8952feb6 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -206,7 +206,7 @@ public: virtual void Resize(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); void ClearAll(); HeaderBar* GetHeaderBar() const { return mpHeaderBar; } @@ -808,7 +808,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void ) if ( bEnableDelete || bEnableRename ) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); while ( pEntry ) { ::ucbhelper::Content aCnt; @@ -911,13 +911,13 @@ void ViewTabListBox_Impl::ClearAll() void ViewTabListBox_Impl::DeleteEntries() { svtools::QueryDeleteResult_Impl eResult = svtools::QUERYDELETE_YES; - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); String aURL; rtl::OString sDialogPosition; while ( pEntry && ( eResult != svtools::QUERYDELETE_CANCEL ) ) { - SvLBoxEntry *pCurEntry = pEntry; + SvTreeListEntry *pCurEntry = pEntry; pEntry = NextSelected( pEntry ); if ( pCurEntry->GetUserData() ) @@ -978,7 +978,7 @@ void ViewTabListBox_Impl::DeleteEntries() } // ----------------------------------------------------------------------- -sal_Bool ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry, +sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) { sal_Bool bRet = sal_False; @@ -1061,7 +1061,7 @@ void ViewTabListBox_Impl::DoQuickSearch( const xub_Unicode& rChar ) if ( bFound ) { - SvLBoxEntry* pEntry = GetEntry( mnSearchIndex ); + SvTreeListEntry* pEntry = GetEntry( mnSearchIndex ); if ( pEntry ) { SelectAll( sal_False ); @@ -1099,7 +1099,7 @@ sal_Bool ViewTabListBox_Impl::DoubleClickHdl() const sal_uInt16 nColumnCount = GetColumnCount(); if (nColumnCount > 0) nRow = _nPos / nColumnCount; - SvLBoxEntry* pEntry = GetEntry( nRow ); + SvTreeListEntry* pEntry = GetEntry( nRow ); if ( pEntry ) { SvtContentEntry* pData = (SvtContentEntry*)pEntry->GetUserData(); @@ -1204,7 +1204,7 @@ SvtFileView::~SvtFileView() // ----------------------------------------------------------------------- -String SvtFileView::GetURL( SvLBoxEntry* pEntry ) const +String SvtFileView::GetURL( SvTreeListEntry* pEntry ) const { String aURL; if ( pEntry && pEntry->GetUserData() ) @@ -1217,7 +1217,7 @@ String SvtFileView::GetURL( SvLBoxEntry* pEntry ) const String SvtFileView::GetCurrentURL() const { String aURL; - SvLBoxEntry* pEntry = mpImp->mpView->FirstSelected(); + SvTreeListEntry* pEntry = mpImp->mpView->FirstSelected(); if ( pEntry && pEntry->GetUserData() ) aURL = ( (SvtContentEntry*)pEntry->GetUserData() )->maURL; return aURL; @@ -1227,7 +1227,7 @@ String SvtFileView::GetCurrentURL() const void SvtFileView::CreatedFolder( const String& rUrl, const String& rNewFolder ) { String sEntry = mpImp->FolderInserted( rUrl, rNewFolder ); - SvLBoxEntry* pEntry = mpImp->mpView->InsertEntry( sEntry, mpImp->maFolderImage, mpImp->maFolderImage ); + SvTreeListEntry* pEntry = mpImp->mpView->InsertEntry( sEntry, mpImp->maFolderImage, mpImp->maFolderImage ); SvtContentEntry* pUserData = new SvtContentEntry( rUrl, sal_True ); pEntry->SetUserData( pUserData ); mpImp->mpView->MakeVisible( pEntry ); @@ -1447,14 +1447,14 @@ sal_uLong SvtFileView::GetSelectionCount() const // ----------------------------------------------------------------------- -SvLBoxEntry* SvtFileView::FirstSelected() const +SvTreeListEntry* SvtFileView::FirstSelected() const { return mpImp->mpView->FirstSelected(); } // ----------------------------------------------------------------------- -SvLBoxEntry* SvtFileView::NextSelected( SvLBoxEntry* pEntry ) const +SvTreeListEntry* SvtFileView::NextSelected( SvTreeListEntry* pEntry ) const { return mpImp->mpView->NextSelected( pEntry ); } @@ -1993,7 +1993,7 @@ void SvtFileView_Impl::SetSelectHandler( const Link& _rHdl ) void SvtFileView_Impl::InitSelection() { mpView->SelectAll( sal_False ); - SvLBoxEntry* pFirst = mpView->First(); + SvTreeListEntry* pFirst = mpView->First(); if ( pFirst ) mpView->SetCursor( pFirst, sal_True ); } @@ -2014,7 +2014,7 @@ void SvtFileView_Impl::OpenFolder_Impl() continue; // insert entry and set user data - SvLBoxEntry* pEntry = mpView->InsertEntry( (*aIt)->maDisplayText, + SvTreeListEntry* pEntry = mpView->InsertEntry( (*aIt)->maDisplayText, (*aIt)->maImage, (*aIt)->maImage ); @@ -2036,7 +2036,7 @@ void SvtFileView_Impl::OpenFolder_Impl() void SvtFileView_Impl::ResetCursor() { // deselect - SvLBoxEntry* pEntry = mpView->FirstSelected(); + SvTreeListEntry* pEntry = mpView->FirstSelected(); if ( pEntry ) mpView->Select( pEntry, sal_False ); // set cursor to the first entry @@ -2280,7 +2280,7 @@ void SvtFileView_Impl::Resort_Impl( sal_Int16 nColumn, sal_Bool bAscending ) mpView->ResetQuickSearch_Impl( NULL ); String aEntryURL; - SvLBoxEntry* pEntry = mpView->GetCurEntry(); + SvTreeListEntry* pEntry = mpView->GetCurEntry(); if ( pEntry && pEntry->GetUserData() ) aEntryURL = ( (SvtContentEntry*)pEntry->GetUserData() )->maURL; diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index d4f0535e52a8..3c3abbc6c11a 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -157,7 +157,7 @@ void SvImpLBox::UpdateStringSorter() } // #97680# ---------------------- -short SvImpLBox::UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth ) +short SvImpLBox::UpdateContextBmpWidthVector( SvTreeListEntry* pEntry, short nWidth ) { DBG_ASSERT( pView->pModel, "View and Model aren't valid!" ); @@ -185,7 +185,7 @@ short SvImpLBox::UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth return nContextBmpWidth; } -void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ) +void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEntry ) { DBG_ASSERT( pEntry, "Moved Entry is invalid!" ); @@ -197,7 +197,7 @@ void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ) if( pEntry->HasChildren() ) // recursive call, whether expanded or not { - SvLBoxEntry* pChild = pView->FirstChild( pEntry ); + SvTreeListEntry* pChild = pView->FirstChild( pEntry ); DBG_ASSERT( pChild, "The first child is invalid!" ); do { @@ -207,7 +207,7 @@ void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ) } } -void SvImpLBox::UpdateContextBmpWidthMax( SvLBoxEntry* pEntry ) +void SvImpLBox::UpdateContextBmpWidthMax( SvTreeListEntry* pEntry ) { sal_uInt16 nDepth = pView->pModel->GetDepth( pEntry ); if( aContextBmpWidthVector.size() < 1 ) @@ -221,7 +221,7 @@ void SvImpLBox::UpdateContextBmpWidthMax( SvLBoxEntry* pEntry ) } } -void SvImpLBox::CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect ) +void SvImpLBox::CalcCellFocusRect( SvTreeListEntry* pEntry, Rectangle& rRect ) { if ( pEntry && bIsCellFocusEnabled ) { @@ -355,7 +355,7 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar ) void SvImpLBox::CursorDown() { - SvLBoxEntry* pNextFirstToDraw = (SvLBoxEntry*)(pView->NextVisible( pStartEntry)); + SvTreeListEntry* pNextFirstToDraw = (SvTreeListEntry*)(pView->NextVisible( pStartEntry)); if( pNextFirstToDraw ) { nFlags &= (~F_FILLING); @@ -373,7 +373,7 @@ void SvImpLBox::CursorDown() void SvImpLBox::CursorUp() { - SvLBoxEntry* pPrevFirstToDraw = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry)); + SvTreeListEntry* pPrevFirstToDraw = (SvTreeListEntry*)(pView->PrevVisible( pStartEntry)); if( pPrevFirstToDraw ) { nFlags &= (~F_FILLING); @@ -398,8 +398,8 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta ) if( !nDelta ) return; - SvLBoxEntry* pNext; - pNext = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nRealDelta )); + SvTreeListEntry* pNext; + pNext = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nRealDelta )); if( (sal_uLong)pNext == (sal_uLong)pStartEntry ) return; @@ -436,7 +436,7 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta ) if( !nDelta ) return; - SvLBoxEntry* pPrev = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry, nRealDelta )); + SvTreeListEntry* pPrev = (SvTreeListEntry*)(pView->PrevVisible( pStartEntry, nRealDelta )); if( (sal_uLong)pPrev == (sal_uLong)pStartEntry ) return; @@ -562,7 +562,7 @@ void SvImpLBox::InvalidateEntry( long nY ) const } } -void SvImpLBox::InvalidateEntry( SvLBoxEntry* pEntry ) +void SvImpLBox::InvalidateEntry( SvTreeListEntry* pEntry ) { if( GetUpdateMode() ) { @@ -606,7 +606,7 @@ void SvImpLBox::RecalcFocusRect() // Sets cursor. When using SingleSelection, the selection is adjusted. // -void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect ) +void SvImpLBox::SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect ) { SvViewDataEntry* pViewDataNewCur = 0; if( pEntry ) @@ -622,11 +622,11 @@ void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect ) // if this cursor is not selectable, find first visible that is and use it while( pEntry && pViewDataNewCur && !pViewDataNewCur->IsSelectable() ) { - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); pViewDataNewCur = pEntry ? pView->GetViewDataEntry(pEntry) : 0; } - SvLBoxEntry* pOldCursor = pCursor; + SvTreeListEntry* pOldCursor = pCursor; if( pCursor && pEntry != pCursor ) { pView->SetEntryFocus( pCursor, sal_False ); @@ -758,7 +758,7 @@ void SvImpLBox::KeyLeftRight( long nDelta ) // returns the last entry if position is just past the last entry -SvLBoxEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const +SvTreeListEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const { DBG_ASSERT( pView->GetModel(), "SvImpLBox::GetClickedEntry: how can this ever happen? Please tell me (frank.schoenheit@sun.com) how to reproduce!" ); if ( !pView->GetModel() ) @@ -772,7 +772,7 @@ SvLBoxEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const sal_uInt16 nClickedEntry = (sal_uInt16)(rPoint.Y() / pView->GetEntryHeight() ); sal_uInt16 nTemp = nClickedEntry; - SvLBoxEntry* pEntry = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nTemp )); + SvTreeListEntry* pEntry = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nTemp )); return pEntry; } @@ -780,7 +780,7 @@ SvLBoxEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const // checks if the entry was hit "the right way" // (Focusrect+ ContextBitmap bei TreeListBox) // -sal_Bool SvImpLBox::EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPosPixel,long nLine) +sal_Bool SvImpLBox::EntryReallyHit(SvTreeListEntry* pEntry,const Point& rPosPixel,long nLine) { sal_Bool bRet; // we are not too exact when it comes to "special" entries @@ -807,7 +807,7 @@ sal_Bool SvImpLBox::EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPosPixel,lo // returns 0 if position is just past the last entry -SvLBoxEntry* SvImpLBox::GetEntry( const Point& rPoint ) const +SvTreeListEntry* SvImpLBox::GetEntry( const Point& rPoint ) const { if( (pView->GetEntryCount() == 0) || !pStartEntry || (rPoint.Y() > aOutputSize.Height()) @@ -816,26 +816,26 @@ SvLBoxEntry* SvImpLBox::GetEntry( const Point& rPoint ) const sal_uInt16 nClickedEntry = (sal_uInt16)(rPoint.Y() / pView->GetEntryHeight() ); sal_uInt16 nTemp = nClickedEntry; - SvLBoxEntry* pEntry = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nTemp )); + SvTreeListEntry* pEntry = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nTemp )); if( nTemp != nClickedEntry ) pEntry = 0; return pEntry; } -SvLBoxEntry* SvImpLBox::MakePointVisible(const Point& rPoint,sal_Bool bNotifyScroll) +SvTreeListEntry* SvImpLBox::MakePointVisible(const Point& rPoint,sal_Bool bNotifyScroll) { if( !pCursor ) return 0; long nY = rPoint.Y(); - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; long nMax = aOutputSize.Height(); if( nY < 0 || nY >= nMax ) // aOutputSize.Height() ) { if( nY < 0 ) - pEntry = (SvLBoxEntry*)(pView->PrevVisible( pCursor )); + pEntry = (SvTreeListEntry*)(pView->PrevVisible( pCursor )); else - pEntry = (SvLBoxEntry*)(pView->NextVisible( pCursor )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pCursor )); if( pEntry && pEntry != pCursor ) pView->SetEntryFocus( pCursor, sal_False ); @@ -852,7 +852,7 @@ SvLBoxEntry* SvImpLBox::MakePointVisible(const Point& rPoint,sal_Bool bNotifyScr { sal_uInt16 nSteps = 0xFFFF; // TODO: LastVisible is not yet implemented! - pEntry = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nSteps )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nSteps )); } if( pEntry ) { @@ -884,7 +884,7 @@ void SvImpLBox::Paint( const Rectangle& rRect ) if( nFlags & F_FILLING ) { - SvLBoxEntry* pFirst = pView->First(); + SvTreeListEntry* pFirst = pView->First(); if( pFirst != pStartEntry ) { ShowCursor( sal_False ); @@ -914,10 +914,10 @@ void SvImpLBox::Paint( const Rectangle& rRect ) nCount += 2; // don't miss a row long nY = nStartLine * nEntryHeight; - SvLBoxEntry* pEntry = pStartEntry; + SvTreeListEntry* pEntry = pStartEntry; while( nStartLine && pEntry ) { - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); nStartLine--; } @@ -935,7 +935,7 @@ void SvImpLBox::Paint( const Rectangle& rRect ) /*long nMaxRight=*/ pView->PaintEntry1( pEntry, nY, 0xffff, sal_True ); nY += nEntryHeight; - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if ( !pCursor && ( ( nExtendedWinBits & EWB_NO_AUTO_CURENTRY ) == 0 ) ) @@ -957,7 +957,7 @@ void SvImpLBox::Paint( const Rectangle& rRect ) nFlags &= (~F_IN_PAINT); } -void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop ) +void SvImpLBox::MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop ) { if( !pEntry ) return; @@ -973,7 +973,7 @@ void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop ) { if( !pView->IsEntryVisible(pEntry) ) // Parent(s) collapsed? { - SvLBoxEntry* pParent = pView->GetParent( pEntry ); + SvTreeListEntry* pParent = pView->GetParent( pEntry ); while( pParent ) { if( !pView->IsExpanded( pParent ) ) @@ -1011,7 +1011,7 @@ void SvImpLBox::ScrollToAbsPos( long nPos ) else if( nPos > nLastEntryPos ) nPos = nLastEntryPos; - SvLBoxEntry* pEntry = (SvLBoxEntry*)pView->GetEntryAtAbsPos( nPos ); + SvTreeListEntry* pEntry = (SvTreeListEntry*)pView->GetEntryAtAbsPos( nPos ); if( !pEntry || pEntry == pStartEntry ) return; @@ -1055,8 +1055,8 @@ void SvImpLBox::DrawNet() if( nEntryHeightDIV2 && !(nEntryHeight & 0x0001)) nEntryHeightDIV2--; - SvLBoxEntry* pChild; - SvLBoxEntry* pEntry = pStartEntry; + SvTreeListEntry* pChild; + SvTreeListEntry* pEntry = pStartEntry; SvLBoxTab* pFirstDynamicTab = pView->GetFirstDynamicTab(); while( pTree->GetDepth( pEntry ) > 0 ) @@ -1124,7 +1124,7 @@ void SvImpLBox::DrawNet() pView->DrawLine( aPos1, aPos2 ); } nY += nEntryHeight; - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if( m_nStyle & WB_HASLINESATROOT ) { @@ -1340,11 +1340,11 @@ void SvImpLBox::FillView() sal_uInt16 nTempThumb = (sal_uInt16)aVerSBar.GetThumbPos(); if( nTempThumb >= nVisibleViewCount ) nTempThumb = nVisibleViewCount - 1; - pStartEntry = (SvLBoxEntry*)(pView->GetEntryAtVisPos(nTempThumb)); + pStartEntry = (SvTreeListEntry*)(pView->GetEntryAtVisPos(nTempThumb)); } if( pStartEntry ) { - sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos( (SvLBoxEntry*)(pView->LastVisible()))); + sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos( (SvTreeListEntry*)(pView->LastVisible()))); sal_uInt16 nThumb = (sal_uInt16)(pView->GetVisiblePos( pStartEntry )); sal_uInt16 nCurDispEntries = nLast-nThumb+1; if( nCurDispEntries < nVisibleCount ) @@ -1352,10 +1352,10 @@ void SvImpLBox::FillView() ShowCursor( sal_False ); // fill window by moving the thumb up incrementally sal_Bool bFound = sal_False; - SvLBoxEntry* pTemp = pStartEntry; + SvTreeListEntry* pTemp = pStartEntry; while( nCurDispEntries < nVisibleCount && pTemp ) { - pTemp = (SvLBoxEntry*)(pView->PrevVisible(pStartEntry)); + pTemp = (SvTreeListEntry*)(pView->PrevVisible(pStartEntry)); if( pTemp ) { nThumb--; @@ -1452,7 +1452,7 @@ void SvImpLBox::SyncVerThumb() aVerSBar.SetThumbPos( 0 ); } -sal_Bool SvImpLBox::IsEntryInView( SvLBoxEntry* pEntry ) const +sal_Bool SvImpLBox::IsEntryInView( SvTreeListEntry* pEntry ) const { // parent collapsed if( !pView->IsEntryVisible(pEntry) ) @@ -1467,7 +1467,7 @@ sal_Bool SvImpLBox::IsEntryInView( SvLBoxEntry* pEntry ) const } -long SvImpLBox::GetEntryLine( SvLBoxEntry* pEntry ) const +long SvImpLBox::GetEntryLine( SvTreeListEntry* pEntry ) const { if(!pStartEntry ) return -1; // invisible position @@ -1502,7 +1502,7 @@ void SvImpLBox::SetEntryHeight( short /* nHeight */ ) // Callback Functions // *********************************************************************** -void SvImpLBox::EntryExpanded( SvLBoxEntry* pEntry ) +void SvImpLBox::EntryExpanded( SvTreeListEntry* pEntry ) { // SelAllDestrAnch( sal_False, sal_True ); //DeselectAll(); if( GetUpdateMode() ) @@ -1523,7 +1523,7 @@ void SvImpLBox::EntryExpanded( SvLBoxEntry* pEntry ) } } -void SvImpLBox::EntryCollapsed( SvLBoxEntry* pEntry ) +void SvImpLBox::EntryCollapsed( SvTreeListEntry* pEntry ) { if( !pView->IsEntryVisible( pEntry ) ) return; @@ -1546,7 +1546,7 @@ void SvImpLBox::EntryCollapsed( SvLBoxEntry* pEntry ) pStartEntry = pView->First(); sal_uInt16 nDistance = (sal_uInt16)nNewThumbPos; if( nDistance ) - pStartEntry = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, + pStartEntry = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nDistance)); if( GetUpdateMode() ) pView->Invalidate(); @@ -1565,7 +1565,7 @@ void SvImpLBox::EntryCollapsed( SvLBoxEntry* pEntry ) pView->Select( pCursor, sal_True ); } -void SvImpLBox::CollapsingEntry( SvLBoxEntry* pEntry ) +void SvImpLBox::CollapsingEntry( SvTreeListEntry* pEntry ) { if( !pView->IsEntryVisible( pEntry ) || !pStartEntry ) return; @@ -1612,7 +1612,7 @@ void SvImpLBox::SetNodeBmpTabDistance() // // corrects the cursor when using SingleSelection // -void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, sal_Bool bSelect ) +void SvImpLBox::EntrySelected( SvTreeListEntry* pEntry, sal_Bool bSelect ) { if( nFlags & F_IGNORE_SELECT ) return; @@ -1639,7 +1639,7 @@ void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, sal_Bool bSelect ) } -void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry ) +void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry ) { DestroyAnchor(); @@ -1657,9 +1657,9 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry ) nFlags |= F_REMOVED_RECALC_MOST_RIGHT; } - SvLBoxEntry* pOldStartEntry = pStartEntry; + SvTreeListEntry* pOldStartEntry = pStartEntry; - SvLBoxEntry* pParent = (SvLBoxEntry*)(pView->GetModel()->GetParent(pEntry)); + SvTreeListEntry* pParent = (SvTreeListEntry*)(pView->GetModel()->GetParent(pEntry)); if( pParent && pView->GetModel()->GetChildList(pParent)->size() == 1 ) { @@ -1673,7 +1673,7 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry ) if( pStartEntry && pTree->IsChild(pEntry,pStartEntry) ) pStartEntry = pEntry; - SvLBoxEntry* pTemp; + SvTreeListEntry* pTemp; if( pCursor && pCursor == pEntry ) { if( bSimpleTravel ) @@ -1682,7 +1682,7 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry ) // NextSibling, because we also delete the children of the cursor pTemp = pView->NextSibling( pCursor ); if( !pTemp ) - pTemp = (SvLBoxEntry*)(pView->PrevVisible( pCursor )); + pTemp = (SvTreeListEntry*)(pView->PrevVisible( pCursor )); SetCursor( pTemp, sal_True ); } @@ -1690,14 +1690,14 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry ) { pTemp = pView->NextSibling( pStartEntry ); if( !pTemp ) - pTemp = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry )); + pTemp = (SvTreeListEntry*)(pView->PrevVisible( pStartEntry )); pStartEntry = pTemp; } if( GetUpdateMode()) { // if it is the last one, we have to invalidate it, so the lines are // drawn correctly (in this case they're deleted) - if( pStartEntry && (pStartEntry != pOldStartEntry || pEntry == (SvLBoxEntry*)pView->GetModel()->Last()) ) + if( pStartEntry && (pStartEntry != pOldStartEntry || pEntry == (SvTreeListEntry*)pView->GetModel()->Last()) ) { aVerSBar.SetThumbPos( pView->GetVisiblePos( pStartEntry )); pView->Invalidate( GetVisibleArea() ); @@ -1738,9 +1738,9 @@ void SvImpLBox::EntryRemoved() if( pView->GetSelectionCount() ) { // is a neighboring entry selected? - SvLBoxEntry* pNextCursor = (SvLBoxEntry*)pView->PrevVisible( pCursor ); + SvTreeListEntry* pNextCursor = (SvTreeListEntry*)pView->PrevVisible( pCursor ); if( !pNextCursor || !pView->IsSelected( pNextCursor )) - pNextCursor = (SvLBoxEntry*)pView->NextVisible( pCursor ); + pNextCursor = (SvTreeListEntry*)pView->NextVisible( pCursor ); if( !pNextCursor || !pView->IsSelected( pNextCursor )) // no neighbor selected: use first selected pNextCursor = pView->FirstSelected(); @@ -1756,7 +1756,7 @@ void SvImpLBox::EntryRemoved() } -void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry ) +void SvImpLBox::MovingEntry( SvTreeListEntry* pEntry ) { int bDeselAll = nFlags & F_DESEL_ALL; SelAllDestrAnch( sal_False, sal_True ); // DeselectAll(); @@ -1769,12 +1769,12 @@ void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry ) pView->Invalidate(); if( pEntry == pStartEntry ) { - SvLBoxEntry* pNew = 0; + SvTreeListEntry* pNew = 0; if( !pEntry->HasChildren() ) { - pNew = (SvLBoxEntry*)(pView->NextVisible( pStartEntry )); + pNew = (SvTreeListEntry*)(pView->NextVisible( pStartEntry )); if( !pNew ) - pNew = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry )); + pNew = (SvTreeListEntry*)(pView->PrevVisible( pStartEntry )); } else { @@ -1786,7 +1786,7 @@ void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry ) } } -void SvImpLBox::EntryMoved( SvLBoxEntry* pEntry ) +void SvImpLBox::EntryMoved( SvTreeListEntry* pEntry ) { UpdateContextBmpWidthVectorFromMovedEntry( pEntry ); @@ -1808,7 +1808,7 @@ void SvImpLBox::EntryMoved( SvLBoxEntry* pEntry ) ShowCursor( sal_True ); else { - SvLBoxEntry* pParent = pEntry; + SvTreeListEntry* pParent = pEntry; do { pParent = pTree->GetParent( pParent ); } @@ -1822,11 +1822,11 @@ void SvImpLBox::EntryMoved( SvLBoxEntry* pEntry ) -void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry ) +void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry ) { if( GetUpdateMode() ) { - SvLBoxEntry* pParent = (SvLBoxEntry*)pTree->GetParent(pEntry); + SvTreeListEntry* pParent = (SvTreeListEntry*)pTree->GetParent(pEntry); if( pParent && pTree->GetChildList(pParent)->size() == 1 ) // draw plus sign pTree->InvalidateEntry( pParent ); @@ -1852,7 +1852,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry ) { // Check if the view is filled completely. If not, then adjust // pStartEntry and the Cursor (automatic scrolling). - sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos( (SvLBoxEntry*)(pView->LastVisible()))); + sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos( (SvTreeListEntry*)(pView->LastVisible()))); sal_uInt16 nThumb = (sal_uInt16)(pView->GetVisiblePos( pStartEntry )); sal_uInt16 nCurDispEntries = nLast-nThumb+1; if( nCurDispEntries < nVisibleCount ) @@ -1885,7 +1885,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry ) // ****** Control the control animation -sal_Bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvLBoxEntry* pEntry, +sal_Bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long nY ) { SvLBoxItem* pItem = pView->GetItem(pEntry,rMEvt.GetPosPixel().X(),&pActiveTab); @@ -1907,7 +1907,7 @@ sal_Bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvLBoxEntry* pE return sal_False; } -sal_Bool SvImpLBox::MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvLBoxEntry* pEntry) +sal_Bool SvImpLBox::MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry) { if( pActiveButton ) { @@ -1944,7 +1944,7 @@ sal_Bool SvImpLBox::ButtonUpCheckCtrl( const MouseEvent& rMEvt ) if( pActiveButton ) { pView->ReleaseMouse(); - SvLBoxEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() ); + SvTreeListEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() ); long nY = GetEntryLine( pActiveEntry ); pActiveButton->SetStateHilighted( sal_False ); long nMouseX = rMEvt.GetPosPixel().X(); @@ -1967,7 +1967,7 @@ sal_Bool SvImpLBox::ButtonUpCheckCtrl( const MouseEvent& rMEvt ) // ******* Control plus/minus button for expanding/collapsing // sal_False == no expand/collapse button hit -sal_Bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const +sal_Bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvTreeListEntry* pEntry ) const { if( !pEntry->HasChildren() && !pEntry->HasChildrenOnDemand() ) return sal_False; @@ -1992,7 +1992,7 @@ sal_Bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) } // sal_False == hit no node button -sal_Bool SvImpLBox::ButtonDownCheckExpand( const MouseEvent& rMEvt, SvLBoxEntry* pEntry, long /* nY */ ) +sal_Bool SvImpLBox::ButtonDownCheckExpand( const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long /* nY */ ) { sal_Bool bRet = sal_False; @@ -2028,7 +2028,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) if( aPos.X() > aOutputSize.Width() || aPos.Y() > aOutputSize.Height() ) return; - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if ( pEntry != pCursor ) // new entry selected -> reset current tab position to first tab nCurTabPos = FIRST_ENTRY_TAB; @@ -2119,7 +2119,7 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt) void SvImpLBox::MouseMove( const MouseEvent& rMEvt) { - SvLBoxEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() ); + SvTreeListEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() ); if ( !MouseMoveCheckCtrl( rMEvt, pEntry ) && ( aSelEng.GetSelectionMode() != NO_SELECTION ) ) aSelEng.SelMouseMove( rMEvt ); return; @@ -2148,7 +2148,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) sal_Bool bShift = rKeyCode.IsShift(); sal_Bool bMod1 = rKeyCode.IsMod1(); - SvLBoxEntry* pNewCursor; + SvTreeListEntry* pNewCursor; const WinBits nWindowStyle = pView->GetStyle(); switch( aCode ) @@ -2160,7 +2160,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) pNewCursor = pCursor; do { - pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pNewCursor )); + pNewCursor = (SvTreeListEntry*)(pView->PrevVisible( pNewCursor )); } while( pNewCursor && !IsSelectable(pNewCursor) ); if ( pNewCursor ) @@ -2188,7 +2188,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) pNewCursor = pCursor; do { - pNewCursor = (SvLBoxEntry*)(pView->NextVisible( pNewCursor )); + pNewCursor = (SvTreeListEntry*)(pView->NextVisible( pNewCursor )); } while( pNewCursor && !IsSelectable(pNewCursor) ); if ( pNewCursor ) @@ -2299,11 +2299,11 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) case KEY_PAGEUP: if( !bMod1 ) { - pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pCursor, nDelta )); + pNewCursor = (SvTreeListEntry*)(pView->PrevVisible( pCursor, nDelta )); while( nDelta && pNewCursor && !IsSelectable(pNewCursor) ) { - pNewCursor = (SvLBoxEntry*)(pView->NextVisible( pNewCursor )); + pNewCursor = (SvTreeListEntry*)(pView->NextVisible( pNewCursor )); nDelta--; } @@ -2327,11 +2327,11 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) case KEY_PAGEDOWN: if( !bMod1 ) { - pNewCursor= (SvLBoxEntry*)(pView->NextVisible( pCursor, nDelta )); + pNewCursor= (SvTreeListEntry*)(pView->NextVisible( pCursor, nDelta )); while( nDelta && pNewCursor && !IsSelectable(pNewCursor) ) { - pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pNewCursor )); + pNewCursor = (SvTreeListEntry*)(pView->PrevVisible( pNewCursor )); nDelta--; } @@ -2428,7 +2428,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( bMod1 ) { sal_uInt16 nRefDepth = pTree->GetDepth( pCursor ); - SvLBoxEntry* pCur = pTree->Next( pCursor ); + SvTreeListEntry* pCur = pTree->Next( pCursor ); while( pCur && pTree->GetDepth(pCur) > nRefDepth ) { if( pCur->HasChildren() && !pView->IsExpanded(pCur)) @@ -2456,7 +2456,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( bMod1 ) { // collapse all parents until we get to the root - SvLBoxEntry* pParentToCollapse = (SvLBoxEntry*)pTree->GetRootLevelParent(pCursor); + SvTreeListEntry* pParentToCollapse = (SvTreeListEntry*)pTree->GetRootLevelParent(pCursor); if( pParentToCollapse ) { sal_uInt16 nRefDepth; @@ -2477,7 +2477,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( pView->IsExpanded(pParentToCollapse) ) pView->Collapse( pParentToCollapse ); - SvLBoxEntry* pCur = pTree->Next( pParentToCollapse ); + SvTreeListEntry* pCur = pTree->Next( pParentToCollapse ); while( pCur && pTree->GetDepth(pCur) > nRefDepth ) { if( pCur->HasChildren() && pView->IsExpanded(pCur) ) @@ -2510,7 +2510,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) while( pNewCursor && !IsSelectable(pNewCursor) ) { - pNewCursor = (SvLBoxEntry*)(pView->NextVisible( pNewCursor )); + pNewCursor = (SvTreeListEntry*)(pView->NextVisible( pNewCursor )); } if( pNewCursor && pNewCursor != pCursor ) @@ -2530,7 +2530,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) while( pNewCursor && !IsSelectable(pNewCursor) ) { - pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pNewCursor )); + pNewCursor = (SvTreeListEntry*)(pView->PrevVisible( pNewCursor )); } if( pNewCursor && pNewCursor != pCursor) @@ -2580,7 +2580,7 @@ void SvImpLBox::GetFocus() } if( m_nStyle & WB_HIDESELECTION ) { - SvLBoxEntry* pEntry = pView->FirstSelected(); + SvTreeListEntry* pEntry = pView->FirstSelected(); while( pEntry ) { InvalidateEntry( pEntry ); @@ -2598,7 +2598,7 @@ void SvImpLBox::LoseFocus() if( m_nStyle & WB_HIDESELECTION ) { - SvLBoxEntry* pEntry = pView->FirstSelected(); + SvTreeListEntry* pEntry = pView->FirstSelected(); while( pEntry ) { //SvViewData* pViewData = pView->GetViewData( pEntry ); @@ -2614,7 +2614,7 @@ void SvImpLBox::LoseFocus() // SelectionEngine // ******************************************************************** -inline void SvImpLBox::SelectEntry( SvLBoxEntry* pEntry, sal_Bool bSelect ) +inline void SvImpLBox::SelectEntry( SvTreeListEntry* pEntry, sal_Bool bSelect ) { pView->Select( pEntry, bSelect ); } @@ -2648,7 +2648,7 @@ void ImpLBSelEng::DestroyAnchor() sal_Bool ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, sal_Bool bDontSelectAtCursor) { - SvLBoxEntry* pNewCursor = pImp->MakePointVisible( rPoint ); + SvTreeListEntry* pNewCursor = pImp->MakePointVisible( rPoint ); if( pNewCursor != pImp->pCursor ) pImp->BeginScroll(); @@ -2666,7 +2666,7 @@ sal_Bool ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, sal_Bool bDontSelect sal_Bool ImpLBSelEng::IsSelectionAtPoint( const Point& rPoint ) { - SvLBoxEntry* pEntry = pImp->MakePointVisible( rPoint ); + SvTreeListEntry* pEntry = pImp->MakePointVisible( rPoint ); if( pEntry ) return pView->IsSelected(pEntry); return sal_False; @@ -2674,7 +2674,7 @@ sal_Bool ImpLBSelEng::IsSelectionAtPoint( const Point& rPoint ) void ImpLBSelEng::DeselectAtPoint( const Point& rPoint ) { - SvLBoxEntry* pEntry = pImp->MakePointVisible( rPoint ); + SvTreeListEntry* pEntry = pImp->MakePointVisible( rPoint ); if( !pEntry ) return; pImp->SelectEntry( pEntry, sal_False ); @@ -2690,9 +2690,9 @@ void ImpLBSelEng::DeselectAll() // Selection // *********************************************************************** -void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCursor) +void SvImpLBox::SetAnchorSelection(SvTreeListEntry* pOldCursor,SvTreeListEntry* pNewCursor) { - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; sal_uLong nAnchorVisPos = pView->GetVisiblePos( pAnchor ); sal_uLong nOldVisPos = pView->GetVisiblePos( pOldCursor ); sal_uLong nNewVisPos = pView->GetVisiblePos( pNewCursor ); @@ -2706,7 +2706,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs while( pEntry && pEntry != pNewCursor ) { pView->Select( pEntry, sal_True ); - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if( pEntry ) pView->Select( pEntry, sal_True ); @@ -2719,7 +2719,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs while( pEntry && pEntry != pOldCursor ) { pView->Select( pEntry, sal_False ); - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if( pEntry ) pView->Select( pEntry, sal_False ); @@ -2728,7 +2728,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs while( pEntry && pEntry != pAnchor ) { pView->Select( pEntry, sal_True ); - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if( pEntry ) pView->Select( pEntry, sal_True ); @@ -2738,11 +2738,11 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs if( nNewVisPos < nOldVisPos ) { pEntry = pNewCursor; - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); while( pEntry && pEntry != pOldCursor ) { pView->Select( pEntry, sal_False ); - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if( pEntry ) pView->Select( pEntry, sal_False ); @@ -2757,7 +2757,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs while( pEntry && pEntry != pOldCursor ) { pView->Select( pEntry, sal_True ); - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if( pEntry ) pView->Select( pEntry, sal_True ); @@ -2770,7 +2770,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs while( pEntry && pEntry != pAnchor ) { pView->Select( pEntry, sal_False ); - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if( pEntry ) pView->Select( pEntry, sal_False ); @@ -2778,7 +2778,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs while( pEntry && pEntry != pNewCursor ) { pView->Select( pEntry, sal_True ); - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } if( pEntry ) pView->Select( pEntry, sal_True ); @@ -2791,7 +2791,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs while( pEntry && pEntry != pNewCursor ) { pView->Select( pEntry, sal_False ); - pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); + pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry )); } return; } @@ -2801,7 +2801,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs void SvImpLBox::SelAllDestrAnch( sal_Bool bSelect, sal_Bool bDestroyAnchor, sal_Bool bSingleSelToo ) { - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; nFlags &= (~F_DESEL_ALL); if( bSelect && bSimpleTravel ) { @@ -2914,7 +2914,7 @@ IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl) return 0; } -void SvImpLBox::PaintDDCursor( SvLBoxEntry* pInsertionPos ) +void SvImpLBox::PaintDDCursor( SvTreeListEntry* pInsertionPos ) { long nY; if( pInsertionPos ) @@ -2963,20 +2963,20 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) { Point aPopupPos; sal_Bool bClickedIsFreePlace = sal_False; - std::stack<SvLBoxEntry*> aSelRestore; + std::stack<SvTreeListEntry*> aSelRestore; if( rCEvt.IsMouseEvent() ) { // change selection, if mouse position doesn't fit to selection aPopupPos = rCEvt.GetMousePosPixel(); - SvLBoxEntry* pClickedEntry = GetEntry( aPopupPos ); + SvTreeListEntry* pClickedEntry = GetEntry( aPopupPos ); if( pClickedEntry ) { // mouse in non empty area sal_Bool bClickedIsSelected = sal_False; // collect the currently selected entries - SvLBoxEntry* pSelected = pView->FirstSelected(); + SvTreeListEntry* pSelected = pView->FirstSelected(); while( pSelected ) { bClickedIsSelected |= ( pClickedEntry == pSelected ); @@ -2994,7 +2994,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) { bClickedIsFreePlace = sal_True; sal_Int32 nSelectedEntries = pView->GetSelectionCount(); - SvLBoxEntry* pSelected = pView->FirstSelected(); + SvTreeListEntry* pSelected = pView->FirstSelected(); for(sal_uInt16 nSel = 0; nSel < nSelectedEntries; nSel++ ) { aSelRestore.push(pSelected); @@ -3015,7 +3015,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) if( nSelectionCount ) { // now always take first visible as base for positioning the menu - SvLBoxEntry* pSelected = pView->FirstSelected(); + SvTreeListEntry* pSelected = pView->FirstSelected(); while( pSelected ) { if( IsEntryInView( pSelected ) ) @@ -3053,7 +3053,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) { while(!aSelRestore.empty()) { - SvLBoxEntry* pEntry = aSelRestore.top(); + SvTreeListEntry* pEntry = aSelRestore.top(); //#i19717# the entry is maybe already deleted bool bFound = false; for(sal_uLong nEntry = 0; nEntry < pView->GetEntryCount(); nEntry++) @@ -3110,7 +3110,7 @@ void SvImpLBox::Invalidate() pView->SetClipRegion(); } -void SvImpLBox::SetCurEntry( SvLBoxEntry* pEntry ) +void SvImpLBox::SetCurEntry( SvTreeListEntry* pEntry ) { if ( ( aSelEng.GetSelectionMode() != SINGLE_SELECTION ) && ( aSelEng.GetSelectionMode() != NO_SELECTION ) @@ -3139,7 +3139,7 @@ IMPL_LINK_NOARG(SvImpLBox, EditTimerCall) } } - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if( pEntry ) { ShowCursor( sal_False ); @@ -3158,7 +3158,7 @@ sal_Bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) if( !GetVisibleArea().IsInside( aPos )) return sal_False; - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { // recalculate text rectangle @@ -3237,7 +3237,7 @@ void SvImpLBox::SetUpdateMode( sal_Bool bMode ) } } -sal_Bool SvImpLBox::SetMostRight( SvLBoxEntry* pEntry ) +sal_Bool SvImpLBox::SetMostRight( SvTreeListEntry* pEntry ) { if( pView->nTreeFlags & TREEFLAG_RECALCTABS ) { @@ -3279,23 +3279,23 @@ sal_Bool SvImpLBox::SetMostRight( SvLBoxEntry* pEntry ) return sal_False; } -void SvImpLBox::FindMostRight( SvLBoxEntry* pEntryToIgnore ) +void SvImpLBox::FindMostRight( SvTreeListEntry* pEntryToIgnore ) { nMostRight = -1; pMostRightEntry = 0; if( !pView->GetModel() ) return; - SvLBoxEntry* pEntry = (SvLBoxEntry*)pView->FirstVisible(); + SvTreeListEntry* pEntry = (SvTreeListEntry*)pView->FirstVisible(); while( pEntry ) { if( pEntry != pEntryToIgnore ) SetMostRight( pEntry ); - pEntry = (SvLBoxEntry*)pView->NextVisible( pEntry ); + pEntry = (SvTreeListEntry*)pView->NextVisible( pEntry ); } } -void SvImpLBox::FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToIgnore ) +void SvImpLBox::FindMostRight( SvTreeListEntry* pParent, SvTreeListEntry* pEntryToIgnore ) { if( !pParent ) FindMostRight( pEntryToIgnore ); @@ -3303,7 +3303,7 @@ void SvImpLBox::FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToIgnore FindMostRight_Impl( pParent, pEntryToIgnore ); } -void SvImpLBox::FindMostRight_Impl( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToIgnore ) +void SvImpLBox::FindMostRight_Impl( SvTreeListEntry* pParent, SvTreeListEntry* pEntryToIgnore ) { SvTreeEntryList* pList = pTree->GetChildList( pParent ); @@ -3313,7 +3313,7 @@ void SvImpLBox::FindMostRight_Impl( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToI size_t nCount = pList->size(); for( size_t nCur = 0; nCur < nCount; nCur++ ) { - SvLBoxEntry* pChild = (SvLBoxEntry*)(*pList)[ nCur ]; + SvTreeListEntry* pChild = (SvTreeListEntry*)(*pList)[ nCur ]; if( pChild != pEntryToIgnore ) { SetMostRight( pChild ); @@ -3359,12 +3359,12 @@ void SvImpLBox::StopUserEvent() } } -void SvImpLBox::ShowFocusRect( const SvLBoxEntry* pEntry ) +void SvImpLBox::ShowFocusRect( const SvTreeListEntry* pEntry ) { if( pEntry ) { - long nY = GetEntryLine( (SvLBoxEntry*)pEntry ); - Rectangle aRect = pView->GetFocusRect( (SvLBoxEntry*)pEntry, nY ); + long nY = GetEntryLine( (SvTreeListEntry*)pEntry ); + Rectangle aRect = pView->GetFocusRect( (SvTreeListEntry*)pEntry, nY ); Region aOldClip( pView->GetClipRegion()); Region aClipRegion( GetClipRegionRect() ); pView->SetClipRegion( aClipRegion ); @@ -3428,11 +3428,11 @@ bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos ) // ----------------------------------------------------------------------- -bool SvImpLBox::IsSelectable( const SvLBoxEntry* pEntry ) +bool SvImpLBox::IsSelectable( const SvTreeListEntry* pEntry ) { if( pEntry ) { - SvViewDataEntry* pViewDataNewCur = pView->GetViewDataEntry(const_cast<SvLBoxEntry*>(pEntry)); + SvViewDataEntry* pViewDataNewCur = pView->GetViewDataEntry(const_cast<SvTreeListEntry*>(pEntry)); return (pViewDataNewCur == 0) || pViewDataNewCur->IsSelectable(); } else diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 0d3e4e8b7085..b1214111215b 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -35,7 +35,7 @@ struct SvLBoxButtonData_Impl { - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; sal_Bool bDefaultImages; sal_Bool bShowRadioButton; @@ -123,7 +123,7 @@ void SvLBoxButtonData::SetWidthAndHeight() } -void SvLBoxButtonData::StoreButtonState( SvLBoxEntry* pActEntry, sal_uInt16 nItemFlags ) +void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry, sal_uInt16 nItemFlags ) { DBG_CHKTHIS(SvLBoxButtonData,0); pImpl->pEntry = pActEntry; @@ -151,7 +151,7 @@ SvButtonState SvLBoxButtonData::ConvertToButtonState( sal_uInt16 nItemFlags ) co } } -SvLBoxEntry* SvLBoxButtonData::GetActEntry() const +SvTreeListEntry* SvLBoxButtonData::GetActEntry() const { DBG_ASSERT( pImpl, "-SvLBoxButtonData::GetActEntry(): don't use me that way!" ); return pImpl->pEntry; @@ -196,7 +196,7 @@ sal_Bool SvLBoxButtonData::IsRadio() { DBG_NAME(SvLBoxString); -SvLBoxString::SvLBoxString(SvLBoxEntry* pEntry, sal_uInt16 nFlags, const rtl::OUString& rStr) +SvLBoxString::SvLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const rtl::OUString& rStr) : SvLBoxItem(pEntry, nFlags) { DBG_CTOR(SvLBoxString,0); @@ -220,7 +220,7 @@ sal_uInt16 SvLBoxString::IsA() } void SvLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */, - SvLBoxEntry* _pEntry) + SvTreeListEntry* _pEntry) { DBG_CHKTHIS(SvLBoxString,0); if ( _pEntry ) @@ -248,7 +248,7 @@ void SvLBoxString::Clone( SvLBoxItem* pSource ) } void SvLBoxString::InitViewData( - SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData) + SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { DBG_CHKTHIS(SvLBoxString,0); if( !pViewData ) @@ -278,7 +278,7 @@ sal_uInt16 SvLBoxBmp::IsA() return SV_ITEM_ID_LBOXBMP; } -void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, +void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { DBG_CHKTHIS(SvLBoxBmp,0); @@ -288,7 +288,7 @@ void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, } void SvLBoxBmp::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */, - SvLBoxEntry* ) + SvTreeListEntry* ) { DBG_CHKTHIS(SvLBoxBmp,0); sal_uInt16 nStyle = rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE; @@ -313,7 +313,7 @@ void SvLBoxBmp::Clone( SvLBoxItem* pSource ) DBG_NAME(SvLBoxButton); -SvLBoxButton::SvLBoxButton( SvLBoxEntry* pEntry, SvLBoxButtonKind eTheKind, +SvLBoxButton::SvLBoxButton( SvTreeListEntry* pEntry, SvLBoxButtonKind eTheKind, sal_uInt16 nFlags, SvLBoxButtonData* pBData ) : SvLBoxItem( pEntry, nFlags ) { @@ -344,7 +344,7 @@ sal_uInt16 SvLBoxButton::IsA() return SV_ITEM_ID_LBOXBUTTON; } -sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvLBoxEntry* pEntry ) +sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvLBoxButton,0); if ( CheckModification() ) @@ -360,7 +360,7 @@ sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvLBoxEntry* pEntry ) } void SvLBoxButton::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */, - SvLBoxEntry* /*pEntry*/ ) + SvTreeListEntry* /*pEntry*/ ) { DBG_CHKTHIS(SvLBoxButton,0); sal_uInt16 nIndex = eKind == SvLBoxButtonKind_staticImage @@ -444,7 +444,7 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo } } -void SvLBoxButton::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, +void SvLBoxButton::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData ) { DBG_CHKTHIS(SvLBoxButton,0); @@ -478,7 +478,7 @@ struct SvLBoxContextBmp_Impl // *************************************************************** DBG_NAME(SvLBoxContextBmp) -SvLBoxContextBmp::SvLBoxContextBmp( SvLBoxEntry* pEntry, sal_uInt16 nItemFlags, +SvLBoxContextBmp::SvLBoxContextBmp( SvTreeListEntry* pEntry, sal_uInt16 nItemFlags, Image aBmp1, Image aBmp2, sal_uInt16 nEntryFlags ) :SvLBoxItem( pEntry, nItemFlags ) ,m_pImpl( new SvLBoxContextBmp_Impl ) @@ -527,7 +527,7 @@ Image& SvLBoxContextBmp::implGetImageStore( sal_Bool _bFirst ) return _bFirst ? m_pImpl->m_aImage1 : m_pImpl->m_aImage2; } -void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, +void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { DBG_CHKTHIS(SvLBoxContextBmp,0); @@ -537,7 +537,7 @@ void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, } void SvLBoxContextBmp::Paint( const Point& _rPos, SvTreeListBox& _rDev, - sal_uInt16 _nViewDataEntryFlags, SvLBoxEntry* _pEntry ) + sal_uInt16 _nViewDataEntryFlags, SvTreeListEntry* _pEntry ) { DBG_CHKTHIS(SvLBoxContextBmp,0); diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 6f410fa4e846..64a1bd8ec499 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -79,7 +79,7 @@ void SvTabListBox::SetTabs() } } -void SvTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr, +void SvTabListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr, const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind ) { SvTreeListBox::InitEntry( pEntry, rStr, rColl, rExp, eButtonKind ); @@ -181,7 +181,7 @@ void SvTabListBox::SetTab( sal_uInt16 nTab,long nValue,MapUnit eMapUnit ) } } -SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, +SvTreeListEntry* SvTabListBox::InsertEntry( const XubString& rText, SvTreeListEntry* pParent, sal_Bool /*bChildrenOnDemand*/, sal_uLong nPos, void* pUserData, SvLBoxButtonKind ) @@ -189,10 +189,10 @@ SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pPa return InsertEntryToColumn( rText, pParent, nPos, 0xffff, pUserData ); } -SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, +SvTreeListEntry* SvTabListBox::InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvLBoxEntry* pParent, + SvTreeListEntry* pParent, sal_Bool /*bChildrenOnDemand*/, sal_uLong nPos, void* pUserData, SvLBoxButtonKind ) @@ -201,7 +201,7 @@ SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, pParent, nPos, 0xffff, pUserData ); } -SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, +SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser ) { XubString aStr; @@ -227,9 +227,9 @@ SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUser ); } -SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, +SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvLBoxEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser ) + SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser ) { XubString aStr; if( nCol != 0xffff ) @@ -258,18 +258,18 @@ SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, pParent, sal_False, nPos, pUser ); } -SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, sal_uLong nPos, +SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUser ) { return InsertEntryToColumn( rStr,0,nPos, nCol, pUser ); } -String SvTabListBox::GetEntryText( SvLBoxEntry* pEntry ) const +String SvTabListBox::GetEntryText( SvTreeListEntry* pEntry ) const { return GetEntryText( pEntry, 0xffff ); } -String SvTabListBox::GetEntryText( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const +String SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const { DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry"); XubString aResult; @@ -303,17 +303,17 @@ String SvTabListBox::GetEntryText( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const String SvTabListBox::GetEntryText( sal_uLong nPos, sal_uInt16 nCol ) const { - SvLBoxEntry* pEntry = GetEntryOnPos( nPos ); + SvTreeListEntry* pEntry = GetEntryOnPos( nPos ); return GetEntryText( pEntry, nCol ); } void SvTabListBox::SetEntryText( const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol ) { - SvLBoxEntry* pEntry = SvTreeListBox::GetEntry( nPos ); + SvTreeListEntry* pEntry = SvTreeListBox::GetEntry( nPos ); SetEntryText( rStr, pEntry, nCol ); } -void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal_uInt16 nCol ) +void SvTabListBox::SetEntryText( const XubString& rStr, SvTreeListEntry* pEntry, sal_uInt16 nCol ) { DBG_ASSERT(pEntry,"SetEntryText:Invalid Entry"); if( !pEntry ) @@ -372,7 +372,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal String SvTabListBox::GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const { - SvLBoxEntry* pEntry = GetEntryOnPos( nPos ); + SvTreeListEntry* pEntry = GetEntryOnPos( nPos ); DBG_ASSERT( pEntry, "SvTabListBox::GetCellText(): Invalid Entry" ); XubString aResult; if ( pEntry && pEntry->ItemCount() > ( nCol + 1 ) ) @@ -387,7 +387,7 @@ String SvTabListBox::GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const sal_uLong SvTabListBox::GetEntryPos( const XubString& rStr, sal_uInt16 nCol ) { sal_uLong nPos = 0; - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while( pEntry ) { XubString aStr( GetEntryText( pEntry, nCol )); @@ -399,10 +399,10 @@ sal_uLong SvTabListBox::GetEntryPos( const XubString& rStr, sal_uInt16 nCol ) return 0xffffffff; } -sal_uLong SvTabListBox::GetEntryPos( const SvLBoxEntry* pEntry ) const +sal_uLong SvTabListBox::GetEntryPos( const SvTreeListEntry* pEntry ) const { sal_uLong nPos = 0; - SvLBoxEntry* pTmpEntry = First(); + SvTreeListEntry* pTmpEntry = First(); while( pTmpEntry ) { if ( pTmpEntry == pEntry ) @@ -444,7 +444,7 @@ const xub_Unicode* SvTabListBox::GetToken( const xub_Unicode* pPtr, sal_uInt16& String SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const { - SvLBoxEntry* pEntry = SvTreeListBox::GetEntry( nPos ); + SvTreeListEntry* pEntry = SvTreeListBox::GetEntry( nPos ); DBG_ASSERT( pEntry, "GetTabEntryText(): Invalid entry " ); XubString aResult; if ( pEntry ) @@ -480,13 +480,13 @@ String SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const return aResult; } -SvLBoxEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const +SvTreeListEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; sal_uLong i, nPos = 0, nCount = GetLevelChildCount( NULL ); for ( i = 0; i < nCount; ++i ) { - SvLBoxEntry* pParent = GetEntry(i); + SvTreeListEntry* pParent = GetEntry(i); if ( nPos == _nEntryPos ) { pEntry = pParent; @@ -504,18 +504,18 @@ SvLBoxEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const return pEntry; } -SvLBoxEntry* SvTabListBox::GetChildOnPos( SvLBoxEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const +SvTreeListEntry* SvTabListBox::GetChildOnPos( SvTreeListEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const { sal_uLong i, nCount = GetLevelChildCount( _pParent ); for ( i = 0; i < nCount; ++i ) { - SvLBoxEntry* pParent = GetEntry( _pParent, i ); + SvTreeListEntry* pParent = GetEntry( _pParent, i ); if ( _rPos == _nEntryPos ) return pParent; else { _rPos++; - SvLBoxEntry* pEntry = GetChildOnPos( pParent, _nEntryPos, _rPos ); + SvTreeListEntry* pEntry = GetChildOnPos( pParent, _nEntryPos, _rPos ); if ( pEntry ) return pEntry; } @@ -616,7 +616,7 @@ void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar ) // ----------------------------------------------------------------------- -sal_Bool SvHeaderTabListBox::IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const +sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)( pEntry->GetItem( nCol + 1 ) ); @@ -632,31 +632,31 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol // ----------------------------------------------------------------------- -SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( +SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) { - SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, nPos, nCol, pUserData ); + SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, nPos, nCol, pUserData ); RecalculateAccessibleChildren(); return pEntry; } // ----------------------------------------------------------------------- -SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( - const XubString& rStr, SvLBoxEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) +SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( + const XubString& rStr, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) { - SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, pParent, nPos, nCol, pUserData ); + SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, pParent, nPos, nCol, pUserData ); RecalculateAccessibleChildren(); return pEntry; } // ----------------------------------------------------------------------- -SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( +SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( const XubString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvLBoxEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) + SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) { - SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn( + SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, rExpandedEntryBmp, rCollapsedEntryBmp, pParent, nPos, nCol, pUserData ); RecalculateAccessibleChildren(); return pEntry; @@ -665,7 +665,7 @@ SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( // ----------------------------------------------------------------------- sal_uLong SvHeaderTabListBox::Insert( - SvLBoxEntry* pEnt, SvLBoxEntry* pPar, sal_uLong nPos ) + SvTreeListEntry* pEnt, SvTreeListEntry* pPar, sal_uLong nPos ) { sal_uLong n = SvTabListBox::Insert( pEnt, pPar, nPos ); RecalculateAccessibleChildren(); @@ -674,7 +674,7 @@ sal_uLong SvHeaderTabListBox::Insert( // ----------------------------------------------------------------------- -sal_uLong SvHeaderTabListBox::Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos ) +sal_uLong SvHeaderTabListBox::Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos ) { sal_uLong nPos = SvTabListBox::Insert( pEntry, nRootPos ); RecalculateAccessibleChildren(); @@ -683,7 +683,7 @@ sal_uLong SvHeaderTabListBox::Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos ) // ----------------------------------------------------------------------- -void SvHeaderTabListBox::RemoveEntry( SvLBoxEntry* _pEntry ) +void SvHeaderTabListBox::RemoveEntry( SvTreeListEntry* _pEntry ) { GetModel()->Remove( _pEntry ); m_aAccessibleChildren.clear(); @@ -745,7 +745,7 @@ void SvHeaderTabListBox::RecalculateAccessibleChildren() sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ) { sal_Bool bRet = sal_False; - SvLBoxEntry* pEntry = GetEntry( _nRow ); + SvTreeListEntry* pEntry = GetEntry( _nRow ); if ( pEntry ) { sal_uInt16 nItemCount = pEntry->ItemCount(); @@ -781,7 +781,7 @@ sal_uInt16 SvHeaderTabListBox::GetColumnCount() const sal_Int32 SvHeaderTabListBox::GetCurrRow() const { sal_Int32 nRet = -1; - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if ( pEntry ) { sal_uLong nCount = GetEntryCount(); @@ -875,7 +875,7 @@ sal_Int32 SvHeaderTabListBox::GetSelectedColumnCount() const // ----------------------------------------------------------------------- bool SvHeaderTabListBox::IsRowSelected( long _nRow ) const { - SvLBoxEntry* pEntry = GetEntry( _nRow ); + SvTreeListEntry* pEntry = GetEntry( _nRow ); return ( pEntry && IsSelected( pEntry ) ); } // ----------------------------------------------------------------------- @@ -930,7 +930,7 @@ Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 { DBG_ASSERT( !_bIsHeader || 0 == _nRow, "invalid parameters" ); Rectangle aRect; - SvLBoxEntry* pEntry = GetEntry( _nRow ); + SvTreeListEntry* pEntry = GetEntry( _nRow ); if ( pEntry ) { aRect = _bIsHeader ? calcHeaderRect( sal_True, sal_False ) : GetBoundingRect( pEntry ); diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 17f56c50a2a9..8cf16a9f6b8a 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -30,12 +30,12 @@ SvTreeEntryList::SvTreeEntryList() {} -void SvTreeEntryList::push_back( SvListEntry* pItem ) +void SvTreeEntryList::push_back( SvTreeListEntry* pItem ) { maEntryList.push_back( pItem ); } -void SvTreeEntryList::insert( SvListEntry* pItem, size_t i ) +void SvTreeEntryList::insert( SvTreeListEntry* pItem, size_t i ) { if ( i < maEntryList.size() ) { @@ -47,9 +47,9 @@ void SvTreeEntryList::insert( SvListEntry* pItem, size_t i ) } } -void SvTreeEntryList::remove( SvListEntry* pItem ) +void SvTreeEntryList::remove( SvTreeListEntry* pItem ) { - for (std::vector<SvListEntry*>::iterator it = maEntryList.begin(); it != maEntryList.end(); ++it) + for (std::vector<SvTreeListEntry*>::iterator it = maEntryList.begin(); it != maEntryList.end(); ++it) { if ( *it == pItem ) { @@ -66,7 +66,7 @@ void SvTreeEntryList::remove( size_t i ) } } -void SvTreeEntryList::replace( SvListEntry* pNew, SvListEntry* pOld ) +void SvTreeEntryList::replace( SvTreeListEntry* pNew, SvTreeListEntry* pOld ) { for ( size_t i = 0, n = maEntryList.size(); i < n; ++i ) { if ( maEntryList[ i ] == pOld ) { @@ -91,7 +91,7 @@ size_t SvTreeEntryList::size() const return maEntryList.size(); } -size_t SvTreeEntryList::GetPos(const SvListEntry* pItem) const +size_t SvTreeEntryList::GetPos(const SvTreeListEntry* pItem) const { for ( size_t i = 0, n = maEntryList.size(); i < n; ++i ) { if ( maEntryList[ i ] == pItem ) { @@ -101,12 +101,12 @@ size_t SvTreeEntryList::GetPos(const SvListEntry* pItem) const return (size_t)~0; } -SvListEntry* SvTreeEntryList::operator[](size_t i) +SvTreeListEntry* SvTreeEntryList::operator[](size_t i) { return i < maEntryList.size() ? maEntryList[i] : NULL; } -const SvListEntry* SvTreeEntryList::operator[](size_t i) const +const SvTreeListEntry* SvTreeEntryList::operator[](size_t i) const { return i < maEntryList.size() ? maEntryList[i] : NULL; } @@ -131,12 +131,12 @@ SvTreeEntryList::iterator SvTreeEntryList::end() return maEntryList.end(); } -SvListEntry* SvTreeEntryList::front() +SvTreeListEntry* SvTreeEntryList::front() { return maEntryList.front(); } -SvListEntry* SvTreeEntryList::back() +SvTreeListEntry* SvTreeEntryList::back() { return maEntryList.back(); } @@ -152,7 +152,7 @@ SvTreeEntryList::SvTreeEntryList(const SvTreeEntryList& rList) { maEntryList.clear(); for ( size_t i = 0, n = rList.size(); i < n; ++i ) - maEntryList.push_back(const_cast<SvListEntry*>(rList[i])); + maEntryList.push_back(const_cast<SvTreeListEntry*>(rList[i])); } DBG_NAME(SvViewData); @@ -192,7 +192,7 @@ SvTreeList::SvTreeList() nEntryCount = 0; bAbsPositionsValid = sal_False; nRefCount = 1; - pRootItem = new SvListEntry; + pRootItem = new SvTreeListEntry; eSortMode = SortNone; } @@ -220,8 +220,8 @@ SvTreeList::~SvTreeList() void SvTreeList::Broadcast( sal_uInt16 nActionId, - SvListEntry* pEntry1, - SvListEntry* pEntry2, + SvTreeListEntry* pEntry1, + SvTreeListEntry* pEntry2, sal_uLong nPos ) { sal_uLong nViewCount = aViewList.size(); @@ -259,7 +259,7 @@ void SvTreeList::RemoveView( SvListView* pView ) // an entry is visible if all parents are expanded -sal_Bool SvTreeList::IsEntryVisible( const SvListView* pView, SvListEntry* pEntry ) const +sal_Bool SvTreeList::IsEntryVisible( const SvListView* pView, SvTreeListEntry* pEntry ) const { DBG_ASSERT(pView&&pEntry,"IsVisible:Invalid Params"); sal_Bool bRetVal=sal_False; @@ -275,7 +275,7 @@ sal_Bool SvTreeList::IsEntryVisible( const SvListView* pView, SvListEntry* pEntr return bRetVal; } -sal_uInt16 SvTreeList::GetDepth( SvListEntry* pEntry ) const +sal_uInt16 SvTreeList::GetDepth( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry&&pEntry!=pRootItem,"GetDepth:Bad Entry"); sal_uInt16 nDepth = 0; @@ -314,7 +314,7 @@ void SvTreeList::Clear() |* *************************************************************************/ -bool SvTreeList::IsChild(const SvListEntry* pParent, const SvListEntry* pChild) const +bool SvTreeList::IsChild(const SvTreeListEntry* pParent, const SvTreeListEntry* pChild) const { if ( !pParent ) pParent = pRootItem; @@ -327,7 +327,7 @@ bool SvTreeList::IsChild(const SvListEntry* pParent, const SvListEntry* pChild) SvTreeEntryList::const_iterator it = pList->begin(), itEnd = pList->end(); while (!bIsChild && it != itEnd) { - const SvListEntry* pActualChild = *it; + const SvTreeListEntry* pActualChild = *it; if ( pActualChild == pChild ) bIsChild = true; else @@ -340,7 +340,7 @@ bool SvTreeList::IsChild(const SvListEntry* pParent, const SvListEntry* pChild) return bIsChild; } -sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal_uLong nListPos) +sal_uLong SvTreeList::Move(SvTreeListEntry* pSrcEntry,SvTreeListEntry* pTargetParent,sal_uLong nListPos) { // pDest may be 0! DBG_ASSERT(pSrcEntry,"Entry?"); @@ -362,7 +362,7 @@ sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal // insert dummy pointer, as nListPos might become invalid because of the // following Remove. - SvListEntry* pDummy = 0; + SvTreeListEntry* pDummy = 0; pDstList->insert( pDummy, nListPos ); // delete @@ -371,7 +371,7 @@ sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal if ( pSrcList->empty() ) { // no children, thus delete child list - SvListEntry* pParent = pSrcEntry->pParent; + SvTreeListEntry* pParent = pSrcEntry->pParent; pParent->pChildren = 0; delete pSrcList; pSrcList = 0; @@ -398,7 +398,7 @@ sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal return nRetVal; } -sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal_uLong nListPos) +sal_uLong SvTreeList::Copy(SvTreeListEntry* pSrcEntry,SvTreeListEntry* pTargetParent,sal_uLong nListPos) { // pDest may be 0! DBG_ASSERT(pSrcEntry,"Entry?"); @@ -410,7 +410,7 @@ sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal bAbsPositionsValid = sal_False; sal_uLong nCloneCount = 0; - SvListEntry* pClonedEntry = Clone( pSrcEntry, nCloneCount ); + SvTreeListEntry* pClonedEntry = Clone( pSrcEntry, nCloneCount ); nEntryCount += nCloneCount; SvTreeEntryList* pDstList = pTargetParent->pChildren; @@ -434,9 +434,9 @@ sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal |* *************************************************************************/ -void SvTreeList::Move( SvListEntry* pSrcEntry, SvListEntry* pDstEntry ) +void SvTreeList::Move( SvTreeListEntry* pSrcEntry, SvTreeListEntry* pDstEntry ) { - SvListEntry* pParent; + SvTreeListEntry* pParent; sal_uLong nPos; if ( !pDstEntry ) @@ -453,8 +453,8 @@ void SvTreeList::Move( SvListEntry* pSrcEntry, SvListEntry* pDstEntry ) Move( pSrcEntry, pParent, nPos ); } -void SvTreeList::InsertTree(SvListEntry* pSrcEntry, - SvListEntry* pTargetParent,sal_uLong nListPos) +void SvTreeList::InsertTree(SvTreeListEntry* pSrcEntry, + SvTreeListEntry* pTargetParent,sal_uLong nListPos) { DBG_ASSERT(pSrcEntry,"InsertTree:Entry?"); if ( !pSrcEntry ) @@ -483,18 +483,18 @@ CheckIntegrity(); Broadcast(LISTACTION_INSERTED_TREE, pSrcEntry ); } -SvListEntry* SvTreeList::CloneEntry( SvListEntry* pSource ) const +SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* pSource ) const { if( aCloneLink.IsSet() ) - return (SvListEntry*)aCloneLink.Call( pSource ); - SvListEntry* pEntry = CreateEntry(); + return (SvTreeListEntry*)aCloneLink.Call( pSource ); + SvTreeListEntry* pEntry = CreateEntry(); pSource->Clone( pEntry ); return pSource; } -SvListEntry* SvTreeList::CreateEntry() const +SvTreeListEntry* SvTreeList::CreateEntry() const { - return new SvListEntry; + return new SvTreeListEntry; } /************************************************************************* @@ -503,9 +503,9 @@ SvListEntry* SvTreeList::CreateEntry() const |* *************************************************************************/ -SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const +SvTreeListEntry* SvTreeList::Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const { - SvListEntry* pClonedEntry = CloneEntry( pEntry ); + SvTreeListEntry* pClonedEntry = CloneEntry( pEntry ); nCloneCount = 1; SvTreeEntryList* pChildren = pEntry->pChildren; if ( pChildren ) @@ -520,7 +520,7 @@ SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) co *************************************************************************/ SvTreeEntryList* SvTreeList::CloneChildren( SvTreeEntryList* pChildren, - SvListEntry* pNewParent, + SvTreeListEntry* pNewParent, sal_uLong& nCloneCount ) const { DBG_ASSERT(!pChildren->empty(),"Children?"); @@ -528,8 +528,8 @@ SvTreeEntryList* SvTreeList::CloneChildren( SvTreeEntryList* pChildren, SvTreeEntryList::iterator it = pChildren->begin(), itEnd = pChildren->end(); while (it != itEnd) { - SvListEntry* pChild = *it; - SvListEntry* pNewChild = CloneEntry( pChild ); + SvTreeListEntry* pChild = *it; + SvTreeListEntry* pNewChild = CloneEntry( pChild ); nCloneCount++; pNewChild->pParent = pNewParent; SvTreeEntryList* pSubChildren = pChild->pChildren; @@ -552,7 +552,7 @@ SvTreeEntryList* SvTreeList::CloneChildren( SvTreeEntryList* pChildren, |* *************************************************************************/ -sal_uLong SvTreeList::GetChildCount( SvListEntry* pParent ) const +sal_uLong SvTreeList::GetChildCount( SvTreeListEntry* pParent ) const { if ( !pParent ) return GetEntryCount(); @@ -577,7 +577,7 @@ sal_uLong SvTreeList::GetChildCount( SvListEntry* pParent ) const |* *************************************************************************/ -sal_uLong SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry* pParent) const +sal_uLong SvTreeList::GetVisibleChildCount(const SvListView* pView, SvTreeListEntry* pParent) const { DBG_ASSERT(pView,"GetVisChildCount:No View"); if ( !pParent ) @@ -596,7 +596,7 @@ sal_uLong SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry* return nCount; } -sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry* pParent) const +sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvTreeListEntry* pParent) const { DBG_ASSERT(pView,"GetChildSelCount:No View"); if ( !pParent ) @@ -623,10 +623,10 @@ sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry |* *************************************************************************/ -SvListEntry* SvTreeList::First() const +SvTreeListEntry* SvTreeList::First() const { if ( nEntryCount ) - return (SvListEntry*)(*pRootItem->pChildren)[ 0 ]; + return (SvTreeListEntry*)(*pRootItem->pChildren)[ 0 ]; else return 0; } @@ -636,7 +636,7 @@ SvListEntry* SvTreeList::First() const |* SvTreeList::Next |* *************************************************************************/ -SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) const +SvTreeListEntry* SvTreeList::Next( SvTreeListEntry* pActEntry, sal_uInt16* pDepth ) const { DBG_ASSERT( pActEntry && pActEntry->pParent, "SvTreeList::Next: invalid entry/parent!" ); if ( !pActEntry || !pActEntry->pParent ) @@ -656,7 +656,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons if ( pActEntry->pChildren /* && pActEntry->pChildren->Count() */ ) { nDepth++; - pActEntry = (SvListEntry*)(*pActEntry->pChildren)[ 0 ]; + pActEntry = (SvTreeListEntry*)(*pActEntry->pChildren)[ 0 ]; if ( bWithDepth ) *pDepth = nDepth; return pActEntry; @@ -664,13 +664,13 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons if ( pActualList->size() > ( nActualPos + 1 ) ) { - pActEntry = (SvListEntry*)(*pActualList)[ nActualPos + 1 ]; + pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos + 1 ]; if ( bWithDepth ) *pDepth = nDepth; return pActEntry; } - SvListEntry* pParent = pActEntry->pParent; + SvTreeListEntry* pParent = pActEntry->pParent; nDepth--; while( pParent != pRootItem && pParent != 0 ) { @@ -680,7 +680,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons nActualPos = pParent->GetChildListPos(); if ( pActualList->size() > ( nActualPos + 1 ) ) { - pActEntry = (SvListEntry*)(*pActualList)[ nActualPos + 1 ]; + pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos + 1 ]; if ( bWithDepth ) *pDepth = nDepth; return pActEntry; @@ -696,7 +696,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons |* SvTreeList::Prev |* *************************************************************************/ -SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, sal_uInt16* pDepth ) const +SvTreeListEntry* SvTreeList::Prev( SvTreeListEntry* pActEntry, sal_uInt16* pDepth ) const { DBG_ASSERT(pActEntry!=0,"Entry?"); @@ -745,12 +745,12 @@ SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons |* *************************************************************************/ -SvListEntry* SvTreeList::Last() const +SvTreeListEntry* SvTreeList::Last() const { SvTreeEntryList* pActList = pRootItem->pChildren; // if ( pActList->Count() == 0 ) // return 0; - SvListEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; while( pActList ) { pEntry = pActList->back(); @@ -767,7 +767,7 @@ SvListEntry* SvTreeList::Last() const |* *************************************************************************/ -sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvListEntry* pEntry ) const +sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvTreeListEntry* pEntry ) const { DBG_ASSERT(pView&&pEntry,"View/Entry?"); @@ -796,7 +796,7 @@ sal_uLong SvTreeList::GetVisibleCount( SvListView* pView ) const return pView->nVisibleCount; sal_uLong nPos = 0; - SvListEntry* pEntry = First(); // first entry is always visible + SvTreeListEntry* pEntry = First(); // first entry is always visible while ( pEntry ) { SvViewData* pViewData = pView->GetViewData( pEntry ); @@ -825,7 +825,7 @@ sal_uLong SvTreeList::GetVisibleCount( SvListView* pView ) const // For performance reasons, this function assumes that the passed entry is // already visible. -SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEntry,sal_uInt16* pActDepth) const +SvTreeListEntry* SvTreeList::NextVisible(const SvListView* pView,SvTreeListEntry* pActEntry,sal_uInt16* pActDepth) const { DBG_ASSERT(pView,"NextVisible:No View"); if ( !pActEntry ) @@ -846,7 +846,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn { DBG_ASSERT(pActEntry->pChildren,"Children?"); nDepth++; - pActEntry = (SvListEntry*)(*pActEntry->pChildren)[ 0 ]; + pActEntry = (SvTreeListEntry*)(*pActEntry->pChildren)[ 0 ]; if ( bWithDepth ) *pActDepth = nDepth; return pActEntry; @@ -855,13 +855,13 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn nActualPos++; if ( pActualList->size() > nActualPos ) { - pActEntry = (SvListEntry*)(*pActualList)[ nActualPos ]; + pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos ]; if ( bWithDepth ) *pActDepth = nDepth; return pActEntry; } - SvListEntry* pParent = pActEntry->pParent; + SvTreeListEntry* pParent = pActEntry->pParent; nDepth--; while( pParent != pRootItem ) { @@ -870,7 +870,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn nActualPos++; if ( pActualList->size() > nActualPos ) { - pActEntry = (SvListEntry*)(*pActualList)[ nActualPos ]; + pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos ]; if ( bWithDepth ) *pActDepth = nDepth; return pActEntry; @@ -891,7 +891,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn // For performance reasons, this function assumes that the passed entry is // already visible. -SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActEntry, sal_uInt16* pActDepth) const +SvTreeListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvTreeListEntry* pActEntry, sal_uInt16* pActDepth) const { DBG_ASSERT(pView&&pActEntry,"PrevVis:View/Entry?"); @@ -908,7 +908,7 @@ SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActE if ( nActualPos > 0 ) { - pActEntry = (SvListEntry*)(*pActualList)[ nActualPos - 1 ]; + pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos - 1 ]; while( pView->IsExpanded(pActEntry) ) { pActualList = pActEntry->pChildren; @@ -940,10 +940,10 @@ SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActE |* *************************************************************************/ -SvListEntry* SvTreeList::LastVisible( const SvListView* pView, sal_uInt16* pDepth) const +SvTreeListEntry* SvTreeList::LastVisible( const SvListView* pView, sal_uInt16* pDepth) const { DBG_ASSERT(pView,"LastVis:No View"); - SvListEntry* pEntry = Last(); + SvTreeListEntry* pEntry = Last(); while( pEntry && !IsEntryVisible( pView, pEntry ) ) pEntry = PrevVisible( pView, pEntry ); if ( pEntry && pDepth ) @@ -957,7 +957,7 @@ SvListEntry* SvTreeList::LastVisible( const SvListView* pView, sal_uInt16* pDept |* *************************************************************************/ -SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pEntry,sal_uInt16& nDelta) const +SvTreeListEntry* SvTreeList::NextVisible(const SvListView* pView,SvTreeListEntry* pEntry,sal_uInt16& nDelta) const { DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"NextVis:Wrong Prms/!Vis"); @@ -986,7 +986,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pEntry |* *************************************************************************/ -SvListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvListEntry* pEntry, sal_uInt16& nDelta ) const +SvTreeListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvTreeListEntry* pEntry, sal_uInt16& nDelta ) const { DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"PrevVis:Parms/!Vis"); @@ -1012,31 +1012,31 @@ SvListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvListEntry* pEnt |* *************************************************************************/ -SvListEntry* SvTreeList::FirstSelected( const SvListView* pView) const +SvTreeListEntry* SvTreeList::FirstSelected( const SvListView* pView) const { DBG_ASSERT(pView,"FirstSel:No View"); if( !pView ) return 0; - SvListEntry* pActSelEntry = First(); + SvTreeListEntry* pActSelEntry = First(); while( pActSelEntry && !pView->IsSelected(pActSelEntry) ) pActSelEntry = NextVisible( pView, pActSelEntry ); return pActSelEntry; } -SvListEntry* SvTreeList::FirstChild( SvListEntry* pParent ) const +SvTreeListEntry* SvTreeList::FirstChild( SvTreeListEntry* pParent ) const { if ( !pParent ) pParent = pRootItem; - SvListEntry* pResult; + SvTreeListEntry* pResult; if ( pParent->pChildren ) - pResult = (SvListEntry*)(*pParent->pChildren)[ 0 ]; + pResult = (SvTreeListEntry*)(*pParent->pChildren)[ 0 ]; else pResult = 0; return pResult; } -SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const +SvTreeListEntry* SvTreeList::NextSibling( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"Entry?"); if( !pEntry ) @@ -1044,11 +1044,11 @@ SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const SvTreeEntryList* pList = pEntry->pParent->pChildren; sal_uLong nPos = pEntry->GetChildListPos(); nPos++; - pEntry = (SvListEntry*)(*pList)[ nPos ]; + pEntry = (SvTreeListEntry*)(*pList)[ nPos ]; return pEntry; } -SvListEntry* SvTreeList::PrevSibling( SvListEntry* pEntry ) const +SvTreeListEntry* SvTreeList::PrevSibling( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"Entry?"); if( !pEntry ) @@ -1059,17 +1059,17 @@ SvListEntry* SvTreeList::PrevSibling( SvListEntry* pEntry ) const if ( nPos == 0 ) return 0; nPos--; - pEntry = (SvListEntry*)(*pList)[ nPos ]; + pEntry = (SvTreeListEntry*)(*pList)[ nPos ]; return pEntry; } -SvListEntry* SvTreeList::LastSibling( SvListEntry* pEntry ) const +SvTreeListEntry* SvTreeList::LastSibling( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"LastSibling:Entry?"); if( !pEntry ) return 0; - SvListEntry* pSib = 0; + SvTreeListEntry* pSib = 0; SvTreeEntryList* pSibs = pEntry->pParent->pChildren; if ( pSibs ) pSib = pSibs->back(); @@ -1083,7 +1083,7 @@ SvListEntry* SvTreeList::LastSibling( SvListEntry* pEntry ) const |* *************************************************************************/ -SvListEntry* SvTreeList::NextSelected( const SvListView* pView, SvListEntry* pEntry ) const +SvTreeListEntry* SvTreeList::NextSelected( const SvListView* pView, SvTreeListEntry* pEntry ) const { DBG_ASSERT(pView&&pEntry,"NextSel:View/Entry?"); pEntry = Next( pEntry ); @@ -1098,7 +1098,7 @@ SvListEntry* SvTreeList::NextSelected( const SvListView* pView, SvListEntry* pEn |* *************************************************************************/ -SvListEntry* SvTreeList::PrevSelected( const SvListView* pView, SvListEntry* pEntry) const +SvTreeListEntry* SvTreeList::PrevSelected( const SvListView* pView, SvTreeListEntry* pEntry) const { DBG_ASSERT(pView&&pEntry,"PrevSel:View/Entry?"); pEntry = Prev( pEntry ); @@ -1114,10 +1114,10 @@ SvListEntry* SvTreeList::PrevSelected( const SvListView* pView, SvListEntry* pEn |* *************************************************************************/ -SvListEntry* SvTreeList::LastSelected( const SvListView* pView ) const +SvTreeListEntry* SvTreeList::LastSelected( const SvListView* pView ) const { DBG_ASSERT(pView,"LastSel:No View"); - SvListEntry* pEntry = Last(); + SvTreeListEntry* pEntry = Last(); while( pEntry && !pView->IsSelected(pEntry) ) pEntry = Prev( pEntry ); return pEntry; @@ -1128,7 +1128,7 @@ SvListEntry* SvTreeList::LastSelected( const SvListView* pView ) const |* SvTreeList::Insert |* *************************************************************************/ -sal_uLong SvTreeList::Insert( SvListEntry* pEntry,SvListEntry* pParent,sal_uLong nPos ) +sal_uLong SvTreeList::Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos ) { DBG_ASSERT( pEntry,"Entry?"); @@ -1170,7 +1170,7 @@ sal_uLong SvTreeList::Insert( SvListEntry* pEntry,SvListEntry* pParent,sal_uLong |* *************************************************************************/ -sal_uLong SvTreeList::GetAbsPos( SvListEntry* pEntry) const +sal_uLong SvTreeList::GetAbsPos( SvTreeListEntry* pEntry) const { if ( !bAbsPositionsValid ) ((SvTreeList*)this)->SetAbsolutePositions(); @@ -1186,7 +1186,7 @@ sal_uLong SvTreeList::GetAbsPos( SvListEntry* pEntry) const void SvTreeList::SetAbsolutePositions() { sal_uLong nPos = 0; - SvListEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { pEntry->nAbsPos = nPos; @@ -1206,7 +1206,7 @@ CheckIntegrity(); |* *************************************************************************/ -void SvTreeList::Expand( SvListView* pView, SvListEntry* pEntry ) +void SvTreeList::Expand( SvListView* pView, SvTreeListEntry* pEntry ) { DBG_ASSERT(pEntry&&pView,"Expand:View/Entry?"); if ( pView->IsExpanded(pEntry) ) @@ -1216,7 +1216,7 @@ void SvTreeList::Expand( SvListView* pView, SvListEntry* pEntry ) SvViewData* pViewData = pView->GetViewData(pEntry); pViewData->nFlags |= SVLISTENTRYFLAG_EXPANDED; - SvListEntry* pParent = pEntry->pParent; + SvTreeListEntry* pParent = pEntry->pParent; // if parent is visible, invalidate status data if ( pView->IsExpanded( pParent ) ) { @@ -1234,7 +1234,7 @@ CheckIntegrity(); |* *************************************************************************/ -void SvTreeList::Collapse( SvListView* pView, SvListEntry* pEntry ) +void SvTreeList::Collapse( SvListView* pView, SvTreeListEntry* pEntry ) { DBG_ASSERT(pView&&pEntry,"Collapse:View/Entry?"); if ( !pView->IsExpanded(pEntry) ) @@ -1245,7 +1245,7 @@ void SvTreeList::Collapse( SvListView* pView, SvListEntry* pEntry ) SvViewData* pViewData = pView->GetViewData( pEntry ); pViewData->nFlags &=(~SVLISTENTRYFLAG_EXPANDED); - SvListEntry* pParent = pEntry->pParent; + SvTreeListEntry* pParent = pEntry->pParent; if ( pView->IsExpanded(pParent) ) { pView->nVisibleCount = 0; @@ -1263,7 +1263,7 @@ CheckIntegrity(); |* *************************************************************************/ -sal_Bool SvTreeList::Select( SvListView* pView, SvListEntry* pEntry, sal_Bool bSelect ) +sal_Bool SvTreeList::Select( SvListView* pView, SvTreeListEntry* pEntry, sal_Bool bSelect ) { DBG_ASSERT(pView&&pEntry,"Select:View/Entry?"); SvViewData* pViewData = pView->GetViewData( pEntry ); @@ -1298,7 +1298,7 @@ sal_Bool SvTreeList::Select( SvListView* pView, SvListEntry* pEntry, sal_Bool bS |* SvTreeList::Remove |* *************************************************************************/ -sal_Bool SvTreeList::Remove( SvListEntry* pEntry ) +sal_Bool SvTreeList::Remove( SvTreeListEntry* pEntry ) { DBG_ASSERT(pEntry,"Cannot remove root, use clear"); @@ -1315,7 +1315,7 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry ) sal_uLong nRemoved = 1 + GetChildCount(pEntry); bAbsPositionsValid = sal_False; - SvListEntry* pParent = pEntry->pParent; + SvTreeListEntry* pParent = pEntry->pParent; SvTreeEntryList* pList = pParent->pChildren; DBG_ASSERT(pList,"Remove:No Childlist"); sal_Bool bLastEntry = sal_False; @@ -1365,7 +1365,7 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry ) void SvTreeList::SelectAll( SvListView* pView, sal_Bool bSelect ) { DBG_ASSERT(pView,"SelectAll:NoView"); - SvListEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { SvViewData* pViewData = pView->GetViewData( pEntry ); @@ -1386,9 +1386,9 @@ CheckIntegrity(); } -SvListEntry* SvTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const +SvTreeListEntry* SvTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const { - SvListEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( nAbsPos && pEntry ) { pEntry = Next( pEntry ); @@ -1397,10 +1397,10 @@ SvListEntry* SvTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const return pEntry; } -SvListEntry* SvTreeList::GetEntryAtVisPos( const SvListView* pView, sal_uLong nVisPos ) const +SvTreeListEntry* SvTreeList::GetEntryAtVisPos( const SvListView* pView, sal_uLong nVisPos ) const { DBG_ASSERT(pView,"GetEntryAtVisPos:No View"); - SvListEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( nVisPos && pEntry ) { pEntry = NextVisible( pView, pEntry ); @@ -1413,21 +1413,21 @@ void SvTreeList::SetListPositions( SvTreeEntryList* pList ) { if( !pList->empty() ) { - SvListEntry* pEntry = (SvListEntry*)(*pList)[ 0 ]; + SvTreeListEntry* pEntry = (SvTreeListEntry*)(*pList)[ 0 ]; if( pEntry->pParent ) pEntry->pParent->InvalidateChildrensListPositions(); } } -void SvTreeList::InvalidateEntry( SvListEntry* pEntry ) +void SvTreeList::InvalidateEntry( SvTreeListEntry* pEntry ) { Broadcast( LISTACTION_INVALIDATE_ENTRY, pEntry ); } -SvListEntry* SvTreeList::GetRootLevelParent( SvListEntry* pEntry ) const +SvTreeListEntry* SvTreeList::GetRootLevelParent( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"GetRootLevelParent:No Entry"); - SvListEntry* pCurParent = 0; + SvTreeListEntry* pCurParent = 0; if ( pEntry ) { pCurParent = pEntry->pParent; @@ -1484,7 +1484,7 @@ void SvListView::InitTable() maDataTable.clear(); } - SvListEntry* pEntry; + SvTreeListEntry* pEntry; SvViewData* pViewData; // insert root entry @@ -1504,7 +1504,7 @@ void SvListView::InitTable() } } -SvViewData* SvListView::CreateViewData( SvListEntry* ) +SvViewData* SvListView::CreateViewData( SvTreeListEntry* ) { DBG_CHKTHIS(SvListView,0); return new SvViewData; @@ -1519,7 +1519,7 @@ void SvListView::Clear() if( pModel ) { // insert root entry - SvListEntry* pEntry = pModel->pRootItem; + SvTreeListEntry* pEntry = pModel->pRootItem; SvViewData* pViewData = new SvViewData; pViewData->nFlags = SVLISTENTRYFLAG_EXPANDED; maDataTable.insert( pEntry, pViewData ); @@ -1551,47 +1551,47 @@ void SvListView::ModelHasCleared() DBG_CHKTHIS(SvListView,0); } -void SvListView::ModelHasInserted( SvListEntry* ) +void SvListView::ModelHasInserted( SvTreeListEntry* ) { DBG_CHKTHIS(SvListView,0); } -void SvListView::ModelHasInsertedTree( SvListEntry* ) +void SvListView::ModelHasInsertedTree( SvTreeListEntry* ) { DBG_CHKTHIS(SvListView,0); } -void SvListView::ModelIsMoving( SvListEntry* /* pSource */ , - SvListEntry* /* pTargetParent */ , sal_uLong /* nPos */ ) +void SvListView::ModelIsMoving( SvTreeListEntry* /* pSource */ , + SvTreeListEntry* /* pTargetParent */ , sal_uLong /* nPos */ ) { DBG_CHKTHIS(SvListView,0); } -void SvListView::ModelHasMoved( SvListEntry* ) +void SvListView::ModelHasMoved( SvTreeListEntry* ) { DBG_CHKTHIS(SvListView,0); } -void SvListView::ModelIsRemoving( SvListEntry* ) +void SvListView::ModelIsRemoving( SvTreeListEntry* ) { DBG_CHKTHIS(SvListView,0); } -void SvListView::ModelHasRemoved( SvListEntry* ) +void SvListView::ModelHasRemoved( SvTreeListEntry* ) { DBG_CHKTHIS(SvListView,0); } -void SvListView::ModelHasEntryInvalidated( SvListEntry*) +void SvListView::ModelHasEntryInvalidated( SvTreeListEntry*) { DBG_CHKTHIS(SvListView,0); } -void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,sal_uLong) +void SvListView::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sal_uLong) { DBG_CHKTHIS(SvListView,0); - SvListEntry* pParent = pEntry->pParent; + SvTreeListEntry* pParent = pEntry->pParent; DBG_ASSERT(pParent,"Model not consistent"); if( pParent != pModel->pRootItem && pParent->pChildren->size() == 1 ) { @@ -1603,8 +1603,8 @@ void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,sal_uLong) bVisPositionsValid = sal_False; } -void SvListView::ActionMoved( SvListEntry* /* pEntry */ , - SvListEntry* /* pTargetPrnt */ , +void SvListView::ActionMoved( SvTreeListEntry* /* pEntry */ , + SvTreeListEntry* /* pTargetPrnt */ , sal_uLong /* nChildPos */ ) { DBG_CHKTHIS(SvListView,0); @@ -1612,7 +1612,7 @@ void SvListView::ActionMoved( SvListEntry* /* pEntry */ , bVisPositionsValid = sal_False; } -void SvListView::ActionInserted( SvListEntry* pEntry ) +void SvListView::ActionInserted( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvListView,0); DBG_ASSERT(pEntry,"Insert:No Entry"); @@ -1630,7 +1630,7 @@ void SvListView::ActionInserted( SvListEntry* pEntry ) } } -void SvListView::ActionInsertedTree( SvListEntry* pEntry ) +void SvListView::ActionInsertedTree( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvListView,0); if ( pModel->IsEntryVisible( this, pEntry )) @@ -1639,7 +1639,7 @@ void SvListView::ActionInsertedTree( SvListEntry* pEntry ) bVisPositionsValid = sal_False; } // iterate over entry and its children - SvListEntry* pCurEntry = pEntry; + SvTreeListEntry* pCurEntry = pEntry; sal_uInt16 nRefDepth = pModel->GetDepth( pCurEntry ); while( pCurEntry ) { @@ -1654,7 +1654,7 @@ void SvListView::ActionInsertedTree( SvListEntry* pEntry ) } } -void SvListView::RemoveViewData( SvListEntry* pParent ) +void SvListView::RemoveViewData( SvTreeListEntry* pParent ) { SvTreeEntryList* pChildren = pParent->pChildren; if (!pChildren) @@ -1663,7 +1663,7 @@ void SvListView::RemoveViewData( SvListEntry* pParent ) SvTreeEntryList::iterator it = pChildren->begin(), itEnd = pChildren->end(); for (; it != itEnd; ++it) { - SvListEntry* pCur = *it; + SvTreeListEntry* pCur = *it; maDataTable.erase(pCur); if (pCur->HasChildren()) RemoveViewData(pCur); @@ -1672,7 +1672,7 @@ void SvListView::RemoveViewData( SvListEntry* pParent ) -void SvListView::ActionRemoving( SvListEntry* pEntry ) +void SvListView::ActionRemoving( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvListView,0); DBG_ASSERT(pEntry,"Remove:No Entry"); @@ -1700,7 +1700,7 @@ void SvListView::ActionRemoving( SvListEntry* pEntry ) maDataTable.erase(pEntry); RemoveViewData( pEntry ); - SvListEntry* pCurEntry = pEntry->pParent; + SvTreeListEntry* pCurEntry = pEntry->pParent; if ( pCurEntry && pCurEntry != pModel->pRootItem && pCurEntry->pChildren->size() == 1 ) { @@ -1709,7 +1709,7 @@ void SvListView::ActionRemoving( SvListEntry* pEntry ) } } -void SvListView::ActionRemoved( SvListEntry* /* pEntry */ ) +void SvListView::ActionRemoved( SvTreeListEntry* /* pEntry */ ) { DBG_CHKTHIS(SvListView,0); } @@ -1720,8 +1720,8 @@ void SvListView::ActionClear() Clear(); } -void SvListView::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uLong nPos ) +void SvListView::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1, + SvTreeListEntry* pEntry2, sal_uLong nPos ) { DBG_CHKTHIS(SvListView,0); switch( nActionId ) @@ -1770,11 +1770,11 @@ void SvListView::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, } } -void SvListView::InitViewData( SvViewData*, SvListEntry* ) +void SvListView::InitViewData( SvViewData*, SvTreeListEntry* ) { } -StringCompare SvTreeList::Compare( SvListEntry* pLeft, SvListEntry* pRight) const +StringCompare SvTreeList::Compare( SvTreeListEntry* pLeft, SvTreeListEntry* pRight) const { if( aCompareLink.IsSet()) { @@ -1794,7 +1794,7 @@ void SvTreeList::Resort() Broadcast( LISTACTION_RESORTED ); } -void SvTreeList::ResortChildren( SvListEntry* pParent ) +void SvTreeList::ResortChildren( SvTreeListEntry* pParent ) { DBG_ASSERT(pParent,"Parent not set"); SvTreeEntryList* pChildList = pParent->pChildren; @@ -1806,7 +1806,7 @@ void SvTreeList::ResortChildren( SvListEntry* pParent ) size_t nCount = aList.size(); for( size_t nCur = 0; nCur < nCount; nCur++ ) { - SvListEntry* pCurEntry = (SvListEntry*)aList[ nCur ]; + SvTreeListEntry* pCurEntry = (SvTreeListEntry*)aList[ nCur ]; sal_uLong nListPos = ULONG_MAX; GetInsertionPos( pCurEntry, pParent, nListPos ); pChildList->insert( pCurEntry, nListPos ); @@ -1816,7 +1816,7 @@ void SvTreeList::ResortChildren( SvListEntry* pParent ) SetListPositions( (SvTreeEntryList*)pChildList ); } -void SvTreeList::GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent, +void SvTreeList::GetInsertionPos( SvTreeListEntry* pEntry, SvTreeListEntry* pParent, sal_uLong& rPos ) { DBG_ASSERT(pEntry,"No Entry"); @@ -1837,7 +1837,7 @@ void SvTreeList::GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent, do { k = (i+j)/2; - SvListEntry* pTempEntry = (SvListEntry*)(*pChildList)[ k ]; + SvTreeListEntry* pTempEntry = (SvTreeListEntry*)(*pChildList)[ k ]; eCompare = Compare( pEntry, pTempEntry ); if( eSortMode == SortDescending && eCompare != COMPARE_EQUAL ) { diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index a16efd6e9e4b..8bce6bb4918a 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -351,7 +351,7 @@ long SvLBoxTab::CalcOffset( long nItemWidth, long nTabWidth ) DBG_NAME(SvLBoxItem); -SvLBoxItem::SvLBoxItem( SvLBoxEntry*, sal_uInt16 ) +SvLBoxItem::SvLBoxItem( SvTreeListEntry*, sal_uInt16 ) { DBG_CTOR(SvLBoxItem,0); } @@ -366,7 +366,7 @@ SvLBoxItem::~SvLBoxItem() DBG_DTOR(SvLBoxItem,0); } -const Size& SvLBoxItem::GetSize( SvTreeListBox* pView,SvLBoxEntry* pEntry ) +const Size& SvLBoxItem::GetSize( SvTreeListBox* pView,SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvLBoxItem,0); SvViewDataItem* pViewData = pView->GetViewDataItem( pEntry, this ); @@ -385,69 +385,69 @@ SvViewDataItem::~SvViewDataItem() DBG_DTOR(SvViewDataItem,0); } -SvLBoxEntry* SvLBoxTreeList::First() const +SvTreeListEntry* SvLBoxTreeList::First() const { - return (SvLBoxEntry*)SvTreeList::First(); + return (SvTreeListEntry*)SvTreeList::First(); } -SvLBoxEntry* SvLBoxTreeList::Next( SvListEntry* pEntry, sal_uInt16* pDepth ) const +SvTreeListEntry* SvLBoxTreeList::Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth ) const { - return (SvLBoxEntry*)SvTreeList::Next(pEntry,pDepth); + return (SvTreeListEntry*)SvTreeList::Next(pEntry,pDepth); } -SvLBoxEntry* SvLBoxTreeList::Prev( SvListEntry* pEntry, sal_uInt16* pDepth ) const +SvTreeListEntry* SvLBoxTreeList::Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth ) const { - return (SvLBoxEntry*)SvTreeList::Prev(pEntry,pDepth); + return (SvTreeListEntry*)SvTreeList::Prev(pEntry,pDepth); } -SvLBoxEntry* SvLBoxTreeList::Last() const +SvTreeListEntry* SvLBoxTreeList::Last() const { - return (SvLBoxEntry*)SvTreeList::Last(); + return (SvTreeListEntry*)SvTreeList::Last(); } -SvLBoxEntry* SvLBoxTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const +SvTreeListEntry* SvLBoxTreeList::Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const { - return (SvLBoxEntry*)SvTreeList::Clone(pEntry,nCloneCount); + return (SvTreeListEntry*)SvTreeList::Clone(pEntry,nCloneCount); } -SvLBoxEntry* SvLBoxTreeList::GetEntry( SvListEntry* pParent, sal_uLong nPos ) const +SvTreeListEntry* SvLBoxTreeList::GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const { - return (SvLBoxEntry*)SvTreeList::GetEntry(pParent,nPos); + return (SvTreeListEntry*)SvTreeList::GetEntry(pParent,nPos); } -SvLBoxEntry* SvLBoxTreeList::GetEntry( sal_uLong nRootPos ) const +SvTreeListEntry* SvLBoxTreeList::GetEntry( sal_uLong nRootPos ) const { - return (SvLBoxEntry*)SvTreeList::GetEntry(nRootPos); + return (SvTreeListEntry*)SvTreeList::GetEntry(nRootPos); } -SvLBoxEntry* SvLBoxTreeList::GetParent( SvListEntry* pEntry ) const +SvTreeListEntry* SvLBoxTreeList::GetParent( SvTreeListEntry* pEntry ) const { - return (SvLBoxEntry*)SvTreeList::GetParent(pEntry); + return (SvTreeListEntry*)SvTreeList::GetParent(pEntry); } -SvLBoxEntry* SvLBoxTreeList::FirstChild( SvLBoxEntry* pParent ) const +SvTreeListEntry* SvLBoxTreeList::FirstChild( SvTreeListEntry* pParent ) const { - return (SvLBoxEntry*)SvTreeList::FirstChild(pParent); + return (SvTreeListEntry*)SvTreeList::FirstChild(pParent); } -SvLBoxEntry* SvLBoxTreeList::NextSibling( SvLBoxEntry* pEntry ) const +SvTreeListEntry* SvLBoxTreeList::NextSibling( SvTreeListEntry* pEntry ) const { - return (SvLBoxEntry*)SvTreeList::NextSibling(pEntry); + return (SvTreeListEntry*)SvTreeList::NextSibling(pEntry); } -SvLBoxEntry* SvLBoxTreeList::PrevSibling( SvLBoxEntry* pEntry ) const +SvTreeListEntry* SvLBoxTreeList::PrevSibling( SvTreeListEntry* pEntry ) const { - return (SvLBoxEntry*)SvTreeList::PrevSibling(pEntry); + return (SvTreeListEntry*)SvTreeList::PrevSibling(pEntry); } -SvLBoxEntry* SvLBoxTreeList::LastSibling( SvLBoxEntry* pEntry ) const +SvTreeListEntry* SvLBoxTreeList::LastSibling( SvTreeListEntry* pEntry ) const { - return (SvLBoxEntry*)SvTreeList::LastSibling(pEntry); + return (SvTreeListEntry*)SvTreeList::LastSibling(pEntry); } -SvLBoxEntry* SvLBoxTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const +SvTreeListEntry* SvLBoxTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const { - return (SvLBoxEntry*)SvTreeList::GetEntryAtAbsPos( nAbsPos); + return (SvTreeListEntry*)SvTreeList::GetEntryAtAbsPos( nAbsPos); } // *************************************************************** @@ -566,21 +566,21 @@ bool SvTreeListBox::IsEntryMnemonicsEnabled() const return mpImpl->m_bEntryMnemonicsEnabled; } -IMPL_LINK_INLINE_START( SvTreeListBox, CloneHdl_Impl, SvListEntry*, pEntry ) +IMPL_LINK_INLINE_START( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); - return (long)(CloneEntry((SvLBoxEntry*)pEntry)); + return (long)(CloneEntry((SvTreeListEntry*)pEntry)); } -IMPL_LINK_INLINE_END( SvTreeListBox, CloneHdl_Impl, SvListEntry*, pEntry ) +IMPL_LINK_INLINE_END( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry ) -sal_uLong SvTreeListBox::Insert( SvLBoxEntry* pEntry, SvLBoxEntry* pParent, sal_uLong nPos ) +sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry, SvTreeListEntry* pParent, sal_uLong nPos ) { DBG_CHKTHIS(SvTreeListBox,0); sal_uLong nInsPos = pModel->Insert( pEntry, pParent, nPos ); return nInsPos; } -sal_uLong SvTreeListBox::Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos ) +sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos ) { DBG_CHKTHIS(SvTreeListBox,0); sal_uLong nInsPos = pModel->Insert( pEntry, nRootPos ); @@ -658,7 +658,7 @@ sal_Bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 n -void SvTreeListBox::NotifyRemoving( SvLBoxEntry* ) +void SvTreeListBox::NotifyRemoving( SvTreeListEntry* ) { DBG_CHKTHIS(SvTreeListBox,0); } @@ -679,17 +679,17 @@ void SvTreeListBox::NotifyRemoving( SvLBoxEntry* ) */ #ifdef DBG_UTIL sal_Bool SvTreeListBox::NotifyMoving( - SvLBoxEntry* pTarget, // D&D dropping position in this->GetModel() - SvLBoxEntry* pEntry, // entry that we want to move, from + SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel() + SvTreeListEntry* pEntry, // entry that we want to move, from // GetSourceListBox()->GetModel() - SvLBoxEntry*& rpNewParent, // new target parent + SvTreeListEntry*& rpNewParent, // new target parent sal_uLong& rNewChildPos) // position in childlist of target parent #else sal_Bool SvTreeListBox::NotifyMoving( - SvLBoxEntry* pTarget, // D&D dropping position in this->GetModel() - SvLBoxEntry*, // entry that we want to move, from + SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel() + SvTreeListEntry*, // entry that we want to move, from // GetSourceListBox()->GetModel() - SvLBoxEntry*& rpNewParent, // new target parent + SvTreeListEntry*& rpNewParent, // new target parent sal_uLong& rNewChildPos) // position in childlist of target parent #endif { @@ -722,10 +722,10 @@ sal_Bool SvTreeListBox::NotifyMoving( } sal_Bool SvTreeListBox::NotifyCopying( - SvLBoxEntry* pTarget, // D&D dropping position in this->GetModel() - SvLBoxEntry* pEntry, // entry that we want to move, from + SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel() + SvTreeListEntry* pEntry, // entry that we want to move, from // GetSourceListBox()->GetModel() - SvLBoxEntry*& rpNewParent, // new target parent + SvTreeListEntry*& rpNewParent, // new target parent sal_uLong& rNewChildPos) // position in childlist of target parent { DBG_CHKTHIS(SvTreeListBox,0); @@ -733,7 +733,7 @@ sal_Bool SvTreeListBox::NotifyCopying( } // return: all entries copied -sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTarget ) +sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ) { DBG_CHKTHIS(SvTreeListBox,0); nCurEntrySelPos = 0; // selection counter for NotifyMoving/Copying @@ -745,7 +745,7 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTar // cache selection to simplify iterating over the selection when doing a D&D // exchange within the same listbox - SvLBoxEntry* pSourceEntry = pSource->FirstSelected(); + SvTreeListEntry* pSourceEntry = pSource->FirstSelected(); while ( pSourceEntry ) { // children are copied automatically @@ -757,8 +757,8 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTar SvTreeEntryList::iterator it = aList.begin(), itEnd = aList.end(); for (; it != itEnd; ++it) { - pSourceEntry = static_cast<SvLBoxEntry*>(*it); - SvLBoxEntry* pNewParent = 0; + pSourceEntry = static_cast<SvTreeListEntry*>(*it); + SvTreeListEntry* pNewParent = 0; sal_uLong nInsertionPos = ULONG_MAX; sal_Bool bOk=NotifyCopying(pTarget,pSourceEntry,pNewParent,nInsertionPos); if ( bOk ) @@ -766,15 +766,15 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTar if ( bClone ) { sal_uLong nCloneCount = 0; - pSourceEntry = (SvLBoxEntry*) - pModel->Clone( (SvListEntry*)pSourceEntry, nCloneCount ); - pModel->InsertTree( (SvListEntry*)pSourceEntry, - (SvListEntry*)pNewParent, nInsertionPos ); + pSourceEntry = (SvTreeListEntry*) + pModel->Clone( (SvTreeListEntry*)pSourceEntry, nCloneCount ); + pModel->InsertTree( (SvTreeListEntry*)pSourceEntry, + (SvTreeListEntry*)pNewParent, nInsertionPos ); } else { - sal_uLong nListPos = pModel->Copy( (SvListEntry*)pSourceEntry, - (SvListEntry*)pNewParent, nInsertionPos ); + sal_uLong nListPos = pModel->Copy( (SvTreeListEntry*)pSourceEntry, + (SvTreeListEntry*)pNewParent, nInsertionPos ); pSourceEntry = GetEntry( pNewParent, nListPos ); } } @@ -789,12 +789,12 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTar } // return: all entries were moved -sal_Bool SvTreeListBox::MoveSelection( SvTreeListBox* pSource, SvLBoxEntry* pTarget ) +sal_Bool SvTreeListBox::MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ) { return MoveSelectionCopyFallbackPossible( pSource, pTarget, sal_False ); } -sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback ) +sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, sal_Bool bAllowCopyFallback ) { DBG_CHKTHIS(SvTreeListBox,0); nCurEntrySelPos = 0; // selection counter for NotifyMoving/Copying @@ -805,7 +805,7 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc if ( bClone ) pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl )); - SvLBoxEntry* pSourceEntry = pSource->FirstSelected(); + SvTreeListEntry* pSourceEntry = pSource->FirstSelected(); while ( pSourceEntry ) { // children are automatically moved @@ -817,9 +817,9 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc SvTreeEntryList::iterator it = aList.begin(), itEnd = aList.end(); for (; it != itEnd; ++it) { - pSourceEntry = static_cast<SvLBoxEntry*>(*it); + pSourceEntry = static_cast<SvTreeListEntry*>(*it); - SvLBoxEntry* pNewParent = 0; + SvTreeListEntry* pNewParent = 0; sal_uLong nInsertionPos = ULONG_MAX; sal_Bool bOk = NotifyMoving(pTarget,pSourceEntry,pNewParent,nInsertionPos); sal_Bool bCopyOk = bOk; @@ -834,19 +834,19 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc if ( bClone ) { sal_uLong nCloneCount = 0; - pSourceEntry = (SvLBoxEntry*) - pModel->Clone( (SvListEntry*)pSourceEntry, nCloneCount ); - pModel->InsertTree( (SvListEntry*)pSourceEntry, - (SvListEntry*)pNewParent, nInsertionPos ); + pSourceEntry = (SvTreeListEntry*) + pModel->Clone( (SvTreeListEntry*)pSourceEntry, nCloneCount ); + pModel->InsertTree( (SvTreeListEntry*)pSourceEntry, + (SvTreeListEntry*)pNewParent, nInsertionPos ); } else { if ( bOk ) - pModel->Move( (SvListEntry*)pSourceEntry, - (SvListEntry*)pNewParent, nInsertionPos ); + pModel->Move( (SvTreeListEntry*)pSourceEntry, + (SvTreeListEntry*)pNewParent, nInsertionPos ); else - pModel->Copy( (SvListEntry*)pSourceEntry, - (SvListEntry*)pNewParent, nInsertionPos ); + pModel->Copy( (SvTreeListEntry*)pSourceEntry, + (SvTreeListEntry*)pNewParent, nInsertionPos ); } } else @@ -865,7 +865,7 @@ void SvTreeListBox::RemoveSelection() SvTreeEntryList aList; // cache selection, as the implementation deselects everything on the first // remove - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); while ( pEntry ) { aList.push_back( pEntry ); @@ -878,7 +878,7 @@ void SvTreeListBox::RemoveSelection() SvTreeEntryList::iterator it = aList.begin(), itEnd = aList.end(); for (; it != itEnd; ++it) { - pEntry = static_cast<SvLBoxEntry*>(*it); + pEntry = static_cast<SvTreeListEntry*>(*it); pModel->Remove(pEntry); } } @@ -891,7 +891,7 @@ SvTreeListBox* SvTreeListBox::GetSourceView() const void SvTreeListBox::RecalcViewData() { DBG_CHKTHIS(SvTreeListBox,0); - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while( pEntry ) { sal_uInt16 nCount = pEntry->ItemCount(); @@ -907,12 +907,12 @@ void SvTreeListBox::RecalcViewData() } } -void SvTreeListBox::ViewDataInitialized( SvLBoxEntry* ) +void SvTreeListBox::ViewDataInitialized( SvTreeListEntry* ) { DBG_CHKTHIS(SvTreeListBox,0); } -void SvTreeListBox::ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow) +void SvTreeListBox::ImplShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool bShow) { DBG_CHKTHIS(SvTreeListBox,0); if ( bShow && (nImpFlags & SVLBOX_TARGEMPH_VIS) ) @@ -932,12 +932,12 @@ void SvTreeListBox::OnCurrentEntryChanged() mpImpl->m_aQuickSelectionEngine.Reset(); } -SvLBoxEntry* SvTreeListBox::GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const +SvTreeListEntry* SvTreeListBox::GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const { DBG_CHKTHIS(SvTreeListBox,0); - SvLBoxEntry* pEntry = NULL; - SvLBoxEntry* pParent = NULL; + SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pParent = NULL; for( ::std::deque< sal_Int32 >::const_iterator pItem = _rPath.begin(); pItem != _rPath.end(); ++pItem ) { pEntry = GetEntry( pParent, *pItem ); @@ -949,19 +949,19 @@ SvLBoxEntry* SvTreeListBox::GetEntryFromPath( const ::std::deque< sal_Int32 >& _ return pEntry; } -void SvTreeListBox::FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const +void SvTreeListBox::FillEntryPath( SvTreeListEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const { DBG_CHKTHIS(SvTreeListBox,0); if ( pEntry ) { - SvLBoxEntry* pParentEntry = GetParent( pEntry ); + SvTreeListEntry* pParentEntry = GetParent( pEntry ); while ( sal_True ) { sal_uLong i, nCount = GetLevelChildCount( pParentEntry ); for ( i = 0; i < nCount; ++i ) { - SvLBoxEntry* pTemp = GetEntry( pParentEntry, i ); + SvTreeListEntry* pTemp = GetEntry( pParentEntry, i ); DBG_ASSERT( pEntry, "invalid entry" ); if ( pEntry == pTemp ) { @@ -981,12 +981,12 @@ void SvTreeListBox::FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 } } -sal_uLong SvTreeListBox::GetLevelChildCount( SvLBoxEntry* _pParent ) const +sal_uLong SvTreeListBox::GetLevelChildCount( SvTreeListEntry* _pParent ) const { DBG_CHKTHIS(SvTreeListBox,0); sal_uLong nCount = 0; - SvLBoxEntry* pEntry = FirstChild( _pParent ); + SvTreeListEntry* pEntry = FirstChild( _pParent ); while ( pEntry ) { ++nCount; @@ -996,17 +996,17 @@ sal_uLong SvTreeListBox::GetLevelChildCount( SvLBoxEntry* _pParent ) const return nCount; } -SvViewData* SvTreeListBox::CreateViewData( SvListEntry* ) +SvViewData* SvTreeListBox::CreateViewData( SvTreeListEntry* ) { DBG_CHKTHIS(SvTreeListBox,0); SvViewDataEntry* pEntryData = new SvViewDataEntry; return (SvViewData*)pEntryData; } -void SvTreeListBox::InitViewData( SvViewData* pData, SvListEntry* pEntry ) +void SvTreeListBox::InitViewData( SvViewData* pData, SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); - SvLBoxEntry* pInhEntry = (SvLBoxEntry*)pEntry; + SvTreeListEntry* pInhEntry = (SvTreeListEntry*)pEntry; SvViewDataEntry* pEntryData = (SvViewDataEntry*)pData; pEntryData->pItemData = new SvViewDataItem[ pInhEntry->ItemCount() ]; @@ -1029,9 +1029,9 @@ void SvTreeListBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWit { DBG_CHKTHIS(SvTreeListBox,0); sal_uInt16 nRefDepth; - SvLBoxEntry* pTemp; + SvTreeListEntry* pTemp; - SvLBoxEntry* pSelEntry = FirstSelected(); + SvTreeListEntry* pSelEntry = FirstSelected(); while( pSelEntry ) { if ( !bEnable ) @@ -1144,17 +1144,17 @@ void SvTreeListBox::ForbidEmptyText() mpImpl->m_bIsEmptyTextAllowed = false; } -SvLBoxEntry* SvTreeListBox::CreateEntry() const +SvTreeListEntry* SvTreeListBox::CreateEntry() const { DBG_CHKTHIS(SvTreeListBox,0); - return new SvLBoxEntry; + return new SvTreeListEntry; } const void* SvTreeListBox::FirstSearchEntry( String& _rEntryText ) const { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if ( pEntry ) - pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( NextSearchEntry( pEntry, _rEntryText ) ) ); + pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( NextSearchEntry( pEntry, _rEntryText ) ) ); else { pEntry = FirstSelected(); @@ -1170,7 +1170,7 @@ const void* SvTreeListBox::FirstSearchEntry( String& _rEntryText ) const const void* SvTreeListBox::NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const { - SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pCurrentSearchEntry ) ); + SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pCurrentSearchEntry ) ); if ( ( ( GetChildCount( pEntry ) > 0 ) || ( pEntry->HasChildrenOnDemand() ) @@ -1196,7 +1196,7 @@ const void* SvTreeListBox::NextSearchEntry( const void* _pCurrentSearchEntry, St void SvTreeListBox::SelectSearchEntry( const void* _pEntry ) { - SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) ); + SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) ); DBG_ASSERT( pEntry, "SvTreeListBox::SelectSearchEntry: invalid entry!" ); if ( !pEntry ) return; @@ -1214,7 +1214,7 @@ void SvTreeListBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const ::vcl::StringEntryIdentifier SvTreeListBox::CurrentEntry( String& _out_entryText ) const { // always accept the current entry if there is one - SvLBoxEntry* pCurrentEntry( GetCurEntry() ); + SvTreeListEntry* pCurrentEntry( GetCurEntry() ); if ( pCurrentEntry ) { _out_entryText = GetEntryText( pCurrentEntry ); @@ -1286,7 +1286,7 @@ sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt ) } else { - SvLBoxEntry* pEntry = GetDropTarget( rEvt.maPosPixel ); + SvTreeListEntry* pEntry = GetDropTarget( rEvt.maPosPixel ); if( !IsDropFormatSupported( SOT_FORMATSTR_ID_TREELISTBOX ) ) { SAL_WARN( "svtools.contnr", "SvTreeListBox::QueryDrop(): no format" ); @@ -1347,7 +1347,7 @@ sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox ReadDragServerInfo( rEvt.maPosPixel, &aDDInfo ); - SvLBoxEntry* pTarget = pTargetEntry; // may be 0! + SvTreeListEntry* pTarget = pTargetEntry; // may be 0! if( DND_ACTION_COPY == rEvt.mnAction ) { @@ -1388,7 +1388,7 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel ) ReleaseMouse(); - SvLBoxEntry* pEntry = GetEntry( rPosPixel ); // GetDropTarget( rPos ); + SvTreeListEntry* pEntry = GetEntry( rPosPixel ); // GetDropTarget( rPos ); if( !pEntry ) { DragFinished( DND_ACTION_NONE ); @@ -1458,13 +1458,13 @@ nAction nDragDropMode = nOldDragMode; } -DragDropMode SvTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* ) +DragDropMode SvTreeListBox::NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* ) { DBG_CHKTHIS(SvTreeListBox,0); return (DragDropMode)0xffff; } -sal_Bool SvTreeListBox::NotifyAcceptDrop( SvLBoxEntry* ) +sal_Bool SvTreeListBox::NotifyAcceptDrop( SvTreeListEntry* ) { DBG_CHKTHIS(SvTreeListBox,0); return sal_True; @@ -1601,7 +1601,7 @@ void SvTreeListBox::SetBaseModel( SvLBoxTreeList* pNewModel ) // does the CleanUp SvListView::SetModel( pNewModel ); pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl )); - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while( pEntry ) { ModelHasInserted( pEntry ); @@ -1782,7 +1782,7 @@ void SvTreeListBox::SetTabs() pImp->NotifyTabsChanged(); } -void SvTreeListBox::InitEntry( SvLBoxEntry* pEntry, +void SvTreeListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind) { @@ -1805,7 +1805,7 @@ void SvTreeListBox::InitEntry( SvLBoxEntry* pEntry, pEntry->AddItem( pString ); } -String SvTreeListBox::GetEntryText(SvLBoxEntry* pEntry) const +String SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): no entry" ); @@ -1814,7 +1814,7 @@ String SvTreeListBox::GetEntryText(SvLBoxEntry* pEntry) const return pItem->GetText(); } -String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const +String SvTreeListBox::SearchEntryText( SvTreeListEntry* pEntry ) const { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" ); @@ -1835,7 +1835,7 @@ String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const return sRet; } -const Image& SvTreeListBox::GetExpandedEntryBmp(SvLBoxEntry* pEntry) const +const Image& SvTreeListBox::GetExpandedEntryBmp(SvTreeListEntry* pEntry) const { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT(pEntry,"Entry?"); @@ -1844,7 +1844,7 @@ const Image& SvTreeListBox::GetExpandedEntryBmp(SvLBoxEntry* pEntry) const return pItem->GetBitmap2( ); } -const Image& SvTreeListBox::GetCollapsedEntryBmp( SvLBoxEntry* pEntry ) const +const Image& SvTreeListBox::GetCollapsedEntryBmp( SvTreeListEntry* pEntry ) const { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT(pEntry,"Entry?"); @@ -1862,9 +1862,9 @@ IMPL_LINK_INLINE_START( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pDa } IMPL_LINK_INLINE_END( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData ) -SvLBoxEntry* SvTreeListBox::InsertEntry( +SvTreeListEntry* SvTreeListBox::InsertEntry( const XubString& aText, - SvLBoxEntry* pParent, + SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uLong nPos, void* pUser, SvLBoxButtonKind eButtonKind @@ -1879,7 +1879,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( aCurInsertedExpBmp = rDefExpBmp; aCurInsertedColBmp = rDefColBmp; - SvLBoxEntry* pEntry = CreateEntry(); + SvTreeListEntry* pEntry = CreateEntry(); pEntry->SetUserData( pUser ); InitEntry( pEntry, aText, rDefColBmp, rDefExpBmp, eButtonKind ); pEntry->EnableChildrenOnDemand( bChildrenOnDemand ); @@ -1897,9 +1897,9 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( return pEntry; } -SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText, +SvTreeListEntry* SvTreeListBox::InsertEntry( const XubString& aText, const Image& aExpEntryBmp, const Image& aCollEntryBmp, - SvLBoxEntry* pParent, sal_Bool bChildrenOnDemand, sal_uLong nPos, void* pUser, + SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uLong nPos, void* pUser, SvLBoxButtonKind eButtonKind ) { DBG_CHKTHIS(SvTreeListBox,0); @@ -1908,7 +1908,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText, aCurInsertedExpBmp = aExpEntryBmp; aCurInsertedColBmp = aCollEntryBmp; - SvLBoxEntry* pEntry = CreateEntry(); + SvTreeListEntry* pEntry = CreateEntry(); pEntry->SetUserData( pUser ); InitEntry( pEntry, aText, aCollEntryBmp, aExpEntryBmp, eButtonKind ); @@ -1927,7 +1927,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText, return pEntry; } -void SvTreeListBox::SetEntryText( SvLBoxEntry* pEntry, const XubString& aStr) +void SvTreeListBox::SetEntryText( SvTreeListEntry* pEntry, const XubString& aStr) { DBG_CHKTHIS(SvTreeListBox,0); SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); @@ -1937,7 +1937,7 @@ void SvTreeListBox::SetEntryText( SvLBoxEntry* pEntry, const XubString& aStr) GetModel()->InvalidateEntry( pEntry ); } -void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp ) +void SvTreeListBox::SetExpandedEntryBmp( SvTreeListEntry* pEntry, const Image& aBmp ) { DBG_CHKTHIS(SvTreeListBox,0); SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)); @@ -1956,7 +1956,7 @@ void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp } } -void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,const Image& aBmp ) +void SvTreeListBox::SetCollapsedEntryBmp(SvTreeListEntry* pEntry,const Image& aBmp ) { DBG_CHKTHIS(SvTreeListBox,0); SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)); @@ -1975,11 +1975,11 @@ void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,const Image& aBmp ) } } -void SvTreeListBox::ImpEntryInserted( SvLBoxEntry* pEntry ) +void SvTreeListBox::ImpEntryInserted( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); - SvLBoxEntry* pParent = (SvLBoxEntry*)pModel->GetParent( pEntry ); + SvTreeListEntry* pParent = (SvTreeListEntry*)pModel->GetParent( pEntry ); if( pParent ) { sal_uInt16 nFlags = pParent->GetFlags(); @@ -2004,7 +2004,7 @@ void SvTreeListBox::ImpEntryInserted( SvLBoxEntry* pEntry ) nTreeFlags |= TREEFLAG_RECALCTABS; } } - SetEntryHeight( (SvLBoxEntry*)pEntry ); + SetEntryHeight( (SvTreeListEntry*)pEntry ); if( nTreeFlags & TREEFLAG_CHKBTN ) { @@ -2023,7 +2023,7 @@ void SvTreeListBox::ImpEntryInserted( SvLBoxEntry* pEntry ) -void SvTreeListBox::SetCheckButtonState( SvLBoxEntry* pEntry, SvButtonState eState) +void SvTreeListBox::SetCheckButtonState( SvTreeListEntry* pEntry, SvButtonState eState) { DBG_CHKTHIS(SvTreeListBox,0); if( nTreeFlags & TREEFLAG_CHKBTN ) @@ -2049,7 +2049,7 @@ void SvTreeListBox::SetCheckButtonState( SvLBoxEntry* pEntry, SvButtonState eSta } } -SvButtonState SvTreeListBox::GetCheckButtonState( SvLBoxEntry* pEntry ) const +SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) const { DBG_CHKTHIS(SvTreeListBox,0); SvButtonState eState = SV_BUTTON_UNCHECKED; @@ -2075,11 +2075,11 @@ void SvTreeListBox::CheckButtonHdl() // // TODO: Currently all data is cloned so that they conform to the default tree // view format. Actually, the model should be used as a reference here. This -// leads to us _not_ calling SvLBoxEntry::Clone, but only its base class -// SvListEntry. +// leads to us _not_ calling SvTreeListEntry::Clone, but only its base class +// SvTreeListEntry. // -SvLBoxEntry* SvTreeListBox::CloneEntry( SvLBoxEntry* pSource ) +SvTreeListEntry* SvTreeListBox::CloneEntry( SvTreeListEntry* pSource ) { DBG_CHKTHIS(SvTreeListBox,0); XubString aStr; @@ -2099,9 +2099,9 @@ SvLBoxEntry* SvTreeListBox::CloneEntry( SvLBoxEntry* pSource ) SvLBoxButton* pButtonItem = (SvLBoxButton*)(pSource->GetFirstItem(SV_ITEM_ID_LBOXBUTTON)); if( pButtonItem ) eButtonKind = pButtonItem->GetKind(); - SvLBoxEntry* pClone = CreateEntry(); + SvTreeListEntry* pClone = CreateEntry(); InitEntry( pClone, aStr, aCollEntryBmp, aExpEntryBmp, eButtonKind ); - pClone->SvListEntry::Clone( pSource ); + pClone->SvTreeListEntry::Clone( pSource ); pClone->EnableChildrenOnDemand( pSource->HasChildrenOnDemand() ); pClone->SetUserData( pSource->GetUserData() ); @@ -2192,13 +2192,13 @@ void SvTreeListBox::SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& SetTabs(); } -sal_Bool SvTreeListBox::EditingEntry( SvLBoxEntry*, Selection& ) +sal_Bool SvTreeListBox::EditingEntry( SvTreeListEntry*, Selection& ) { DBG_CHKTHIS(SvTreeListBox,0); return sal_True; } -sal_Bool SvTreeListBox::EditedEntry( SvLBoxEntry* /*pEntry*/,const rtl::OUString& /*rNewText*/) +sal_Bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const rtl::OUString& /*rNewText*/) { DBG_CHKTHIS(SvTreeListBox,0); return sal_True; @@ -2228,7 +2228,7 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt ) { case KEY_F1: { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); pEntry = NextVisible( pEntry ); SetEntryText( pEntry, "SetEntryText" ); } @@ -2246,7 +2246,7 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt ) nImpFlags &= ~SVLBOX_IS_TRAVELSELECT; } -void SvTreeListBox::RequestingChildren( SvLBoxEntry* pParent ) +void SvTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) { DBG_CHKTHIS(SvTreeListBox,0); if( !pParent->HasChildren() ) @@ -2259,7 +2259,7 @@ void SvTreeListBox::GetFocus() pImp->GetFocus(); Control::GetFocus(); - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if ( pEntry ) pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry ); @@ -2294,7 +2294,7 @@ void SvTreeListBox::ModelHasCleared() SvListView::ModelHasCleared(); } -void SvTreeListBox::ShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool /*bShow*/ ) +void SvTreeListBox::ShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool /*bShow*/ ) { DBG_CHKTHIS(SvTreeListBox,0); pImp->PaintDDCursor( pEntry ); @@ -2369,7 +2369,7 @@ short SvTreeListBox::GetHeightOffset(const Font& /* rFont */, Size& aSizeLogic ) return nOffset; } -void SvTreeListBox::SetEntryHeight( SvLBoxEntry* pEntry ) +void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); short nHeight, nHeightMax=0; @@ -2434,7 +2434,7 @@ void SvTreeListBox::AdjustEntryHeight( const Font& rFont ) } } -sal_Bool SvTreeListBox::Expand( SvLBoxEntry* pParent ) +sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent ) { DBG_CHKTHIS(SvTreeListBox,0); pHdlEntry = pParent; @@ -2476,7 +2476,7 @@ sal_Bool SvTreeListBox::Expand( SvLBoxEntry* pParent ) return bExpanded; } -sal_Bool SvTreeListBox::Collapse( SvLBoxEntry* pParent ) +sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent ) { DBG_CHKTHIS(SvTreeListBox,0); nImpFlags &= ~SVLBOX_IS_EXPANDING; @@ -2502,7 +2502,7 @@ sal_Bool SvTreeListBox::Collapse( SvLBoxEntry* pParent ) return bCollapsed; } -sal_Bool SvTreeListBox::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) +sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT(pEntry,"Select: Null-Ptr"); @@ -2523,7 +2523,7 @@ sal_Bool SvTreeListBox::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) return bRetVal; } -sal_uLong SvTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect ) +sal_uLong SvTreeListBox::SelectChildren( SvTreeListEntry* pParent, sal_Bool bSelect ) { DBG_CHKTHIS(SvTreeListBox,0); pImp->DestroyAnchor(); @@ -2531,7 +2531,7 @@ sal_uLong SvTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect if( !pParent->HasChildren() ) return 0; sal_uInt16 nRefDepth = pModel->GetDepth( pParent ); - SvLBoxEntry* pChild = FirstChild( pParent ); + SvTreeListEntry* pChild = FirstChild( pParent ); do { nRet++; Select( pChild, bSelect ); @@ -2549,51 +2549,51 @@ void SvTreeListBox::SelectAll( sal_Bool bSelect, sal_Bool ) sal_True ); // even when using SINGLE_SELECTION, deselect the cursor } -void SvTreeListBox::ModelHasInsertedTree( SvListEntry* pEntry ) +void SvTreeListBox::ModelHasInsertedTree( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); - sal_uInt16 nRefDepth = pModel->GetDepth( (SvLBoxEntry*)pEntry ); - SvLBoxEntry* pTmp = (SvLBoxEntry*)pEntry; + sal_uInt16 nRefDepth = pModel->GetDepth( (SvTreeListEntry*)pEntry ); + SvTreeListEntry* pTmp = (SvTreeListEntry*)pEntry; do { ImpEntryInserted( pTmp ); pTmp = Next( pTmp ); } while( pTmp && nRefDepth < pModel->GetDepth( pTmp ) ); - pImp->TreeInserted( (SvLBoxEntry*)pEntry ); + pImp->TreeInserted( (SvTreeListEntry*)pEntry ); } -void SvTreeListBox::ModelHasInserted( SvListEntry* pEntry ) +void SvTreeListBox::ModelHasInserted( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); - ImpEntryInserted( (SvLBoxEntry*)pEntry ); - pImp->EntryInserted( (SvLBoxEntry*)pEntry ); + ImpEntryInserted( (SvTreeListEntry*)pEntry ); + pImp->EntryInserted( (SvTreeListEntry*)pEntry ); } -void SvTreeListBox::ModelIsMoving(SvListEntry* pSource, - SvListEntry* /* pTargetParent */, +void SvTreeListBox::ModelIsMoving(SvTreeListEntry* pSource, + SvTreeListEntry* /* pTargetParent */, sal_uLong /* nChildPos */ ) { DBG_CHKTHIS(SvTreeListBox,0); - pImp->MovingEntry( (SvLBoxEntry*)pSource ); + pImp->MovingEntry( (SvTreeListEntry*)pSource ); } -void SvTreeListBox::ModelHasMoved( SvListEntry* pSource ) +void SvTreeListBox::ModelHasMoved( SvTreeListEntry* pSource ) { DBG_CHKTHIS(SvTreeListBox,0); - pImp->EntryMoved( (SvLBoxEntry*)pSource ); + pImp->EntryMoved( (SvTreeListEntry*)pSource ); } -void SvTreeListBox::ModelIsRemoving( SvListEntry* pEntry ) +void SvTreeListBox::ModelIsRemoving( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); if(pEdEntry == pEntry) pEdEntry = NULL; - pImp->RemovingEntry( (SvLBoxEntry*)pEntry ); - NotifyRemoving( (SvLBoxEntry*)pEntry ); + pImp->RemovingEntry( (SvTreeListEntry*)pEntry ); + NotifyRemoving( (SvTreeListEntry*)pEntry ); } -void SvTreeListBox::ModelHasRemoved( SvListEntry* pEntry ) +void SvTreeListBox::ModelHasRemoved( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); if ( pEntry == pHdlEntry) @@ -2676,13 +2676,13 @@ void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic ) } } -void SvTreeListBox::SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect ) +void SvTreeListBox::SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect ) { DBG_CHKTHIS(SvTreeListBox,0); pImp->SetCursor(pEntry, bForceNoSelect); } -void SvTreeListBox::SetCurEntry( SvLBoxEntry* pEntry ) +void SvTreeListBox::SetCurEntry( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); pImp->SetCurEntry( pEntry ); @@ -2693,43 +2693,43 @@ Image SvTreeListBox::GetExpandedNodeBmp( ) const return pImp->GetExpandedNodeBmp( ); } -Point SvTreeListBox::GetEntryPosition( SvLBoxEntry* pEntry ) const +Point SvTreeListBox::GetEntryPosition( SvTreeListEntry* pEntry ) const { return pImp->GetEntryPosition( pEntry ); } -void SvTreeListBox::ShowEntry( SvLBoxEntry* pEntry ) +void SvTreeListBox::ShowEntry( SvTreeListEntry* pEntry ) { MakeVisible( pEntry ); } -void SvTreeListBox::MakeVisible( SvLBoxEntry* pEntry ) +void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry ) { pImp->MakeVisible(pEntry); } -void SvTreeListBox::MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop ) +void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop ) { pImp->MakeVisible( pEntry, bMoveToTop ); } -void SvTreeListBox::ModelHasEntryInvalidated( SvListEntry* pEntry ) +void SvTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); // reinitialize the separate items of the entries - sal_uInt16 nCount = ((SvLBoxEntry*)pEntry)->ItemCount(); + sal_uInt16 nCount = ((SvTreeListEntry*)pEntry)->ItemCount(); for( sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++ ) { - SvLBoxItem* pItem = ((SvLBoxEntry*)pEntry)->GetItem( nIdx ); - pItem->InitViewData( this, (SvLBoxEntry*)pEntry, 0 ); + SvLBoxItem* pItem = ((SvTreeListEntry*)pEntry)->GetItem( nIdx ); + pItem->InitViewData( this, (SvTreeListEntry*)pEntry, 0 ); } // repaint - pImp->InvalidateEntry( (SvLBoxEntry*)pEntry ); + pImp->InvalidateEntry( (SvTreeListEntry*)pEntry ); } -void SvTreeListBox::EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem, +void SvTreeListBox::EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem, const Selection& rSelection ) { DBG_CHKTHIS(SvTreeListBox,0); @@ -2768,13 +2768,13 @@ void SvTreeListBox::EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem, EditText( pItem->GetText(), aRect, rSelection ); } -void SvTreeListBox::EditEntry( SvLBoxEntry* pEntry ) +void SvTreeListBox::EditEntry( SvTreeListEntry* pEntry ) { pImp->aEditClickPos = Point( -1, -1 ); ImplEditEntry( pEntry ); } -void SvTreeListBox::ImplEditEntry( SvLBoxEntry* pEntry ) +void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); if( IsEditingActive() ) @@ -2853,7 +2853,7 @@ void SvTreeListBox::EditedText( const XubString& rStr ) } } -SvLBoxEntry* SvTreeListBox::GetDropTarget( const Point& rPos ) +SvTreeListEntry* SvTreeListBox::GetDropTarget( const Point& rPos ) { DBG_CHKTHIS(SvTreeListBox,0); // scroll @@ -2872,10 +2872,10 @@ SvLBoxEntry* SvTreeListBox::GetDropTarget( const Point& rPos ) } } - SvLBoxEntry* pTarget = pImp->GetEntry( rPos ); + SvTreeListEntry* pTarget = pImp->GetEntry( rPos ); // when dropping in a vacant space, use the last entry if( !pTarget ) - return (SvLBoxEntry*)LastVisible(); + return (SvTreeListEntry*)LastVisible(); else if( (GetDragDropMode() & SV_DRAGDROP_ENABLE_TOP) && pTarget == First() && rPos.Y() < 6 ) return 0; @@ -2884,10 +2884,10 @@ SvLBoxEntry* SvTreeListBox::GetDropTarget( const Point& rPos ) } -SvLBoxEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) const +SvTreeListEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) const { DBG_CHKTHIS(SvTreeListBox,0); - SvLBoxEntry* pEntry = pImp->GetEntry( rPos ); + SvTreeListEntry* pEntry = pImp->GetEntry( rPos ); if( pEntry && bHit ) { long nLine = pImp->GetEntryLine( pEntry ); @@ -2897,7 +2897,7 @@ SvLBoxEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) const return pEntry; } -SvLBoxEntry* SvTreeListBox::GetCurEntry() const +SvTreeListEntry* SvTreeListBox::GetCurEntry() const { DBG_CHKTHIS(SvTreeListBox,0); return pImp->GetCurEntry(); @@ -2925,7 +2925,7 @@ void SvTreeListBox::ImplInitStyle() Invalidate(); } -void SvTreeListBox::PaintEntry( SvLBoxEntry* pEntry ) +void SvTreeListBox::PaintEntry( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT(pEntry,"PaintEntry:No Entry"); @@ -2933,7 +2933,7 @@ void SvTreeListBox::PaintEntry( SvLBoxEntry* pEntry ) pImp->PaintEntry( pEntry ); } -void SvTreeListBox::InvalidateEntry( SvLBoxEntry* pEntry ) +void SvTreeListBox::InvalidateEntry( SvTreeListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT(pEntry,"InvalidateEntry:No Entry"); @@ -2944,14 +2944,14 @@ void SvTreeListBox::InvalidateEntry( SvLBoxEntry* pEntry ) } -long SvTreeListBox::PaintEntry(SvLBoxEntry* pEntry,long nLine,sal_uInt16 nTabFlags) +long SvTreeListBox::PaintEntry(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nTabFlags) { return PaintEntry1(pEntry,nLine,nTabFlags); } #define SV_TAB_BORDER 8 -long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,sal_uInt16 nTabFlags, +long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nTabFlags, sal_Bool bHasClipRegion ) { DBG_CHKTHIS(SvTreeListBox,0); @@ -3253,11 +3253,11 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,sal_uInt16 nTabFl return 0; // nRowLen; } -void SvTreeListBox::PreparePaint( SvLBoxEntry* ) +void SvTreeListBox::PreparePaint( SvTreeListEntry* ) { } -Rectangle SvTreeListBox::GetFocusRect( SvLBoxEntry* pEntry, long nLine ) +Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLine ) { DBG_CHKTHIS(SvTreeListBox,0); Size aSize; @@ -3352,7 +3352,7 @@ Rectangle SvTreeListBox::GetFocusRect( SvLBoxEntry* pEntry, long nLine ) } -long SvTreeListBox::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) +long SvTreeListBox::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab) { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT(pTab,"No Tab"); @@ -3366,7 +3366,7 @@ long SvTreeListBox::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) return nPos; } -SvLBoxItem* SvTreeListBox::GetItem_Impl( SvLBoxEntry* pEntry, long nX, +SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX, SvLBoxTab** ppTab, sal_uInt16 nEmptyWidth ) { DBG_CHKTHIS(SvTreeListBox,0); @@ -3426,12 +3426,12 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvLBoxEntry* pEntry, long nX, return pItemClicked; } -SvLBoxItem* SvTreeListBox::GetItem(SvLBoxEntry* pEntry,long nX,SvLBoxTab** ppTab) +SvLBoxItem* SvTreeListBox::GetItem(SvTreeListEntry* pEntry,long nX,SvLBoxTab** ppTab) { return GetItem_Impl( pEntry, nX, ppTab, 0 ); } -SvLBoxItem* SvTreeListBox::GetItem(SvLBoxEntry* pEntry,long nX ) +SvLBoxItem* SvTreeListBox::GetItem(SvTreeListEntry* pEntry,long nX ) { DBG_CHKTHIS(SvTreeListBox,0); SvLBoxTab* pDummyTab; @@ -3483,7 +3483,7 @@ SvLBoxTab* SvTreeListBox::GetFirstDynamicTab() const return GetFirstDynamicTab( nDummy ); } -SvLBoxTab* SvTreeListBox::GetTab( SvLBoxEntry* pEntry, SvLBoxItem* pItem) const +SvLBoxTab* SvTreeListBox::GetTab( SvTreeListEntry* pEntry, SvLBoxItem* pItem) const { DBG_CHKTHIS(SvTreeListBox,0); sal_uInt16 nPos = pEntry->GetPos( pItem ); @@ -3580,12 +3580,12 @@ void SvTreeListBox::SetHighlightRange( sal_uInt16 nStart, sal_uInt16 nEnd) pImp->RecalcFocusRect(); } -sal_uLong SvTreeListBox::GetAscInsertionPos(SvLBoxEntry*,SvLBoxEntry*) +sal_uLong SvTreeListBox::GetAscInsertionPos(SvTreeListEntry*,SvTreeListEntry*) { return LIST_APPEND; } -sal_uLong SvTreeListBox::GetDescInsertionPos(SvLBoxEntry*,SvLBoxEntry*) +sal_uLong SvTreeListBox::GetDescInsertionPos(SvTreeListEntry*,SvTreeListEntry*) { DBG_CHKTHIS(SvTreeListBox,0); return LIST_APPEND; @@ -3595,7 +3595,7 @@ Region SvTreeListBox::GetDragRegion() const { DBG_CHKTHIS(SvTreeListBox,0); Rectangle aRect; - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if( pEntry ) { Point aPos = GetEntryPosition( pEntry ); @@ -3614,14 +3614,14 @@ void SvTreeListBox::Command( const CommandEvent& rCEvt ) } -void SvTreeListBox::RemoveParentKeepChildren( SvLBoxEntry* pParent ) +void SvTreeListBox::RemoveParentKeepChildren( SvTreeListEntry* pParent ) { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT(pParent,"RemoveParentKeepChildren:No Parent"); - SvLBoxEntry* pNewParent = GetParent( pParent ); + SvTreeListEntry* pNewParent = GetParent( pParent ); if( pParent->HasChildren()) { - SvLBoxEntry* pChild = FirstChild( pParent ); + SvTreeListEntry* pChild = FirstChild( pParent ); while( pChild ) { pModel->Move( pChild, pNewParent, LIST_APPEND ); @@ -3670,22 +3670,22 @@ void SvTreeListBox::RequestHelp( const HelpEvent& rHEvt ) Control::RequestHelp( rHEvt ); } -void SvTreeListBox::CursorMoved( SvLBoxEntry* ) +void SvTreeListBox::CursorMoved( SvTreeListEntry* ) { } IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData ) { - SvLBoxEntry* pLeft = (SvLBoxEntry*)(pData->pLeft ); - SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight ); + SvTreeListEntry* pLeft = (SvTreeListEntry*)(pData->pLeft ); + SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight ); String aLeft( ((SvLBoxString*)(pLeft->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText()); String aRight( ((SvLBoxString*)(pRight->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText()); pImp->UpdateStringSorter(); return pImp->m_pStringSorter->compare(aLeft, aRight); } -void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uLong nPos ) +void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1, + SvTreeListEntry* pEntry2, sal_uLong nPos ) { if( nActionId == LISTACTION_CLEARING ) CancelTextEditing(); @@ -3695,7 +3695,7 @@ void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry { case LISTACTION_INSERTED: { - SvLBoxEntry* pEntry( dynamic_cast< SvLBoxEntry* >( pEntry1 ) ); + SvTreeListEntry* pEntry( dynamic_cast< SvTreeListEntry* >( pEntry1 ) ); if ( !pEntry ) { SAL_WARN( "svtools.contnr", "SvTreeListBox::ModelNotification: invalid entry!" ); @@ -3723,7 +3723,7 @@ void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry case LISTACTION_RESORTED: // after a selection: show first entry and also keep the selection - MakeVisible( (SvLBoxEntry*)pModel->First(), sal_True ); + MakeVisible( (SvTreeListEntry*)pModel->First(), sal_True ); SetUpdateMode( sal_True ); break; @@ -3759,15 +3759,15 @@ void SvTreeListBox::EnableAsyncDrag( sal_Bool b ) pImp->EnableAsyncDrag( b ); } -SvLBoxEntry* SvTreeListBox::GetFirstEntryInView() const +SvTreeListEntry* SvTreeListBox::GetFirstEntryInView() const { Point aPos; return GetEntry( aPos ); } -SvLBoxEntry* SvTreeListBox::GetNextEntryInView(SvLBoxEntry* pEntry ) const +SvTreeListEntry* SvTreeListBox::GetNextEntryInView(SvTreeListEntry* pEntry ) const { - SvLBoxEntry* pNext = (SvLBoxEntry*)NextVisible( pEntry ); + SvTreeListEntry* pNext = (SvTreeListEntry*)NextVisible( pEntry ); if( pNext ) { Point aPos( GetEntryPosition(pNext) ); @@ -3778,13 +3778,13 @@ SvLBoxEntry* SvTreeListBox::GetNextEntryInView(SvLBoxEntry* pEntry ) const return pNext; } -SvLBoxEntry* SvTreeListBox::GetLastEntryInView() const +SvTreeListEntry* SvTreeListBox::GetLastEntryInView() const { - SvLBoxEntry* pEntry = GetFirstEntryInView(); - SvLBoxEntry* pNext = 0; + SvTreeListEntry* pEntry = GetFirstEntryInView(); + SvTreeListEntry* pNext = 0; while( pEntry ) { - pNext = (SvLBoxEntry*)NextVisible( pEntry ); + pNext = (SvTreeListEntry*)NextVisible( pEntry ); if( pNext ) { Point aPos( GetEntryPosition(pNext) ); @@ -3800,7 +3800,7 @@ SvLBoxEntry* SvTreeListBox::GetLastEntryInView() const return pEntry; } -void SvTreeListBox::ShowFocusRect( const SvLBoxEntry* pEntry ) +void SvTreeListBox::ShowFocusRect( const SvTreeListEntry* pEntry ) { pImp->ShowFocusRect( pEntry ); } @@ -3935,7 +3935,7 @@ void SvTreeListBox::EnableList( bool _bEnable ) return xAccessible; } -void SvTreeListBox::FillAccessibleEntryStateSet( SvLBoxEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const +void SvTreeListBox::FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const { DBG_ASSERT( pEntry, "SvTreeListBox::FillAccessibleEntryStateSet: invalid entry" ); @@ -3954,7 +3954,7 @@ void SvTreeListBox::FillAccessibleEntryStateSet( SvLBoxEntry* pEntry, ::utl::Acc rStateSet.AddState( AccessibleStateType::SELECTED ); } -Rectangle SvTreeListBox::GetBoundingRect( SvLBoxEntry* pEntry ) +Rectangle SvTreeListBox::GetBoundingRect( SvTreeListEntry* pEntry ) { Point aPos = GetEntryPosition( pEntry ); Rectangle aRect = GetFocusRect( pEntry, aPos.Y() ); diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx index cacc12d1980e..80264004625c 100644 --- a/svtools/source/contnr/treelistentry.cxx +++ b/svtools/source/contnr/treelistentry.cxx @@ -32,50 +32,7 @@ #include "tools/debug.hxx" -DBG_NAME(SvListEntry); - -SvListEntry::SvListEntry() -{ - DBG_CTOR(SvListEntry,0); - pChildren = 0; - pParent = 0; - nListPos = 0; - nAbsPos = 0; -} - -SvListEntry::SvListEntry( const SvListEntry& rEntry ) -{ - DBG_CTOR(SvListEntry,0); - pChildren = 0; - pParent = 0; - nListPos &= 0x80000000; - nListPos |= ( rEntry.nListPos & 0x7fffffff); - nAbsPos = rEntry.nAbsPos; -} - -SvListEntry::~SvListEntry() -{ - DBG_DTOR(SvListEntry,0); - if ( pChildren ) - { - pChildren->DestroyAll(); - delete pChildren; - } -#ifdef DBG_UTIL - pChildren = 0; - pParent = 0; -#endif -} - -void SvListEntry::Clone( SvListEntry* pSource) -{ - DBG_CHKTHIS(SvListEntry,0); - nListPos &= 0x80000000; - nListPos |= ( pSource->nListPos & 0x7fffffff); - nAbsPos = pSource->nAbsPos; -} - -void SvListEntry::SetListPositions() +void SvTreeListEntry::SetListPositions() { if( pChildren ) { @@ -83,7 +40,7 @@ void SvListEntry::SetListPositions() sal_uLong nCur = 0; for (; it != itEnd; ++it) { - SvListEntry* pEntry = *it; + SvTreeListEntry* pEntry = *it; pEntry->nListPos &= 0x80000000; pEntry->nListPos |= nCur; ++nCur; @@ -92,26 +49,12 @@ void SvListEntry::SetListPositions() nListPos &= (~0x80000000); } -// *************************************************************** -// class SvLBoxEntry -// *************************************************************** - -DBG_NAME(SvLBoxEntry); - -SvLBoxEntry::SvLBoxEntry() : aItems() -{ - DBG_CTOR(SvLBoxEntry,0); - nEntryFlags = 0; - pUserData = 0; -} - -SvLBoxEntry::~SvLBoxEntry() +void SvTreeListEntry::InvalidateChildrensListPositions() { - DBG_DTOR(SvLBoxEntry,0); - DeleteItems_Impl(); + nListPos |= 0x80000000; } -void SvLBoxEntry::DeleteItems_Impl() +void SvTreeListEntry::DeleteItems_Impl() { DBG_CHKTHIS(SvLBoxEntry,0); sal_uInt16 nCount = aItems.size(); @@ -124,45 +67,100 @@ void SvLBoxEntry::DeleteItems_Impl() aItems.clear(); } +SvTreeListEntry::SvTreeListEntry() : + pParent(NULL), + pChildren(NULL), + nAbsPos(0), + nListPos(0), + pUserData(NULL), + nEntryFlags(0) +{ +} -void SvLBoxEntry::AddItem( SvLBoxItem* pItem ) +SvTreeListEntry::SvTreeListEntry(const SvTreeListEntry& r) : + pParent(NULL), + pChildren(NULL), + nAbsPos(r.nAbsPos), + nListPos(r.nListPos & 0x7FFFFFFF) { - DBG_CHKTHIS(SvLBoxEntry,0); - aItems.push_back( pItem ); } -void SvLBoxEntry::Clone( SvListEntry* pSource ) +SvTreeListEntry::~SvTreeListEntry() { - DBG_CHKTHIS(SvLBoxEntry,0); - SvListEntry::Clone( pSource ); + if ( pChildren ) + { + pChildren->DestroyAll(); + delete pChildren; + } +#ifdef DBG_UTIL + pChildren = 0; + pParent = 0; +#endif + + DeleteItems_Impl(); +} + +bool SvTreeListEntry::HasChildren() const +{ + return pChildren != NULL; +} + +bool SvTreeListEntry::HasChildListPos() const +{ + if( pParent && !(pParent->nListPos & 0x80000000) ) + return true; + else return false; +} + +sal_uLong SvTreeListEntry::GetChildListPos() const +{ + if( pParent && (pParent->nListPos & 0x80000000) ) + pParent->SetListPositions(); + return ( nListPos & 0x7fffffff ); +} + +void SvTreeListEntry::Clone(SvTreeListEntry* pSource) +{ + nListPos &= 0x80000000; + nListPos |= ( pSource->nListPos & 0x7fffffff); + nAbsPos = pSource->nAbsPos; + SvLBoxItem* pNewItem; DeleteItems_Impl(); - sal_uInt16 nCount = ((SvLBoxEntry*)pSource)->ItemCount(); + sal_uInt16 nCount = ((SvTreeListEntry*)pSource)->ItemCount(); sal_uInt16 nCurPos = 0; while( nCurPos < nCount ) { - SvLBoxItem* pItem = ((SvLBoxEntry*)pSource)->GetItem( nCurPos ); + SvLBoxItem* pItem = ((SvTreeListEntry*)pSource)->GetItem( nCurPos ); pNewItem = pItem->Create(); pNewItem->Clone( pItem ); AddItem( pNewItem ); nCurPos++; } - pUserData = ((SvLBoxEntry*)pSource)->GetUserData(); - nEntryFlags = ((SvLBoxEntry*)pSource)->nEntryFlags; + pUserData = ((SvTreeListEntry*)pSource)->GetUserData(); + nEntryFlags = ((SvTreeListEntry*)pSource)->nEntryFlags; } -void SvLBoxEntry::EnableChildrenOnDemand( sal_Bool bEnable ) +sal_uInt16 SvTreeListEntry::ItemCount() const +{ + return (sal_uInt16)aItems.size(); +} + +void SvTreeListEntry::AddItem( SvLBoxItem* pItem ) +{ + aItems.push_back( pItem ); +} + +void SvTreeListEntry::EnableChildrenOnDemand( bool bEnable ) { - DBG_CHKTHIS(SvLBoxEntry,0); if ( bEnable ) nEntryFlags |= SV_ENTRYFLAG_CHILDREN_ON_DEMAND; else nEntryFlags &= (~SV_ENTRYFLAG_CHILDREN_ON_DEMAND); } -void SvLBoxEntry::ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos ) +void SvTreeListEntry::ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos ) { - DBG_CHKTHIS(SvLBoxEntry,0); DBG_ASSERT(pNewItem,"ReplaceItem:No Item"); SvLBoxItem* pOld = GetItem( nPos ); if ( pOld ) @@ -172,7 +170,12 @@ void SvLBoxEntry::ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos ) } } -SvLBoxItem* SvLBoxEntry::GetFirstItem( sal_uInt16 nId ) +SvLBoxItem* SvTreeListEntry::GetItem( sal_uInt16 nPos ) const +{ + return aItems[nPos]; +} + +SvLBoxItem* SvTreeListEntry::GetFirstItem( sal_uInt16 nId ) { sal_uInt16 nCount = aItems.size(); sal_uInt16 nCur = 0; @@ -187,10 +190,40 @@ SvLBoxItem* SvLBoxEntry::GetFirstItem( sal_uInt16 nId ) return 0; } -sal_uInt16 SvLBoxEntry::GetPos( SvLBoxItem* pItem ) const +sal_uInt16 SvTreeListEntry::GetPos( SvLBoxItem* pItem ) const { std::vector<SvLBoxItem*>::const_iterator it = std::find( aItems.begin(), aItems.end(), pItem ); return it == aItems.end() ? USHRT_MAX : it - aItems.begin(); } +void* SvTreeListEntry::GetUserData() const +{ + return pUserData; +} + +void SvTreeListEntry::SetUserData( void* pPtr ) +{ + pUserData = pPtr; +} + +bool SvTreeListEntry::HasChildrenOnDemand() const +{ + return (bool)((nEntryFlags & SV_ENTRYFLAG_CHILDREN_ON_DEMAND)!=0); +} + +bool SvTreeListEntry::HasInUseEmphasis() const +{ + return (bool)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); +} + +sal_uInt16 SvTreeListEntry::GetFlags() const +{ + return nEntryFlags; +} + +void SvTreeListEntry::SetFlags( sal_uInt16 nFlags ) +{ + nEntryFlags = nFlags; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index e8c6a5941582..998b8da9bf55 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -42,7 +42,7 @@ class SvTreeListBox; class Point; class SvLBoxTreeList; class SvImpLBox; -class SvLBoxEntry; +class SvTreeListEntry; class SvLBoxTab; namespace comphelper { @@ -97,12 +97,12 @@ friend class SvTreeListBox; private: SvTreeListBox* pView; SvLBoxTreeList* pTree; - SvLBoxEntry* pCursor; - SvLBoxEntry* pStartEntry; - SvLBoxEntry* pAnchor; - SvLBoxEntry* pMostRightEntry; + SvTreeListEntry* pCursor; + SvTreeListEntry* pStartEntry; + SvTreeListEntry* pAnchor; + SvTreeListEntry* pMostRightEntry; SvLBoxButton* pActiveButton; - SvLBoxEntry* pActiveEntry; + SvTreeListEntry* pActiveEntry; SvLBoxTab* pActiveTab; ScrollBar aVerSBar; @@ -183,7 +183,7 @@ private: // setzt Thumb auf FirstEntryToDraw void SyncVerThumb(); sal_Bool IsLineVisible( long nY ) const; - long GetEntryLine( SvLBoxEntry* pEntry ) const; + long GetEntryLine( SvTreeListEntry* pEntry ) const; void FillView(); void CursorDown(); void CursorUp(); @@ -191,7 +191,7 @@ private: void PageDown( sal_uInt16 nDelta ); void PageUp( sal_uInt16 nDelta ); - void SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect = sal_False ); + void SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect = sal_False ); void DrawNet(); @@ -204,19 +204,19 @@ private: void SetNodeBmpTabDistance(); // Selection-Engine - SvLBoxEntry* MakePointVisible( const Point& rPoint, + SvTreeListEntry* MakePointVisible( const Point& rPoint, sal_Bool bNotifyScroll=sal_True ); - void SetAnchorSelection( SvLBoxEntry* pOld, - SvLBoxEntry* pNewCursor ); + void SetAnchorSelection( SvTreeListEntry* pOld, + SvTreeListEntry* pNewCursor ); void BeginDrag(); sal_Bool ButtonDownCheckCtrl( const MouseEvent& rMEvt, - SvLBoxEntry* pEntry, long nY ); + SvTreeListEntry* pEntry, long nY ); sal_Bool MouseMoveCheckCtrl( const MouseEvent& rMEvt, - SvLBoxEntry* pEntry ); + SvTreeListEntry* pEntry ); sal_Bool ButtonUpCheckCtrl( const MouseEvent& rMEvt ); sal_Bool ButtonDownCheckExpand( const MouseEvent&, - SvLBoxEntry*,long nY ); + SvTreeListEntry*,long nY ); void PositionScrollBars( Size& rOSize, sal_uInt16 nMask ); sal_uInt16 AdjustScrollBars( Size& rSize ); @@ -225,14 +225,14 @@ private: void EndScroll(); sal_Bool InScroll() const { return (sal_Bool)(nFlags & F_IN_SCROLLING)!=0;} Rectangle GetVisibleArea() const; - sal_Bool EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPos,long nLine); + sal_Bool EntryReallyHit(SvTreeListEntry* pEntry,const Point& rPos,long nLine); void InitScrollBarBox(); SvLBoxTab* NextTab( SvLBoxTab* ); - sal_Bool SetMostRight( SvLBoxEntry* pEntry ); - void FindMostRight( SvLBoxEntry* EntryToIgnore ); - void FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* EntryToIgnore ); - void FindMostRight_Impl( SvLBoxEntry* pParent,SvLBoxEntry* EntryToIgnore ); + sal_Bool SetMostRight( SvTreeListEntry* pEntry ); + void FindMostRight( SvTreeListEntry* EntryToIgnore ); + void FindMostRight( SvTreeListEntry* pParent, SvTreeListEntry* EntryToIgnore ); + void FindMostRight_Impl( SvTreeListEntry* pParent,SvTreeListEntry* EntryToIgnore ); void NotifyTabsChanged(); inline sal_Bool IsExpandable() const // if element at cursor can be expanded in general @@ -245,11 +245,11 @@ private: void UpdateStringSorter(); // #97680# -------------------- - short UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth ); - void UpdateContextBmpWidthMax( SvLBoxEntry* pEntry ); - void UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ); + short UpdateContextBmpWidthVector( SvTreeListEntry* pEntry, short nWidth ); + void UpdateContextBmpWidthMax( SvTreeListEntry* pEntry ); + void UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEntry ); - void CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect ); + void CalcCellFocusRect( SvTreeListEntry* pEntry, Rectangle& rRect ); inline sal_Bool AreChildrenTransient() const { return bAreChildrenTransient; } inline void SetChildrenNotTransient() { bAreChildrenTransient = sal_False; } @@ -264,17 +264,17 @@ public: ExtendedWinBits GetExtendedWindowBits() const { return nExtendedWinBits; } void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;} - void EntryInserted( SvLBoxEntry*); - void RemovingEntry( SvLBoxEntry* pEntry ); + void EntryInserted( SvTreeListEntry*); + void RemovingEntry( SvTreeListEntry* pEntry ); void EntryRemoved(); - void MovingEntry( SvLBoxEntry* pEntry ); - void EntryMoved( SvLBoxEntry* pEntry ); - void TreeInserted( SvLBoxEntry* pEntry ); + void MovingEntry( SvTreeListEntry* pEntry ); + void EntryMoved( SvTreeListEntry* pEntry ); + void TreeInserted( SvTreeListEntry* pEntry ); - void EntryExpanded( SvLBoxEntry* pEntry ); - void EntryCollapsed( SvLBoxEntry* pEntry ); - void CollapsingEntry( SvLBoxEntry* pEntry ); - void EntrySelected( SvLBoxEntry*, sal_Bool bSelect ); + void EntryExpanded( SvTreeListEntry* pEntry ); + void EntryCollapsed( SvTreeListEntry* pEntry ); + void CollapsingEntry( SvTreeListEntry* pEntry ); + void EntrySelected( SvTreeListEntry*, sal_Bool bSelect ); void Paint( const Rectangle& rRect ); void MouseButtonDown( const MouseEvent& ); @@ -288,28 +288,28 @@ public: sal_Bool bInvalidateCompleteView= sal_True, sal_Bool bUpdateVerSBar = sal_True ); void SetEntryHeight( short nHeight ); - void PaintEntry( SvLBoxEntry* pEntry ); - void InvalidateEntry( SvLBoxEntry* ); + void PaintEntry( SvTreeListEntry* pEntry ); + void InvalidateEntry( SvTreeListEntry* ); void RecalcFocusRect(); - inline void SelectEntry( SvLBoxEntry* pEntry, sal_Bool bSelect ); + inline void SelectEntry( SvTreeListEntry* pEntry, sal_Bool bSelect ); void SetDragDropMode( DragDropMode eDDMode ); void SetSelectionMode( SelectionMode eSelMode ); void SetAddMode( sal_Bool ) { aSelEng.AddAlways(sal_False); } sal_Bool IsAddMode() const { return aSelEng.IsAlwaysAdding(); } - SvLBoxEntry* GetCurrentEntry() const { return pCursor; } - sal_Bool IsEntryInView( SvLBoxEntry* ) const; - SvLBoxEntry* GetEntry( const Point& rPos ) const; + SvTreeListEntry* GetCurrentEntry() const { return pCursor; } + sal_Bool IsEntryInView( SvTreeListEntry* ) const; + SvTreeListEntry* GetEntry( const Point& rPos ) const; // gibt letzten Eintrag zurueck, falls Pos unter letztem Eintrag - SvLBoxEntry* GetClickedEntry( const Point& ) const; - SvLBoxEntry* GetCurEntry() const { return pCursor; } - void SetCurEntry( SvLBoxEntry* ); - Point GetEntryPosition( SvLBoxEntry* ) const; - void MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop=sal_False ); + SvTreeListEntry* GetClickedEntry( const Point& ) const; + SvTreeListEntry* GetCurEntry() const { return pCursor; } + void SetCurEntry( SvTreeListEntry* ); + Point GetEntryPosition( SvTreeListEntry* ) const; + void MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop=sal_False ); void ScrollToAbsPos( long nPos ); - void PaintDDCursor( SvLBoxEntry* ); + void PaintDDCursor( SvTreeListEntry* ); // Images inline Image& implGetImageLocation( const ImageType _eType ); @@ -343,14 +343,14 @@ public: sal_Bool RequestHelp( const HelpEvent& rHEvt ); void EndSelection(); - sal_Bool IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const; + sal_Bool IsNodeButton( const Point& rPosPixel, SvTreeListEntry* pEntry ) const; void RepaintScrollBars(); void EnableAsyncDrag( sal_Bool b) { bAsyncBeginDrag = b; } void SetUpdateMode( sal_Bool ); sal_Bool GetUpdateMode() const { return bUpdateMode; } Rectangle GetClipRegionRect() const; sal_Bool HasHorScrollBar() const { return aHorSBar.IsVisible(); } - void ShowFocusRect( const SvLBoxEntry* pEntry ); + void ShowFocusRect( const SvTreeListEntry* pEntry ); void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); /** Enables, that one cell of a tablistbox entry can be focused */ @@ -359,7 +359,7 @@ public: bool SetCurrentTabPos( sal_uInt16 _nNewPos ); inline sal_uInt16 GetCurrentTabPos() const { return nCurTabPos; } - bool IsSelectable( const SvLBoxEntry* pEntry ); + bool IsSelectable( const SvTreeListEntry* pEntry ); }; inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType ) @@ -418,12 +418,12 @@ inline const Image& SvImpLBox::GetDefaultEntryColBmp( ) return implGetImageLocation( itEntryDefCollapsed ); } -inline Point SvImpLBox::GetEntryPosition( SvLBoxEntry* pEntry ) const +inline Point SvImpLBox::GetEntryPosition( SvTreeListEntry* pEntry ) const { return Point( 0, GetEntryLine( pEntry ) ); } -inline void SvImpLBox::PaintEntry( SvLBoxEntry* pEntry ) +inline void SvImpLBox::PaintEntry( SvTreeListEntry* pEntry ) { long nY = GetEntryLine( pEntry ); pView->PaintEntry( pEntry, nY ); @@ -437,7 +437,7 @@ inline sal_Bool SvImpLBox::IsLineVisible( long nY ) const return bRet; } -inline void SvImpLBox::TreeInserted( SvLBoxEntry* pInsTree ) +inline void SvImpLBox::TreeInserted( SvTreeListEntry* pInsTree ) { EntryInserted( pInsTree ); } diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 3e8648ccad95..f77786864cba 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -80,7 +80,7 @@ public: class ImplContextGraphicItem : public SvLBoxContextBmp { public: - ImplContextGraphicItem( SvLBoxEntry* pEntry,sal_uInt16 nFlags,Image& rI1,Image& rI2, sal_uInt16 nEntryFlagsBmp1) + ImplContextGraphicItem( SvTreeListEntry* pEntry,sal_uInt16 nFlags,Image& rI1,Image& rI2, sal_uInt16 nEntryFlagsBmp1) : SvLBoxContextBmp( pEntry, nFlags, rI1, rI2, nEntryFlagsBmp1 ) {} OUString msExpandedGraphicURL; @@ -95,12 +95,12 @@ public: UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, WinBits nWinStyle ); ~UnoTreeListBoxImpl(); - sal_uInt32 insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uLong nPos=LIST_APPEND ); + sal_uInt32 insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos=LIST_APPEND ); - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); DECL_LINK(OnSelectionChangeHdl, void *); DECL_LINK(OnExpandingHdl, void *); @@ -115,15 +115,15 @@ private: class UnoTreeListItem : public SvLBoxString { public: - UnoTreeListItem( SvLBoxEntry* ); + UnoTreeListItem( SvTreeListEntry* ); UnoTreeListItem(); virtual ~UnoTreeListItem(); - void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); Image GetImage() const; void SetImage( const Image& rImage ); OUString GetGraphicURL() const; void SetGraphicURL( const OUString& rGraphicURL ); - void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -134,7 +134,7 @@ private: // -------------------------------------------------------------------- -class UnoTreeListEntry : public SvLBoxEntry +class UnoTreeListEntry : public SvTreeListEntry { public: UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer ); @@ -723,7 +723,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUStri UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); - SvLBoxEntry* pEntry = rTree.First(); + SvTreeListEntry* pEntry = rTree.First(); while( pEntry ) { ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) ); @@ -761,7 +761,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUStr UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); - SvLBoxEntry* pEntry = rTree.First(); + SvTreeListEntry* pEntry = rTree.First(); while( pEntry ) { ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) ); @@ -1200,7 +1200,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue ) Sequence< Any > aValues; if( aValue >>= aValues ) { - updateEntry( SvLBoxEntry& rEntry, aValues ); + updateEntry( SvTreeListEntry& rEntry, aValues ); return; } } @@ -1553,7 +1553,7 @@ IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl) // -------------------------------------------------------------------- -sal_uInt32 UnoTreeListBoxImpl::insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uLong nPos ) +sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos ) { if( pParent ) return SvTreeListBox::Insert( pEntry, pParent, nPos ); @@ -1563,7 +1563,7 @@ sal_uInt32 UnoTreeListBoxImpl::insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent, // -------------------------------------------------------------------- -void UnoTreeListBoxImpl::RequestingChildren( SvLBoxEntry* pParent ) +void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( pParent ); if( pEntry && pEntry->mxNode.is() && mxPeer.is() ) @@ -1572,14 +1572,14 @@ void UnoTreeListBoxImpl::RequestingChildren( SvLBoxEntry* pParent ) // -------------------------------------------------------------------- -sal_Bool UnoTreeListBoxImpl::EditingEntry( SvLBoxEntry* pEntry, Selection& ) +sal_Bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { return mxPeer.is() ? mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ) : false; } // -------------------------------------------------------------------- -sal_Bool UnoTreeListBoxImpl::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ) +sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) { return mxPeer.is() ? mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ) : false; } @@ -1588,7 +1588,7 @@ sal_Bool UnoTreeListBoxImpl::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUStri // class UnoTreeListItem // ==================================================================== -UnoTreeListItem::UnoTreeListItem( SvLBoxEntry* pEntry ) +UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry ) : SvLBoxString(pEntry, 0, rtl::OUString()) { } @@ -1608,7 +1608,7 @@ UnoTreeListItem::~UnoTreeListItem() // -------------------------------------------------------------------- -void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */, SvLBoxEntry* _pEntry) +void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */, SvTreeListEntry* _pEntry) { Point aPos( rPos ); if( _pEntry ) @@ -1676,7 +1676,7 @@ void UnoTreeListItem::SetGraphicURL( const OUString& rGraphicURL ) // -------------------------------------------------------------------- -void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData) +void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { if( !pViewData ) pViewData = pView->GetViewDataItem( pEntry, this ); @@ -1699,7 +1699,7 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, Sv // -------------------------------------------------------------------- UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer ) -: SvLBoxEntry() +: SvTreeListEntry() , mxNode( xNode ) , mpPeer( pPeer ) { diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index 1e977ddeff83..a2c62540fc8f 100644 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -49,7 +49,7 @@ private: using SvTreeListBox::InsertEntry; // Avoid ambiguity with new InsertEntry: - virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent, + virtual SvTreeListEntry* InsertEntry( const XubString& rText, SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ); @@ -75,7 +75,7 @@ public: sal_uInt16 GetCheckedEntryCount() const; void CheckEntryPos ( sal_uInt16 nPos, sal_Bool bCheck = sal_True ); sal_Bool IsChecked ( sal_uInt16 nPos ) const; - void ToggleCheckButton ( SvLBoxEntry* pEntry ); + void ToggleCheckButton ( SvTreeListEntry* pEntry ); void* SetEntryData ( sal_uInt16 nPos, void* pNewData ); void* GetEntryData ( sal_uInt16 nPos ) const; diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 64348d9bbfc1..2d7563b6d737 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -67,7 +67,7 @@ public: void* pData; }; -class SvxRedlinEntry : public SvLBoxEntry +class SvxRedlinEntry : public SvTreeListEntry { public: SvxRedlinEntry(); @@ -82,12 +82,12 @@ private: Color aPrivColor; public: - SvLBoxColorString( SvLBoxEntry*,sal_uInt16 nFlags,const XubString& rStr, + SvLBoxColorString( SvTreeListEntry*,sal_uInt16 nFlags,const XubString& rStr, const Color& rCol); SvLBoxColorString(); ~SvLBoxColorString(); - void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* ); SvLBoxItem* Create() const; }; @@ -115,8 +115,8 @@ private: protected: - virtual StringCompare ColCompare(SvLBoxEntry*,SvLBoxEntry*); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual StringCompare ColCompare(SvTreeListEntry*,SvTreeListEntry*); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); @@ -148,14 +148,14 @@ public: sal_Bool IsValidComment(const String* pComment); // } - SvLBoxEntry* InsertEntry(const String& ,RedlinData *pUserData, - SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND); + SvTreeListEntry* InsertEntry(const String& ,RedlinData *pUserData, + SvTreeListEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND); - SvLBoxEntry* InsertEntry(const String& ,RedlinData *pUserData,const Color&, - SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND); + SvTreeListEntry* InsertEntry(const String& ,RedlinData *pUserData,const Color&, + SvTreeListEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND); - virtual SvLBoxEntry* CreateEntry() const; + virtual SvTreeListEntry* CreateEntry() const; void SetColCompareHdl(const Link& rLink ) { aColCompareLink = rLink; } const Link& GetColCompareHdl() const { return aColCompareLink; } diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx index dad16fa35218..422e99cacd92 100644 --- a/svx/inc/svx/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx @@ -46,7 +46,7 @@ private: public: SvLBoxFontString(); SvLBoxFontString( - SvLBoxEntry* pEntry, + SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString& rString, const Font& rFont, @@ -57,14 +57,14 @@ public: /** Creates a new empty list box item. */ virtual SvLBoxItem* Create() const; - void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); /** Paints this entry to the specified position, using the own font settings. */ void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry ); + SvTreeListEntry* pEntry ); }; @@ -103,7 +103,7 @@ protected: /** Initializes a new SvLBoxFontString entry. @descr Uses current value of maEntryFont to set the entry font (if mbUseFont is true). */ virtual void InitEntry( - SvLBoxEntry* pEntry, + SvTreeListEntry* pEntry, const XubString& rEntryText, const Image& rCollImg, const Image& rExpImg, diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index b12314f3da6e..89093d62f84a 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -96,7 +96,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ); - virtual StringCompare ColCompare(SvLBoxEntry*,SvLBoxEntry*); + virtual StringCompare ColCompare(SvTreeListEntry*,SvTreeListEntry*); public: SvxSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); @@ -139,7 +139,7 @@ public: void SortByCol(sal_uInt16,sal_Bool bDir=sal_True); sal_Bool GetSortDirection(){ return bSortDirection;} sal_uInt16 GetSortedCol(){ return nSortCol;} - SvLBoxItem* GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const; + SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const; CommandEvent GetCommandEvent()const; inline sal_Bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index a6b79d060870..92f46498a434 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -111,7 +111,7 @@ void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect ) sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if ( pEntry ) return (sal_uInt16)GetModel()->GetAbsPos( pEntry ); @@ -122,7 +122,7 @@ sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const String SvxCheckListBox::GetText( sal_uInt16 nPos ) const { - SvLBoxEntry* pEntry = GetEntry( nPos ); + SvTreeListEntry* pEntry = GetEntry( nPos ); if ( pEntry ) return GetEntryText( pEntry ); @@ -190,7 +190,7 @@ void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const // ----------------------------------------------------------------------- -void SvxCheckListBox::ToggleCheckButton( SvLBoxEntry* pEntry ) +void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) { if ( pEntry ) { @@ -208,7 +208,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.IsLeft() ) { const Point aPnt = rMEvt.GetPosPixel(); - SvLBoxEntry* pEntry = GetEntry( aPnt ); + SvTreeListEntry* pEntry = GetEntry( aPnt ); if ( pEntry ) { @@ -228,7 +228,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) // check if the entry below the mouse changed during the base method call. This is possible if, // for instance, a handler invoked by the base class tampers with the list entries. - const SvLBoxEntry* pNewEntry = GetEntry( aPnt ); + const SvTreeListEntry* pNewEntry = GetEntry( aPnt ); if ( pNewEntry != pEntry ) return; @@ -249,7 +249,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) if ( rKey.GetCode() == KEY_RETURN || rKey.GetCode() == KEY_SPACE ) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if ( pEntry ) { @@ -265,7 +265,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- -SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) +SvTreeListEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { return SvTreeListBox::InsertEntry( rText, pParent, bChildrenOnDemand, nPos, pUserData, eButtonKind ); } diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index e1600455b8e2..99d3a086d0b4 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -77,7 +77,7 @@ RedlinData::~RedlinData() //---------------------------------------------------------------------------- SvxRedlinEntry::SvxRedlinEntry() - :SvLBoxEntry() + :SvTreeListEntry() { } @@ -94,7 +94,7 @@ SvxRedlinEntry::~SvxRedlinEntry() DBG_NAME(SvLBoxColorString); -SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr, +SvLBoxColorString::SvLBoxColorString( SvTreeListEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr, const Color& rCol) : SvLBoxString( pEntry, nFlags, rStr ) @@ -122,7 +122,7 @@ SvLBoxItem* SvLBoxColorString::Create() const } void SvLBoxColorString::Paint( const Point& rPos, SvTreeListBox& rDev, - sal_uInt16 nFlags, SvLBoxEntry* pEntry ) + sal_uInt16 nFlags, SvTreeListEntry* pEntry ) /* [Description] Paint function of the SvLBoxColorString class. The relevant text with the @@ -166,7 +166,7 @@ SvxRedlinTable::~SvxRedlinTable() delete pCommentSearcher; } -StringCompare SvxRedlinTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight) +StringCompare SvxRedlinTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRight) { StringCompare eCompare=COMPARE_EQUAL; @@ -387,8 +387,8 @@ sal_Bool SvxRedlinTable::IsValidComment(const String* pCommentStr) return nTheFlag; } -SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData, - SvLBoxEntry* pParent,sal_uIntPtr nPos) +SvTreeListEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData, + SvTreeListEntry* pParent,sal_uIntPtr nPos) { aEntryColor=GetTextColor(); if(pUserData!=NULL) @@ -414,8 +414,8 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat } -SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,const Color& aColor, - SvLBoxEntry* pParent,sal_uIntPtr nPos) +SvTreeListEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,const Color& aColor, + SvTreeListEntry* pParent,sal_uIntPtr nPos) { aEntryColor=aColor; @@ -435,12 +435,12 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat return SvxSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); } -SvLBoxEntry* SvxRedlinTable::CreateEntry() const +SvTreeListEntry* SvxRedlinTable::CreateEntry() const { return new SvxRedlinEntry; } -void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr, +void SvxRedlinTable::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr, const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind ) { SvLBoxButton* pButton; diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 621c928dc6f0..aa68971d2ea4 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -883,7 +883,7 @@ void SaveProgressDialog::end() } //=============================================== -RecovDocListEntry::RecovDocListEntry( SvLBoxEntry* pEntry, +RecovDocListEntry::RecovDocListEntry( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText ) : SvLBoxString( pEntry, nFlags, sText ) @@ -894,7 +894,7 @@ RecovDocListEntry::RecovDocListEntry( SvLBoxEntry* pEntry, void RecovDocListEntry::Paint(const Point& aPos , SvTreeListBox& aDevice, sal_uInt16 /*nFlags */, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { const Image* pImg = 0; const String* pTxt = 0; @@ -970,7 +970,7 @@ RecovDocList::~RecovDocList() } //=============================================== -void RecovDocList::InitEntry( SvLBoxEntry* pEntry , +void RecovDocList::InitEntry( SvTreeListEntry* pEntry , const XubString& sText , const Image& aImage1, const Image& aImage2, @@ -1074,12 +1074,12 @@ RecoveryDialog::RecoveryDialog(Window* pParent, String sName( rInfo.DisplayName ); sName += '\t'; sName += impl_getStatusString( rInfo ); - SvLBoxEntry* pEntry = m_aFileListLB.InsertEntry(sName, rInfo.StandardImage, rInfo.StandardImage); + SvTreeListEntry* pEntry = m_aFileListLB.InsertEntry(sName, rInfo.StandardImage, rInfo.StandardImage); pEntry->SetUserData((void*)&rInfo); } // mark first item - SvLBoxEntry* pFirst = m_aFileListLB.First(); + SvTreeListEntry* pFirst = m_aFileListLB.First(); if (pFirst) m_aFileListLB.SetCursor(pFirst, sal_True); } @@ -1332,7 +1332,7 @@ void RecoveryDialog::updateItems() sal_uIntPtr i = 0; for ( i=0; i<c; ++i ) { - SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i); + SvTreeListEntry* pEntry = m_aFileListLB.GetEntry(i); if ( !pEntry ) continue; @@ -1356,7 +1356,7 @@ void RecoveryDialog::stepNext(TURLInfo* pItem) sal_uIntPtr i = 0; for (i=0; i<c; ++i) { - SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i); + SvTreeListEntry* pEntry = m_aFileListLB.GetEntry(i); if (!pEntry) continue; diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 99388a6b106f..2f877b1b532a 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -40,7 +40,7 @@ SvLBoxFontString::SvLBoxFontString() : } SvLBoxFontString::SvLBoxFontString( - SvLBoxEntry* pEntry, sal_uInt16 nFlags, const XubString& rString, + SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString& rString, const Font& rFont, const Color* pColor ) : SvLBoxString( pEntry, nFlags, rString ), maFont( rFont ), @@ -64,7 +64,7 @@ SvLBoxItem* SvLBoxFontString::Create() const return new SvLBoxFontString; } -void SvLBoxFontString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ) +void SvLBoxFontString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry ) { DBG_CHKTHIS( SvLBoxFontString, 0 ); Font aOldFont( rDev.GetFont() ); @@ -81,7 +81,7 @@ void SvLBoxFontString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 rDev.SetFont( aOldFont ); } -void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData ) +void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData ) { DBG_CHKTHIS( SvLBoxFontString, 0 ); Font aOldFont( pView->GetFont() ); @@ -113,7 +113,7 @@ void SvxFontListBox::InsertFontEntry( const String& rString, const Font& rFont, void SvxFontListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect ) { - SvLBoxEntry* pEntry = GetEntry( nPos ); + SvTreeListEntry* pEntry = GetEntry( nPos ); if( pEntry ) { Select( pEntry, bSelect ); @@ -128,7 +128,7 @@ void SvxFontListBox::SetNoSelection() sal_uLong SvxFontListBox::GetSelectEntryPos() const { - SvLBoxEntry* pSvLBoxEntry = FirstSelected(); + SvTreeListEntry* pSvLBoxEntry = FirstSelected(); return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND; } @@ -138,7 +138,7 @@ XubString SvxFontListBox::GetSelectEntry() const } void SvxFontListBox::InitEntry( - SvLBoxEntry* pEntry, const XubString& rEntryText, + SvTreeListEntry* pEntry, const XubString& rEntryText, const Image& rCollImg, const Image& rExpImg, SvLBoxButtonKind eButtonKind ) { diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index e76ad7ba8f18..bee99c2f23cc 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -420,7 +420,7 @@ IMPL_LINK( SvxSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr) return 0; } -SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const +SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const { DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry"); SvLBoxItem* pItem = NULL; @@ -441,7 +441,7 @@ SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos return pItem; } -StringCompare SvxSimpleTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight) +StringCompare SvxSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRight) { StringCompare eCompare=COMPARE_EQUAL; @@ -471,8 +471,8 @@ StringCompare SvxSimpleTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight) IMPL_LINK( SvxSimpleTable, CompareHdl, SvSortData*, pData) { - SvLBoxEntry* pLeft = (SvLBoxEntry*)(pData->pLeft ); - SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight ); + SvTreeListEntry* pLeft = (SvTreeListEntry*)(pData->pLeft ); + SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight ); return (long) ColCompare(pLeft,pRight); } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index d98787cc5974..c77b7f1d92ab 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -170,7 +170,7 @@ namespace svxform } void DataTreeListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ ) { - SvLBoxEntry* pSelected = FirstSelected(); + SvTreeListEntry* pSelected = FirstSelected(); if ( !pSelected ) // no drag without an entry return; @@ -258,7 +258,7 @@ namespace svxform m_pXFormsPage->DoMenuAction( _nSelectedPopupEntry ); } - void DataTreeListBox::RemoveEntry( SvLBoxEntry* _pEntry ) + void DataTreeListBox::RemoveEntry( SvTreeListEntry* _pEntry ) { if ( _pEntry ) { @@ -272,7 +272,7 @@ namespace svxform sal_uIntPtr i, nCount = GetEntryCount(); for ( i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = GetEntry(i); + SvTreeListEntry* pEntry = GetEntry(i); if ( pEntry ) delete static_cast< ItemNode* >( pEntry->GetUserData() ); } @@ -361,7 +361,7 @@ namespace svxform } //------------------------------------------------------------------------ void XFormsPage::AddChildren( - SvLBoxEntry* _pParent, const ImageList& _rImgLst, + SvTreeListEntry* _pParent, const ImageList& _rImgLst, const Reference< css::xml::dom::XNode >& _xNode ) { DBG_ASSERT( m_xUIHelper.is(), "XFormsPage::AddChildren(): invalid UIHelper" ); @@ -397,7 +397,7 @@ namespace svxform if ( !sName.isEmpty() ) { ItemNode* pNode = new ItemNode( xChild ); - SvLBoxEntry* pEntry = m_aItemList.InsertEntry( + SvTreeListEntry* pEntry = m_aItemList.InsertEntry( sName, aExpImg, aCollImg, _pParent, sal_False, LIST_APPEND, pNode ); if ( xChild->hasAttributes() ) { @@ -456,7 +456,7 @@ namespace svxform Reference< XSet > xSubmissions( xModel->getSubmissions(), UNO_QUERY ); xSubmissions->insert( makeAny( xNewSubmission ) ); Reference< XPropertySet > xNewPropSet( xNewSubmission, UNO_QUERY ); - SvLBoxEntry* pEntry = AddEntry( xNewPropSet ); + SvTreeListEntry* pEntry = AddEntry( xNewPropSet ); m_aItemList.Select( pEntry, sal_True ); bIsDocModified = true; } @@ -469,7 +469,7 @@ namespace svxform else { DataItemType eType = DITElement; - SvLBoxEntry* pEntry = m_aItemList.FirstSelected(); + SvTreeListEntry* pEntry = m_aItemList.FirstSelected(); ItemNode* pNode = NULL; Reference< css::xml::dom::XNode > xParentNode; Reference< XPropertySet > xNewBinding; @@ -582,7 +582,7 @@ namespace svxform { if ( RET_OK == nReturn ) { - SvLBoxEntry* pNewEntry = AddEntry( pNode, bIsElement ); + SvTreeListEntry* pNewEntry = AddEntry( pNode, bIsElement ); m_aItemList.MakeVisible( pNewEntry ); m_aItemList.Select( pNewEntry, sal_True ); bIsDocModified = true; @@ -609,7 +609,7 @@ namespace svxform { if ( RET_OK == nReturn ) { - SvLBoxEntry* pNewEntry = AddEntry( xNewBinding ); + SvTreeListEntry* pNewEntry = AddEntry( xNewBinding ); m_aItemList.Select( pNewEntry, sal_True ); bIsDocModified = true; } @@ -634,7 +634,7 @@ namespace svxform case TBI_ITEM_EDIT: { bHandled = true; - SvLBoxEntry* pEntry = m_aItemList.FirstSelected(); + SvTreeListEntry* pEntry = m_aItemList.FirstSelected(); if ( pEntry ) { if ( DGTSubmission == m_eGroup && m_aItemList.GetParent( pEntry ) ) @@ -759,9 +759,9 @@ namespace svxform } //------------------------------------------------------------------------ - SvLBoxEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) + SvTreeListEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { - SvLBoxEntry* pParent = m_aItemList.FirstSelected(); + SvTreeListEntry* pParent = m_aItemList.FirstSelected(); const ImageList& rImageList = m_pNaviWin->GetItemImageList(); sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; Image aImage = rImageList.GetImage( nImageID ); @@ -965,9 +965,9 @@ namespace svxform }; //------------------------------------------------------------------------ - SvLBoxEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) + SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; const ImageList& rImageList = m_pNaviWin->GetItemImageList(); Image aImage = rImageList.GetImage( IID_ELEMENT ); @@ -1038,7 +1038,7 @@ namespace svxform //------------------------------------------------------------------------ void XFormsPage::EditEntry( const Reference< XPropertySet >& _rEntry ) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; rtl::OUString sTemp; if ( DGTSubmission == m_eGroup ) @@ -1062,7 +1062,7 @@ namespace svxform String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND ); sEntry += String( sTemp ); sal_uIntPtr nPos = 0; - SvLBoxEntry* pChild = m_aItemList.GetEntry( pEntry, nPos++ ); + SvTreeListEntry* pChild = m_aItemList.GetEntry( pEntry, nPos++ ); m_aItemList.SetEntryText( pChild, sEntry ); _rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp; sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REF ); @@ -1096,7 +1096,7 @@ namespace svxform bool XFormsPage::RemoveEntry() { bool bRet = false; - SvLBoxEntry* pEntry = m_aItemList.FirstSelected(); + SvTreeListEntry* pEntry = m_aItemList.FirstSelected(); if ( pEntry && ( DGTInstance != m_eGroup || m_aItemList.GetParent( pEntry ) ) ) { @@ -1121,7 +1121,7 @@ namespace svxform aQBox.SetMessText( sMessText ); if ( aQBox.Execute() == RET_YES ) { - SvLBoxEntry* pParent = m_aItemList.GetParent( pEntry ); + SvTreeListEntry* pParent = m_aItemList.GetParent( pEntry ); DBG_ASSERT( pParent, "XFormsPage::RemoveEntry(): no parent entry" ); ItemNode* pParentNode = static_cast< ItemNode* >( pParent->GetUserData() ); DBG_ASSERT( pParentNode && pParentNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no parent XNode" ); @@ -1427,7 +1427,7 @@ namespace svxform sal_Bool bEnableEdit = sal_False; sal_Bool bEnableRemove = sal_False; - SvLBoxEntry* pEntry = m_aItemList.FirstSelected(); + SvTreeListEntry* pEntry = m_aItemList.FirstSelected(); if ( pEntry ) { bEnableAdd = sal_True; @@ -3211,7 +3211,7 @@ namespace svxform else if ( &m_aEditNamespaceBtn == pBtn ) { ManageNamespaceDialog aDlg( this, m_pConditionDlg, true ); - SvLBoxEntry* pEntry = m_aNamespacesList.FirstSelected(); + SvTreeListEntry* pEntry = m_aNamespacesList.FirstSelected(); DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" ); String sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); aDlg.SetNamespace( @@ -3229,7 +3229,7 @@ namespace svxform } else if ( &m_aDeleteNamespaceBtn == pBtn ) { - SvLBoxEntry* pEntry = m_aNamespacesList.FirstSelected(); + SvTreeListEntry* pEntry = m_aNamespacesList.FirstSelected(); DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" ); ::rtl::OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); m_aRemovedList.push_back( sPrefix ); @@ -3257,7 +3257,7 @@ namespace svxform sal_Int32 nEntryCount = m_aNamespacesList.GetEntryCount(); for( i = 0; i < nEntryCount; ++i ) { - SvLBoxEntry* pEntry = m_aNamespacesList.GetEntry(i); + SvTreeListEntry* pEntry = m_aNamespacesList.GetEntry(i); ::rtl::OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); ::rtl::OUString sURL( m_aNamespacesList.GetEntryText( pEntry, 1 ) ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 4cde508a406a..7dd1032b9555 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -873,7 +873,7 @@ void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos ) FmFilterData* pData = *rPos; pData->GetParent()->GetChildren().erase( rPos ); - // notify the view, this will remove the actual SvLBoxEntry + // notify the view, this will remove the actual SvTreeListEntry FmFilterRemovedHint aRemoveHint( pData ); Broadcast( aRemoveHint ); @@ -1038,16 +1038,16 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem ) class FmFilterItemsString : public SvLBoxString { public: - FmFilterItemsString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const XubString& rStr ) + FmFilterItemsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString& rStr ) :SvLBoxString(pEntry,nFlags,rStr){} - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); - virtual void InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry); + virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData); }; const int nxDBmp = 12; //------------------------------------------------------------------------ -void FmFilterItemsString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry ) +void FmFilterItemsString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvTreeListEntry* pEntry ) { FmFilterItems* pRow = (FmFilterItems*)pEntry->GetUserData(); FmFormItem* pForm = (FmFormItem*)pRow->GetParent(); @@ -1080,7 +1080,7 @@ void FmFilterItemsString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt } //------------------------------------------------------------------------ -void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData) +void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { if( !pViewData ) pViewData = pView->GetViewDataItem( pEntry, this ); @@ -1098,21 +1098,21 @@ class FmFilterString : public SvLBoxString UniString m_aName; public: - FmFilterString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const XubString& rStr, const UniString& aName) + FmFilterString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString& rStr, const UniString& aName) :SvLBoxString(pEntry,nFlags,rStr) ,m_aName(aName) { m_aName.AppendAscii(": "); } - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); - virtual void InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry); + virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData); }; const int nxD = 4; //------------------------------------------------------------------------ -void FmFilterString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData) +void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { if( !pViewData ) pViewData = pView->GetViewDataItem( pEntry, this ); @@ -1129,7 +1129,7 @@ void FmFilterString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvV } //------------------------------------------------------------------------ -void FmFilterString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ ) +void FmFilterString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvTreeListEntry* /*pEntry*/ ) { Font aOldFont( rDev.GetFont()); Font aFont( aOldFont ); @@ -1193,7 +1193,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl m_pModel->Update(xControllers, xCurrent); // expand the filters for the current controller - SvLBoxEntry* pEntry = FindEntry(m_pModel->GetCurrentForm()); + SvTreeListEntry* pEntry = FindEntry(m_pModel->GetCurrentForm()); if (pEntry && !IsExpanded(pEntry)) { SelectAll(sal_False); @@ -1212,7 +1212,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl } //------------------------------------------------------------------------ -sal_Bool FmFilterNavigator::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelection ) +sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) { m_pEditingCurrently = pEntry; if (!SvTreeListBox::EditingEntry( pEntry, rSelection )) @@ -1222,7 +1222,7 @@ sal_Bool FmFilterNavigator::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelec } //------------------------------------------------------------------------ -sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ) +sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) { DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!"); m_pEditingCurrently = NULL; @@ -1269,7 +1269,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUStrin } //------------------------------------------------------------------------ -IMPL_LINK( FmFilterNavigator, OnRemove, SvLBoxEntry*, pEntry ) +IMPL_LINK( FmFilterNavigator, OnRemove, SvTreeListEntry*, pEntry ) { // now remove the entry m_pModel->Remove((FmFilterData*) pEntry->GetUserData()); @@ -1294,7 +1294,7 @@ IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer) break; case DA_EXPANDNODE: { - SvLBoxEntry* pToExpand = GetEntry(m_aTimerTriggered); + SvTreeListEntry* pToExpand = GetEntry(m_aTimerTriggered); if (pToExpand && (GetChildCount(pToExpand) > 0) && !IsExpanded(pToExpand)) // tja, eigentlich muesste ich noch testen, ob die Node nicht schon expandiert ist, aber ich // habe dazu weder in den Basisklassen noch im Model eine Methode gefunden ... @@ -1341,7 +1341,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) } else { // is it an entry whith children, and not yet expanded? - SvLBoxEntry* pDropppedOn = GetEntry(aDropPos); + SvTreeListEntry* pDropppedOn = GetEntry(aDropPos); if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn)) { // -> aufklappen @@ -1379,7 +1379,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) if (!FindEntry(m_aControlExchange->getFormItem())) return DND_ACTION_NONE; - SvLBoxEntry* pDropTarget = GetEntry(aDropPos); + SvTreeListEntry* pDropTarget = GetEntry(aDropPos); if (!pDropTarget) return DND_ACTION_NONE; @@ -1405,7 +1405,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) // ----------------------------------------------------------------------------- namespace { - FmFilterItems* getTargetItems(SvLBoxEntry* _pTarget) + FmFilterItems* getTargetItems(SvTreeListEntry* _pTarget) { FmFilterData* pData = static_cast<FmFilterData*>(_pTarget->GetUserData()); FmFilterItems* pTargetItems = pData->ISA(FmFilterItems) @@ -1429,14 +1429,14 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt ) // das Ziel des Drop sowie einige Daten darueber Point aDropPos = rEvt.maPosPixel; - SvLBoxEntry* pDropTarget = GetEntry( aDropPos ); + SvTreeListEntry* pDropTarget = GetEntry( aDropPos ); if (!pDropTarget) return DND_ACTION_NONE; // search the container where to add the items FmFilterItems* pTargetItems = getTargetItems(pDropTarget); SelectAll(sal_False); - SvLBoxEntry* pEntry = FindEntry(pTargetItems); + SvTreeListEntry* pEntry = FindEntry(pTargetItems); Select(pEntry, sal_True); SetCurEntry(pEntry); @@ -1446,7 +1446,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt ) } //------------------------------------------------------------------------ -void FmFilterNavigator::InitEntry(SvLBoxEntry* pEntry, +void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry, const XubString& rStr, const Image& rImg1, const Image& rImg2, @@ -1465,7 +1465,7 @@ void FmFilterNavigator::InitEntry(SvLBoxEntry* pEntry, } //------------------------------------------------------------------------ -sal_Bool FmFilterNavigator::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) +sal_Bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) return sal_True; @@ -1519,23 +1519,23 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) else if( rHint.ISA(FmFilterTextChangedHint) ) { FmFilterTextChangedHint* pHint = (FmFilterTextChangedHint*)&rHint; - SvLBoxEntry* pEntry = FindEntry(pHint->GetData()); + SvTreeListEntry* pEntry = FindEntry(pHint->GetData()); if (pEntry) SetEntryText( pEntry, pHint->GetData()->GetText()); } else if( rHint.ISA(FmFilterCurrentChangedHint) ) { // invalidate the entries - for (SvLBoxEntry* pEntry = First(); pEntry != NULL; + for (SvTreeListEntry* pEntry = First(); pEntry != NULL; pEntry = Next(pEntry)) GetModel()->InvalidateEntry( pEntry ); } } //------------------------------------------------------------------------ -SvLBoxEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const +SvTreeListEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if (pItem) { for (pEntry = First(); pEntry != NULL; pEntry = Next( pEntry )) @@ -1554,7 +1554,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos) const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel(); // insert the item - SvLBoxEntry* pParentEntry = FindEntry( pParent ); + SvTreeListEntry* pParentEntry = FindEntry( pParent ); InsertEntry( pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem ); if ( pParentEntry ) Expand( pParentEntry ); @@ -1564,7 +1564,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos) void FmFilterNavigator::Remove(FmFilterData* pItem) { // der Entry zu den Daten - SvLBoxEntry* pEntry = FindEntry(pItem); + SvTreeListEntry* pEntry = FindEntry(pItem); if (pEntry == m_pEditingCurrently) // cancel editing @@ -1581,7 +1581,7 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem sal_Bool bHandled = sal_True; sal_Bool bFoundSomething = sal_False; - for (SvLBoxEntry* pEntry = FirstSelected(); + for (SvTreeListEntry* pEntry = FirstSelected(); bHandled && pEntry != NULL; pEntry = NextSelected(pEntry)) { @@ -1665,7 +1665,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) { // die Stelle, an der geklickt wurde Point aWhere; - SvLBoxEntry* pClicked = NULL; + SvTreeListEntry* pClicked = NULL; if (rEvt.IsMouseEvent()) { aWhere = rEvt.GetMousePosPixel(); @@ -1689,7 +1689,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) } ::std::vector<FmFilterData*> aSelectList; - for (SvLBoxEntry* pEntry = FirstSelected(); + for (SvTreeListEntry* pEntry = FirstSelected(); pEntry != NULL; pEntry = NextSelected(pEntry)) { @@ -1758,9 +1758,9 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) SvTreeListBox::Command( rEvt ); } // ----------------------------------------------------------------------------- -SvLBoxEntry* FmFilterNavigator::getNextEntry(SvLBoxEntry* _pStartWith) +SvTreeListEntry* FmFilterNavigator::getNextEntry(SvTreeListEntry* _pStartWith) { - SvLBoxEntry* pEntry = _pStartWith ? _pStartWith : LastSelected(); + SvTreeListEntry* pEntry = _pStartWith ? _pStartWith : LastSelected(); pEntry = Next(pEntry); // we need the next filter entry while( pEntry && GetChildCount( pEntry ) == 0 && pEntry != Last() ) @@ -1768,9 +1768,9 @@ SvLBoxEntry* FmFilterNavigator::getNextEntry(SvLBoxEntry* _pStartWith) return pEntry; } // ----------------------------------------------------------------------------- -SvLBoxEntry* FmFilterNavigator::getPrevEntry(SvLBoxEntry* _pStartWith) +SvTreeListEntry* FmFilterNavigator::getPrevEntry(SvTreeListEntry* _pStartWith) { - SvLBoxEntry* pEntry = _pStartWith ? _pStartWith : FirstSelected(); + SvTreeListEntry* pEntry = _pStartWith ? _pStartWith : FirstSelected(); pEntry = Prev(pEntry); // check if the previous entry is a filter, if so get the next prev if ( pEntry && GetChildCount( pEntry ) != 0 ) @@ -1799,11 +1799,11 @@ void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt) if ( !getSelectedFilterItems( aItemList ) ) break; - ::std::mem_fun1_t<SvLBoxEntry*,FmFilterNavigator,SvLBoxEntry*> getter = ::std::mem_fun(&FmFilterNavigator::getNextEntry); + ::std::mem_fun1_t<SvTreeListEntry*,FmFilterNavigator,SvTreeListEntry*> getter = ::std::mem_fun(&FmFilterNavigator::getNextEntry); if ( rKeyCode.GetCode() == KEY_UP ) getter = ::std::mem_fun(&FmFilterNavigator::getPrevEntry); - SvLBoxEntry* pTarget = getter( this, NULL ); + SvTreeListEntry* pTarget = getter( this, NULL ); if ( !pTarget ) break; @@ -1871,8 +1871,8 @@ void FmFilterNavigator::DeleteSelection() { // to avoid the deletion of an entry twice (e.g. deletion of a parent and afterward // the deletion of it's child, i have to shrink the selecton list - ::std::vector<SvLBoxEntry*> aEntryList; - for (SvLBoxEntry* pEntry = FirstSelected(); + ::std::vector<SvTreeListEntry*> aEntryList; + for (SvTreeListEntry* pEntry = FirstSelected(); pEntry != NULL; pEntry = NextSelected(pEntry)) { @@ -1888,7 +1888,7 @@ void FmFilterNavigator::DeleteSelection() // Remove the selection SelectAll(sal_False); - for (::std::vector<SvLBoxEntry*>::reverse_iterator i = aEntryList.rbegin(); + for (::std::vector<SvTreeListEntry*>::reverse_iterator i = aEntryList.rbegin(); // link problems with operator == i.base() != aEntryList.rend().base(); ++i) { diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index fab396509a3a..4e39878b0502 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -204,20 +204,20 @@ namespace svxform } //-------------------------------------------------------------------- - size_t OControlTransferData::onEntryRemoved( SvLBoxEntry* _pEntry ) + size_t OControlTransferData::onEntryRemoved( SvTreeListEntry* _pEntry ) { m_aSelectedEntries.erase( _pEntry ); return m_aSelectedEntries.size(); } //-------------------------------------------------------------------- - void OControlTransferData::addSelectedEntry( SvLBoxEntry* _pEntry ) + void OControlTransferData::addSelectedEntry( SvTreeListEntry* _pEntry ) { m_aSelectedEntries.insert( _pEntry ); } //-------------------------------------------------------------------- - void OControlTransferData::setFocusEntry( SvLBoxEntry* _pFocusEntry ) + void OControlTransferData::setFocusEntry( SvTreeListEntry* _pFocusEntry ) { m_pFocusEntry = _pFocusEntry; } @@ -229,7 +229,7 @@ namespace svxform } //------------------------------------------------------------------------ - void OControlTransferData::buildPathFormat(SvTreeListBox* pTreeBox, SvLBoxEntry* pRoot) + void OControlTransferData::buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot) { m_aControlPaths.realloc(0); @@ -246,9 +246,9 @@ namespace svxform { // erst mal sammeln wir den Pfad in einem Array ein ::std::vector< sal_uInt32 > aCurrentPath; - SvLBoxEntry* pCurrentEntry = *loop; + SvTreeListEntry* pCurrentEntry = *loop; - SvLBoxEntry* pLoop = pCurrentEntry; + SvTreeListEntry* pLoop = pCurrentEntry; while (pLoop != pRoot) { aCurrentPath.push_back(pLoop->GetChildListPos()); @@ -270,7 +270,7 @@ namespace svxform } //------------------------------------------------------------------------ - void OControlTransferData::buildListFromPath(SvTreeListBox* pTreeBox, SvLBoxEntry* pRoot) + void OControlTransferData::buildListFromPath(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot) { ListBoxEntrySet aEmpty; m_aSelectedEntries.swap( aEmpty ); @@ -281,7 +281,7 @@ namespace svxform { sal_Int32 nThisPatLength = pPaths[i].getLength(); const sal_uInt32* pThisPath = pPaths[i].getConstArray(); - SvLBoxEntry* pSearch = pRoot; + SvTreeListEntry* pSearch = pRoot; for (sal_Int32 j=0; j<nThisPatLength; ++j) pSearch = pTreeBox->GetEntry(pSearch, pThisPath[j]); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index c0a151706e28..fe5968f542fd 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -229,7 +229,7 @@ namespace svxform // wenn es GENAU eine Form gibt, auch diese expandieren if (m_pRootEntry) { - SvLBoxEntry* pFirst = FirstChild(m_pRootEntry); + SvTreeListEntry* pFirst = FirstChild(m_pRootEntry); if (pFirst && !NextSibling(pFirst)) Expand(pFirst); } @@ -239,7 +239,7 @@ namespace svxform sal_Bool NavigatorTree::implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implAllowExchange" ); - SvLBoxEntry* pCurEntry = GetCurEntry(); + SvTreeListEntry* pCurEntry = GetCurEntry(); if (!pCurEntry) return sal_False; @@ -338,7 +338,7 @@ namespace svxform if (rEvt.IsMouseEvent()) { ptWhere = rEvt.GetMousePosPixel(); - SvLBoxEntry* ptClickedOn = GetEntry(ptWhere); + SvTreeListEntry* ptClickedOn = GetEntry(ptWhere); if (ptClickedOn == NULL) break; if ( !IsSelected(ptClickedOn) ) @@ -353,7 +353,7 @@ namespace svxform if (m_arrCurrentSelection.empty()) // kann nur bei Kontextmenue ueber Tastatur passieren break; - SvLBoxEntry* pCurrent = GetCurEntry(); + SvTreeListEntry* pCurrent = GetCurEntry(); if (!pCurrent) break; ptWhere = GetEntryPosition(pCurrent); @@ -500,7 +500,7 @@ namespace svxform case SID_FM_TAB_DIALOG: { // dieser Slot galt bei genau einem selektierten Formular - SvLBoxEntry* pSelectedForm = *m_arrCurrentSelection.begin(); + SvTreeListEntry* pSelectedForm = *m_arrCurrentSelection.begin(); DBG_ASSERT( IsFormEntry(pSelectedForm), "NavigatorTree::Command: Dieser Eintrag muss ein FormEntry sein." ); FmFormData* pFormData = (FmFormData*)pSelectedForm->GetUserData(); @@ -554,11 +554,11 @@ namespace svxform } //------------------------------------------------------------------------ - SvLBoxEntry* NavigatorTree::FindEntry( FmEntryData* pEntryData ) + SvTreeListEntry* NavigatorTree::FindEntry( FmEntryData* pEntryData ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::FindEntry" ); if( !pEntryData ) return NULL; - SvLBoxEntry* pCurEntry = First(); + SvTreeListEntry* pCurEntry = First(); FmEntryData* pCurEntryData; while( pCurEntry ) { @@ -594,7 +594,7 @@ namespace svxform else if( rHint.ISA(FmNavModelReplacedHint) ) { FmEntryData* pData = ((FmNavModelReplacedHint*)&rHint)->GetEntryData(); - SvLBoxEntry* pEntry = FindEntry( pData ); + SvTreeListEntry* pEntry = FindEntry( pData ); if (pEntry) { // das Image neu setzen SetCollapsedEntryBmp( pEntry, pData->GetNormalImage() ); @@ -605,7 +605,7 @@ namespace svxform else if( rHint.ISA(FmNavNameChangedHint) ) { FmNavNameChangedHint* pNameChangedHint = (FmNavNameChangedHint*)&rHint; - SvLBoxEntry* pEntry = FindEntry( pNameChangedHint->GetEntryData() ); + SvTreeListEntry* pEntry = FindEntry( pNameChangedHint->GetEntryData() ); SetEntryText( pEntry, pNameChangedHint->GetNewName() ); } @@ -634,13 +634,13 @@ namespace svxform } //------------------------------------------------------------------------ - SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos ) + SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Insert" ); ////////////////////////////////////////////////////////////////////// // Aktuellen Eintrag einfuegen - SvLBoxEntry* pParentEntry = FindEntry( pEntryData->GetParent() ); - SvLBoxEntry* pNewEntry; + SvTreeListEntry* pParentEntry = FindEntry( pEntryData->GetParent() ); + SvTreeListEntry* pNewEntry; if( !pParentEntry ) pNewEntry = InsertEntry( pEntryData->GetText(), @@ -679,7 +679,7 @@ namespace svxform return; // der Entry zu den Daten - SvLBoxEntry* pEntry = FindEntry( pEntryData ); + SvTreeListEntry* pEntry = FindEntry( pEntryData ); if (!pEntry) return; @@ -709,7 +709,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTree::IsFormEntry( SvLBoxEntry* pEntry ) + sal_Bool NavigatorTree::IsFormEntry( SvTreeListEntry* pEntry ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::IsFormEntry" ); FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData(); @@ -717,7 +717,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTree::IsFormComponentEntry( SvLBoxEntry* pEntry ) + sal_Bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry* pEntry ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::IsFormComponentEntry" ); FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData(); @@ -728,7 +728,7 @@ namespace svxform sal_Bool NavigatorTree::implAcceptPaste( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implAcceptPaste" ); - SvLBoxEntry* pFirstSelected = FirstSelected(); + SvTreeListEntry* pFirstSelected = FirstSelected(); if ( !pFirstSelected || NextSelected( pFirstSelected ) ) // no selected entry, or at least two selected entries return sal_False; @@ -748,7 +748,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvLBoxEntry* _pTargetEntry, sal_Bool _bDnD ) + sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implAcceptDataTransfer" ); // no target -> no drop @@ -825,7 +825,7 @@ namespace svxform DBG_ASSERT(aDropped.size() >= 1, "NavigatorTree::implAcceptDataTransfer: keine Eintraege !"); sal_Bool bDropTargetIsComponent = IsFormComponentEntry( _pTargetEntry ); - //SvLBoxEntry* pDropTargetParent = GetParent( _pTargetEntry ); + //SvTreeListEntry* pDropTargetParent = GetParent( _pTargetEntry ); // conditions to disallow the drop // 0) the root entry is part of the list (can't DnD the root!) @@ -838,7 +838,7 @@ namespace svxform // collect the ancestors of the drop targte (speeds up 3) SvLBoxEntrySortedArray arrDropAnchestors; - SvLBoxEntry* pLoop = _pTargetEntry; + SvTreeListEntry* pLoop = _pTargetEntry; while (pLoop) { arrDropAnchestors.insert(pLoop); @@ -850,8 +850,8 @@ namespace svxform ++dropped ) { - SvLBoxEntry* pCurrent = *dropped; - SvLBoxEntry* pCurrentParent = GetParent(pCurrent); + SvTreeListEntry* pCurrent = *dropped; + SvTreeListEntry* pCurrentParent = GetParent(pCurrent); // test for 0) if (pCurrent == m_pRootEntry) @@ -914,7 +914,7 @@ namespace svxform bNeedTrigger = sal_True; } else { // auf einem Entry mit Children, der nicht aufgeklappt ist ? - SvLBoxEntry* pDropppedOn = GetEntry(aDropPos); + SvTreeListEntry* pDropppedOn = GetEntry(aDropPos); if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn)) { // -> aufklappen @@ -950,7 +950,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvLBoxEntry* _pTargetEntry, sal_Bool _bDnD ) + sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::implExecuteDataTransfer" ); const DataFlavorExVector& rDataFlavors = _rData.GetDataFlavorExVector(); @@ -1035,7 +1035,7 @@ namespace svxform } } - SvLBoxEntry* pToSelect = FindEntry(pNewControlData); + SvTreeListEntry* pToSelect = FindEntry(pNewControlData); Select(pToSelect, sal_True); if (i == 0) SetCurEntry(pToSelect); @@ -1090,7 +1090,7 @@ namespace svxform ) { // ein paar Daten zum aktuellen Element - SvLBoxEntry* pCurrent = *dropped; + SvTreeListEntry* pCurrent = *dropped; DBG_ASSERT(pCurrent != NULL, "NavigatorTree::implExecuteDataTransfer: ungueltiger Eintrag"); DBG_ASSERT(GetParent(pCurrent) != NULL, "NavigatorTree::implExecuteDataTransfer: ungueltiger Eintrag"); // die Root darf nicht gedraggt werden @@ -1182,10 +1182,10 @@ namespace svxform GetNavModel()->GetRootList()->insert( pCurrentUserData, nIndex ); // dann bei mir selber bekanntgeben und neu selektieren - SvLBoxEntry* pNew = Insert( pCurrentUserData, nIndex ); + SvTreeListEntry* pNew = Insert( pCurrentUserData, nIndex ); if ( ( aDropped.begin() == dropped ) && pNew ) { - SvLBoxEntry* pParent = GetParent( pNew ); + SvTreeListEntry* pParent = GetParent( pNew ); if ( pParent ) Expand( pParent ); } @@ -1269,10 +1269,10 @@ namespace svxform } //------------------------------------------------------------------------ - void NavigatorTree::ModelHasRemoved( SvListEntry* _pEntry ) + void NavigatorTree::ModelHasRemoved( SvTreeListEntry* _pEntry ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::ModelHasRemoved" ); - SvLBoxEntry* pTypedEntry = static_cast< SvLBoxEntry* >( _pEntry ); + SvTreeListEntry* pTypedEntry = static_cast< SvTreeListEntry* >( _pEntry ); if ( doingKeyboardCut() ) m_aCutEntries.erase( pTypedEntry ); @@ -1301,7 +1301,7 @@ namespace svxform for ( SvLBoxEntrySortedArray::const_iterator it = m_arrCurrentSelection.begin(); it != m_arrCurrentSelection.end(); ++it ) { - SvLBoxEntry* pEntry = *it; + SvTreeListEntry* pEntry = *it; if ( pEntry ) { m_aCutEntries.insert( pEntry ); @@ -1349,7 +1349,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTree::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelection ) + sal_Bool NavigatorTree::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::EditingEntry" ); if (!SvTreeListBox::EditingEntry( pEntry, rSelection )) @@ -1360,7 +1360,7 @@ namespace svxform } //------------------------------------------------------------------------ - void NavigatorTree::NewForm( SvLBoxEntry* pParentEntry ) + void NavigatorTree::NewForm( SvTreeListEntry* pParentEntry ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NewForm" ); ////////////////////////////////////////////////////////////////////// @@ -1417,12 +1417,12 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // In EditMode schalten - SvLBoxEntry* pNewEntry = FindEntry( pNewFormData ); + SvTreeListEntry* pNewEntry = FindEntry( pNewFormData ); EditEntry( pNewEntry ); } //------------------------------------------------------------------------ - FmControlData* NavigatorTree::NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName ) + FmControlData* NavigatorTree::NewControl( const ::rtl::OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NewControl" ); ////////////////////////////////////////////////////////////////////// @@ -1462,7 +1462,7 @@ namespace svxform { ////////////////////////////////////////////////////////////////////// // In EditMode schalten - SvLBoxEntry* pNewEntry = FindEntry( pNewFormControlData ); + SvTreeListEntry* pNewEntry = FindEntry( pNewFormControlData ); Select( pNewEntry, sal_True ); EditEntry( pNewEntry ); } @@ -1506,7 +1506,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTree::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ) + sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::EditedEntry" ); if (EditingCanceled()) @@ -1545,7 +1545,7 @@ namespace svxform { case DA_EXPANDNODE: { - SvLBoxEntry* pToExpand = GetEntry(m_aTimerTriggered); + SvTreeListEntry* pToExpand = GetEntry(m_aTimerTriggered); if (pToExpand && (GetChildCount(pToExpand) > 0) && !IsExpanded(pToExpand)) // tja, eigentlich muesste ich noch testen, ob die Node nicht schon expandiert ist, aber ich // habe dazu weder in den Basisklassen noch im Model eine Methode gefunden ... @@ -1609,7 +1609,7 @@ namespace svxform ++i ) { - SvLBoxEntry* pEntry = *i; + SvTreeListEntry* pEntry = *i; if ( !pEntry ) continue; @@ -1868,7 +1868,7 @@ namespace svxform m_nFormsSelected = m_nControlsSelected = m_nHiddenControls = 0; m_bRootSelected = sal_False; - SvLBoxEntry* pSelectionLoop = FirstSelected(); + SvTreeListEntry* pSelectionLoop = FirstSelected(); while (pSelectionLoop) { // erst mal die Zaehlung der verschiedenen Elemente @@ -1893,7 +1893,7 @@ namespace svxform m_arrCurrentSelection.insert(pSelectionLoop); else { - SvLBoxEntry* pParentLoop = GetParent(pSelectionLoop); + SvTreeListEntry* pParentLoop = GetParent(pSelectionLoop); while (pParentLoop) { // eigentlich muesste ich testen, ob das Parent in der m_arrCurrentSelection steht ... @@ -1917,7 +1917,7 @@ namespace svxform } else if (sdiHow == SDI_NORMALIZED_FORMARK) { - SvLBoxEntry* pParent = GetParent(pSelectionLoop); + SvTreeListEntry* pParent = GetParent(pSelectionLoop); if (!pParent || !IsSelected(pParent) || IsFormEntry(pSelectionLoop)) m_arrCurrentSelection.insert(pSelectionLoop); } @@ -1943,7 +1943,7 @@ namespace svxform else { // erst mal gleiche ich meine aktuelle Selektion mit der geforderten SelectList ab - SvLBoxEntry* pSelection = FirstSelected(); + SvTreeListEntry* pSelection = FirstSelected(); while (pSelection) { FmEntryData* pCurrent = (FmEntryData*)pSelection->GetUserData(); @@ -1969,7 +1969,7 @@ namespace svxform } // jetzt habe ich in der SelectList genau die Eintraege, die noch selektiert werden muessen - // zwei Moeglichkeiten : 1) ich gehe durch die SelectList, besorge mir zu jedem Eintrag meinen SvLBoxEntry + // zwei Moeglichkeiten : 1) ich gehe durch die SelectList, besorge mir zu jedem Eintrag meinen SvTreeListEntry // und selektiere diesen (waere irgendwie intuitiver ;)) 2) ich gehe durch alle meine SvLBoxEntries und selektiere // genau die, die ich in der SelectList finde // 1) braucht O(k*n) (k=Laenge der SelectList, n=Anzahl meiner Entries), plus den Fakt, dass FindEntry nicht den @@ -1977,7 +1977,7 @@ namespace svxform // 2) braucht O(n*log k), dupliziert aber etwas Code (naemlich den aus FindEntry) // da das hier eine relativ oft aufgerufenen Stelle sein koennte (bei jeder Aenderung in der Markierung in der View !), // nehme ich doch lieber letzteres - SvLBoxEntry* pLoop = First(); + SvTreeListEntry* pLoop = First(); while( pLoop ) { FmEntryData* pCurEntryData = (FmEntryData*)pLoop->GetUserData(); @@ -2027,7 +2027,7 @@ namespace svxform for (SvLBoxEntrySortedArray::const_iterator it = m_arrCurrentSelection.begin(); it != m_arrCurrentSelection.end(); ++it) { - SvLBoxEntry* pSelectionLoop = *it; + SvTreeListEntry* pSelectionLoop = *it; // Bei Formselektion alle Controls dieser Form markieren if (IsFormEntry(pSelectionLoop) && (pSelectionLoop != m_pRootEntry)) MarkViewObj((FmFormData*)pSelectionLoop->GetUserData(), sal_True, sal_False); @@ -2095,7 +2095,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) + sal_Bool NavigatorTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Select" ); if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index accb2c1ed08a..8fa8b73c5c85 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -161,7 +161,7 @@ sal_Bool FmFieldWinListBox::DoubleClickHdl() //------------------------------------------------------------------------------ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ ) { - SvLBoxEntry* pSelected = FirstSelected(); + SvTreeListEntry* pSelected = FirstSelected(); if (!pSelected) // no drag without a field return; @@ -250,7 +250,7 @@ void FmFieldWin::GetFocus() //----------------------------------------------------------------------- sal_Bool FmFieldWin::createSelectionControls( ) { - SvLBoxEntry* pSelected = pListBox->FirstSelected(); + SvTreeListEntry* pSelected = pListBox->FirstSelected(); if ( pSelected ) { // build a descriptor for the currently selected field diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 462c9911665e..3949d4c6536a 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -136,7 +136,7 @@ namespace svxform virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); void DeleteAndClear(); - void RemoveEntry( SvLBoxEntry* _pEntry ); + void RemoveEntry( SvTreeListEntry* _pEntry ); }; //======================================================================== @@ -163,12 +163,12 @@ namespace svxform DECL_LINK(TbxSelectHdl, void *); DECL_LINK(ItemSelectHdl, void *); - void AddChildren( SvLBoxEntry* _pParent, + void AddChildren( SvTreeListEntry* _pParent, const ImageList& _rImgLst, const XNode_ref& _xNode ); bool DoToolBoxAction( sal_uInt16 _nToolBoxID ); - SvLBoxEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement ); - SvLBoxEntry* AddEntry( const XPropertySet_ref& _rPropSet ); + SvTreeListEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement ); + SvTreeListEntry* AddEntry( const XPropertySet_ref& _rPropSet ); void EditEntry( const XPropertySet_ref& _rPropSet ); bool RemoveEntry(); @@ -190,7 +190,7 @@ namespace svxform bool DoMenuAction( sal_uInt16 _nMenuID ); void EnableMenuItems( Menu* _pMenu ); - inline SvLBoxEntry* GetSelectedItem() const { return m_aItemList.FirstSelected(); } + inline SvTreeListEntry* GetSelectedItem() const { return m_aItemList.FirstSelected(); } inline const String& GetInstanceName() const { return m_sInstanceName; } inline const String& GetInstanceURL() const { return m_sInstanceURL; } inline bool GetLinkOnce() const { return m_bLinkOnce; } diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 12cb6804b1d6..3fcd9ca8ab9e 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -571,14 +571,14 @@ class RecovDocListEntry : public SvLBoxString //--------------------------------------- /** @short TODO */ - RecovDocListEntry( SvLBoxEntry* pEntry, + RecovDocListEntry( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText ); //--------------------------------------- /** @short TODO */ virtual void Paint( - const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry); + const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvTreeListEntry* pEntry); }; //=============================================== @@ -611,7 +611,7 @@ class RecovDocList : public SvxSimpleTable //--------------------------------------- /** @short TODO */ - virtual void InitEntry( SvLBoxEntry* pEntry , + virtual void InitEntry( SvTreeListEntry* pEntry , const XubString& sText , const Image& aImage1, const Image& aImage2, diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 753b38db21a2..816ed67bdcdf 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -259,7 +259,7 @@ class FmFilterNavigator : public SvTreeListBox, public SfxListener enum DROP_ACTION{ DA_SCROLLUP, DA_SCROLLDOWN, DA_EXPANDNODE }; FmFilterModel* m_pModel; - SvLBoxEntry* m_pEditingCurrently; + SvTreeListEntry* m_pEditingCurrently; OFilterExchangeHelper m_aControlExchange; @@ -284,22 +284,22 @@ protected: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void Command( const CommandEvent& rEvt ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual void InitEntry(SvLBoxEntry* pEntry, const XubString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); - virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSelection ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); + virtual void InitEntry(SvTreeListEntry* pEntry, const XubString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); + virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); void DeleteSelection(); - SvLBoxEntry* FindEntry(const FmFilterData* pItem) const; + SvTreeListEntry* FindEntry(const FmFilterData* pItem) const; void Insert(FmFilterData* pItem, sal_uLong nPos); void Remove(FmFilterData* pItem); - DECL_LINK(OnRemove, SvLBoxEntry*); - DECL_LINK(OnEdited, SvLBoxEntry*); + DECL_LINK(OnRemove, SvTreeListEntry*); + DECL_LINK(OnEdited, SvTreeListEntry*); DECL_LINK(OnDropActionTimer, void*); private: @@ -319,8 +319,8 @@ private: If <TRUE/> the items will not be removed from the model, otherwise they will. */ void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy = sal_False); - SvLBoxEntry* getPrevEntry(SvLBoxEntry* _pStartWith = NULL); - SvLBoxEntry* getNextEntry(SvLBoxEntry* _pStartWith = NULL); + SvTreeListEntry* getPrevEntry(SvTreeListEntry* _pStartWith = NULL); + SvTreeListEntry* getNextEntry(SvTreeListEntry* _pStartWith = NULL); using SvTreeListBox::Select; using SvTreeListBox::ExecuteDrop; diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 2bafd5652392..3221e644a376 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -27,7 +27,7 @@ #include <svx/svxdllapi.h> -class SvLBoxEntry; +class SvTreeListEntry; //======================================================================== class SvTreeListBox; @@ -39,7 +39,7 @@ namespace svxform //==================================================================== - typedef ::std::set< SvLBoxEntry* > ListBoxEntrySet; + typedef ::std::set< SvTreeListEntry* > ListBoxEntrySet; //==================================================================== //= OLocalExchange @@ -141,7 +141,7 @@ namespace svxform m_xFormsRoot; // the root of the forms collection where the entries we represent reside // this uniquely identifies the page and the document - SvLBoxEntry* m_pFocusEntry; + SvTreeListEntry* m_pFocusEntry; protected: // updates m_aCurrentFormats with all formats we currently could supply @@ -157,8 +157,8 @@ namespace svxform inline const DataFlavorExVector& GetDataFlavorExVector() const; - void addSelectedEntry( SvLBoxEntry* _pEntry ); - void setFocusEntry( SvLBoxEntry* _pFocusEntry ); + void addSelectedEntry( SvTreeListEntry* _pEntry ); + void setFocusEntry( SvTreeListEntry* _pFocusEntry ); /** notifies the data transfer object that a certain entry has been removed from the owning tree @@ -168,18 +168,18 @@ namespace svxform @param _pEntry @return the number of entries remaining in the selection. */ - size_t onEntryRemoved( SvLBoxEntry* _pEntry ); + size_t onEntryRemoved( SvTreeListEntry* _pEntry ); void setFormsRoot( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxFormsRoot ) { m_xFormsRoot = _rxFormsRoot; } - void buildPathFormat(SvTreeListBox* pTreeBox, SvLBoxEntry* pRoot); + void buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); // baut aus m_aSelectedEntries m_aControlPaths auf // (es wird davon ausgegangen, dass die Eintraege in m_aSelectedEntries sortiert sind in Bezug auf die Nachbar-Beziehung) - void buildListFromPath(SvTreeListBox* pTreeBox, SvLBoxEntry* pRoot); + void buildListFromPath(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); // der umgekehrte Weg : wirft alles aus m_aSelectedEntries weg und baut es mittels m_aControlPaths neu auf void addHiddenControlsFormat(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > seqInterfaces); @@ -187,7 +187,7 @@ namespace svxform // (es erfolgt KEINE Ueberpruefung, ob dadurch auch tatsaechlich nur hidden Controls bezeichnet werden, dass muss der // Aufrufer sicherstellen) - SvLBoxEntry* focused() const { return m_pFocusEntry; } + SvTreeListEntry* focused() const { return m_pFocusEntry; } const ListBoxEntrySet& selected() const { return m_aSelectedEntries; } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > hiddenControls() const { return m_aHiddenControlModels; } diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 89a8dd67702b..981fa10e3b80 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -417,7 +417,7 @@ namespace svxform }; //======================================================================== - typedef std::set<SvLBoxEntry*> SvLBoxEntrySortedArray; + typedef std::set<SvTreeListEntry*> SvLBoxEntrySortedArray; class NavigatorTree : public SvTreeListBox, public SfxListener { @@ -438,8 +438,8 @@ namespace svxform ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; NavigatorTreeModel* m_pNavModel; - SvLBoxEntry* m_pRootEntry; - SvLBoxEntry* m_pEditEntry; + SvTreeListEntry* m_pRootEntry; + SvTreeListEntry* m_pEditEntry; sal_uLong nEditEvent; @@ -463,9 +463,9 @@ namespace svxform void UpdateContent(); - FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True ); - void NewForm( SvLBoxEntry* pParentEntry ); - SvLBoxEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); + FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True ); + void NewForm( SvTreeListEntry* pParentEntry ); + SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); void Remove( FmEntryData* pEntryData ); @@ -527,21 +527,21 @@ namespace svxform void MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark ); void UnmarkAllViewObj(); - sal_Bool IsFormEntry( SvLBoxEntry* pEntry ); - sal_Bool IsFormComponentEntry( SvLBoxEntry* pEntry ); + sal_Bool IsFormEntry( SvTreeListEntry* pEntry ); + sal_Bool IsFormComponentEntry( SvTreeListEntry* pEntry ); ::rtl::OUString GenerateName( FmEntryData* pEntryData ); NavigatorTreeModel* GetNavModel() const { return m_pNavModel; } - SvLBoxEntry* FindEntry( FmEntryData* pEntryData ); + SvTreeListEntry* FindEntry( FmEntryData* pEntryData ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); - virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); - virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void ModelHasRemoved( SvListEntry* _pEntry ); + virtual void ModelHasRemoved( SvTreeListEntry* _pEntry ); using SvTreeListBox::Insert; using SvTreeListBox::ExecuteDrop; @@ -550,10 +550,10 @@ namespace svxform private: sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const Point& _rDropPos, sal_Bool _bDnD ); - sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvLBoxEntry* _pTargetEntry, sal_Bool _bDnD ); + sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD ); sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const Point& _rDropPos, sal_Bool _bDnD ); - sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvLBoxEntry* _pTargetEntry, sal_Bool _bDnD ); + sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD ); // check if a cut, copy, or drag operation can be started in the current situation sal_Bool implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden = NULL ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index f58ef9e722c6..41580525a169 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -207,7 +207,7 @@ void DictionaryList::refillFromDictionary( sal_Int32 nTextConversionOptions ) nConversionPropertyType = xPropertyType->getPropertyType(aLeft, aRight); DictionaryEntry* pEntry = new DictionaryEntry( aLeft, aRight, nConversionPropertyType ); - SvLBoxEntry* pLBEntry = InsertEntry( makeTabString( *pEntry ) ); + SvTreeListEntry* pLBEntry = InsertEntry( makeTabString( *pEntry ) ); pLBEntry->SetUserData( pEntry ); } @@ -232,7 +232,7 @@ DictionaryEntry* DictionaryList::getFirstSelectedEntry() const DictionaryEntry* DictionaryList::getEntryOnPos( sal_Int32 nPos ) const { DictionaryEntry* pEntry=0; - SvLBoxEntry* pLBEntry = GetEntryOnPos( nPos ); + SvTreeListEntry* pLBEntry = GetEntryOnPos( nPos ); if(pLBEntry) pEntry = (DictionaryEntry*)pLBEntry->GetUserData(); return pEntry; @@ -262,14 +262,14 @@ void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& return; DictionaryEntry* pEntry = new DictionaryEntry( rTerm, rMapping, nConversionPropertyType, sal_True ); - SvLBoxEntry* pLBEntry = InsertEntryToColumn( makeTabString( *pEntry ), nPos ); + SvTreeListEntry* pLBEntry = InsertEntryToColumn( makeTabString( *pEntry ), nPos ); pLBEntry->SetUserData( pEntry ); SelectRow( GetEntryPos( pLBEntry ) ); } void DictionaryList::deleteEntryOnPos( sal_Int32 nPos ) { - SvLBoxEntry* pLBEntry = GetEntryOnPos( nPos ); + SvTreeListEntry* pLBEntry = GetEntryOnPos( nPos ); DictionaryEntry* pEntry = getEntryOnPos( nPos ); if( pLBEntry ) RemoveParentKeepChildren( pLBEntry ); @@ -291,7 +291,7 @@ sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm ) if( rTerm.equals( pCurEntry->m_aTerm ) ) { nPos = nN; - SvLBoxEntry* pCurLBEntry = GetEntryOnPos( nN ); + SvTreeListEntry* pCurLBEntry = GetEntryOnPos( nN ); RemoveParentKeepChildren( pCurLBEntry ); if( pCurEntry->m_bNewEntry ) delete pCurEntry; @@ -375,12 +375,12 @@ sal_uInt16 DictionaryList::getSortColumn() const IMPL_LINK( DictionaryList, CompareHdl, SvSortData*, pData ) { - SvLBoxEntry* pLeft = (SvLBoxEntry*)(pData->pLeft ); - SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight ); + SvTreeListEntry* pLeft = (SvTreeListEntry*)(pData->pLeft ); + SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight ); return (long) ColumnCompare(pLeft,pRight); } -StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pRight ) +StringCompare DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry* pRight ) { StringCompare eCompare=COMPARE_EQUAL; @@ -408,7 +408,7 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR return eCompare; } -SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const +SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 nColumn ) const { SvLBoxItem* pItem = NULL; if( pEntry ) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 19709d89afeb..45d76eb2e967 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -109,8 +109,8 @@ private: String makeTabString( const DictionaryEntry& rEntry ) const; DECL_LINK( CompareHdl, SvSortData* ); - StringCompare ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pRight ); - SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const; + StringCompare ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry* pRight ); + SvLBoxItem* getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 nColumn ) const; public: ::com::sun::star::uno::Reference< diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 4d35ebaf515b..01a721f516b5 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -490,13 +490,13 @@ void Atom::compare( Atom* pAtom ) class AtomBoxString : public SvLBoxString { public: - AtomBoxString( SvLBoxEntry* pEntry, const String& rStr ) + AtomBoxString( SvTreeListEntry* pEntry, const String& rStr ) : SvLBoxString( pEntry, 0, rStr ) { } ~AtomBoxString() { } - void Paint( const Point& rPos, SvLBox& rOutDev, USHORT nViewDataEntryFlags, SvLBoxEntry* pEntry ) + void Paint( const Point& rPos, SvLBox& rOutDev, USHORT nViewDataEntryFlags, SvTreeListEntry* pEntry ) { Color aOldTextColor = rOutDev.GetTextColor(); @@ -530,16 +530,16 @@ public: void SetExpandingHdl(const Link& rNewHdl){maExpandingHdl=rNewHdl;} const Link& GetExpandingHdl() const { return maExpandingHdl; } - virtual BOOL Expand( SvLBoxEntry* pParent ); - virtual BOOL Collapse( SvLBoxEntry* pParent ); + virtual BOOL Expand( SvTreeListEntry* pParent ); + virtual BOOL Collapse( SvTreeListEntry* pParent ); - SvLBoxEntry* findAtom( Atom* pAtom ); + SvTreeListEntry* findAtom( Atom* pAtom ); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&); virtual void SetTabs(); private: - void InsertAtom( const Atom* pAtom, SvLBoxEntry* pParent = 0 ); + void InsertAtom( const Atom* pAtom, SvTreeListEntry* pParent = 0 ); const Atom* mpRootAtom; ResMgr* mpResMgr; Image maImgFolder; @@ -551,7 +551,7 @@ private: Link maExpandingHdl; }; -typedef std::pair< AtomContainerTreeListBox*, SvLBoxEntry* > AtomContainerEntryPair; +typedef std::pair< AtomContainerTreeListBox*, SvTreeListEntry* > AtomContainerEntryPair; AtomContainerTreeListBox::AtomContainerTreeListBox( Window* pParent ) : SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_HASBUTTONSATROOT|WB_3DLOOK|WB_BORDER ), @@ -591,16 +591,16 @@ void AtomContainerTreeListBox::SetTabs() AddTab( nStartPos, SV_LBOXTAB_DYNAMIC|SV_LBOXTAB_ADJUST_LEFT | SV_LBOXTAB_SHOW_SELECTION ); } -void AtomContainerTreeListBox::InitEntry(SvLBoxEntry* pEntry,const XubString& aStr,const Image& aCollEntryBmp,const Image& aExpEntryBmp) +void AtomContainerTreeListBox::InitEntry(SvTreeListEntry* pEntry,const XubString& aStr,const Image& aCollEntryBmp,const Image& aExpEntryBmp) { pEntry->AddItem( new SvLBoxContextBmp( pEntry,0, aCollEntryBmp,aExpEntryBmp, SVLISTENTRYFLAG_EXPANDED ) ); pEntry->AddItem( new SvLBoxContextBmp( pEntry,0, maImgAtom, maImgAtom, SVLISTENTRYFLAG_EXPANDED ) ); pEntry->AddItem( new AtomBoxString( pEntry, aStr ) ); } -SvLBoxEntry* AtomContainerTreeListBox::findAtom( Atom* pAtom ) +SvTreeListEntry* AtomContainerTreeListBox::findAtom( Atom* pAtom ) { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while( pEntry ) { if( pEntry->GetUserData() == pAtom ) @@ -612,7 +612,7 @@ SvLBoxEntry* AtomContainerTreeListBox::findAtom( Atom* pAtom ) return 0; } -BOOL AtomContainerTreeListBox::Expand( SvLBoxEntry* pParent ) +BOOL AtomContainerTreeListBox::Expand( SvTreeListEntry* pParent ) { BOOL bRet = FALSE; if( !mbRecursiveGuard ) @@ -627,7 +627,7 @@ BOOL AtomContainerTreeListBox::Expand( SvLBoxEntry* pParent ) return bRet; } -BOOL AtomContainerTreeListBox::Collapse( SvLBoxEntry* pParent ) +BOOL AtomContainerTreeListBox::Collapse( SvTreeListEntry* pParent ) { BOOL bRet = FALSE; if( !mbRecursiveGuard ) @@ -648,7 +648,7 @@ void AtomContainerTreeListBox::SetRootAtom( const Atom* pAtom ) InsertAtom( mpRootAtom ); } -void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvLBoxEntry* pParent /* = 0 */ ) +void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvTreeListEntry* pParent /* = 0 */ ) { if( pAtom ) { @@ -671,7 +671,7 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvLBoxEntry* pPare sprintf( buffer, " (I: %lu L: %lu)", (UINT32)rHeader.nRecVer, (UINT32)rHeader.nRecLen ); aText += String( rtl::OUString::createFromAscii( buffer ) ); - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; if( pAtom->isContainer() && pAtom->findFirstChildAtom() ) { pEntry = InsertEntry( aText, maImgExpanded, maImgCollapsed, pParent ); @@ -959,7 +959,7 @@ static String GetAtomText( const Atom* pAtom ) IMPL_LINK(MSViewerWorkWindow,implSelectHdl, AtomContainerTreeListBox*, pListBox ) { int nPane = (pListBox == mpListBox[1]) ? 1 : 0; - SvLBoxEntry* pEntry = mpListBox[nPane]->FirstSelected(); + SvTreeListEntry* pEntry = mpListBox[nPane]->FirstSelected(); if( pEntry && pEntry->GetUserData() ) { Atom* pAtom = static_cast<Atom*>( pEntry->GetUserData() ); @@ -986,7 +986,7 @@ void MSViewerWorkWindow::Sync( AtomContainerEntryPair* pPair, int nAction ) Atom* pAtom = static_cast<Atom*>(pPair->second->GetUserData()); if( pAtom && pAtom->getCompareAtom() ) { - SvLBoxEntry* pEntry = pDestinationListBox->findAtom( pAtom->getCompareAtom() ); + SvTreeListEntry* pEntry = pDestinationListBox->findAtom( pAtom->getCompareAtom() ); if(pEntry ) { @@ -1009,7 +1009,7 @@ void MSViewerWorkWindow::Sync( AtomContainerEntryPair* pPair, int nAction ) IMPL_LINK(MSViewerWorkWindow, implExpandingHdl, AtomContainerEntryPair*, pPair ) { - SvLBoxEntry* pEntry = pPair->second; + SvTreeListEntry* pEntry = pPair->second; if( pEntry && pEntry->GetUserData() ) { Atom* pAtom = static_cast<Atom*>( pEntry->GetUserData() ); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index ae6ed562a063..627dce855c4d 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -218,7 +218,7 @@ void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) aEntry += pCond->GetTxtFmtColl()->GetName(); } - SvLBoxEntry* pE = aTbLinks.InsertEntryToColumn( aEntry, n ); + SvTreeListEntry* pE = aTbLinks.InsertEntryToColumn( aEntry, n ); if(0 == n) aTbLinks.Select(pE); } @@ -248,7 +248,7 @@ IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) { - SvLBoxEntry* pE = aTbLinks.FirstSelected(); + SvTreeListEntry* pE = aTbLinks.FirstSelected(); sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = aTbLinks.GetModel()->GetAbsPos( pE ) ) ) @@ -299,7 +299,7 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) else { String sTbEntry; - SvLBoxEntry* pE = aTbLinks.FirstSelected(); + SvTreeListEntry* pE = aTbLinks.FirstSelected(); if(pE) sTbEntry = aTbLinks.GetEntryText(pE); sTbEntry = sTbEntry.GetToken(1, '\t'); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index c008302ed1e8..e7f725fc17ce 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -137,7 +137,7 @@ SwCompatibilityOptPage::SwCompatibilityOptPage( Window* pParent, const SfxItemSe STR_USE_OBJPOSITIONING == nResId || STR_USE_OURTEXTWRAPPING == nResId ) ReplaceFormatName( sEntry ); - SvLBoxEntry* pEntry = m_aOptionsLB.SvTreeListBox::InsertEntry( sEntry ); + SvTreeListEntry* pEntry = m_aOptionsLB.SvTreeListBox::InsertEntry( sEntry ); if ( pEntry ) { m_aOptionsLB.SetCheckButtonState( pEntry, SV_BUTTON_UNCHECKED ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 760cf2035103..4bd16dbca1f0 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -527,7 +527,7 @@ sal_Bool SwCaptionOptPage::FillItemSet( SfxItemSet& ) SaveEntry(aCheckLB.FirstSelected()); // apply current entry - SvLBoxEntry* pEntry = aCheckLB.First(); + SvTreeListEntry* pEntry = aCheckLB.First(); while (pEntry) { @@ -609,7 +609,7 @@ void SwCaptionOptPage::SetOptions(const sal_uInt16 nPos, void SwCaptionOptPage::DelUserData() { - SvLBoxEntry* pEntry = aCheckLB.First(); + SvTreeListEntry* pEntry = aCheckLB.First(); while (pEntry) { @@ -621,7 +621,7 @@ void SwCaptionOptPage::DelUserData() IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) { - SvLBoxEntry* pSelEntry = aCheckLB.FirstSelected(); + SvTreeListEntry* pSelEntry = aCheckLB.FirstSelected(); if (pSelEntry) { @@ -746,7 +746,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl) { - SvLBoxEntry* pEntry = aCheckLB.GetHdlEntry(); + SvTreeListEntry* pEntry = aCheckLB.GetHdlEntry(); if (pEntry) // save all SaveEntry(pEntry); @@ -754,7 +754,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl) return 0; } -void SwCaptionOptPage::SaveEntry(SvLBoxEntry* pEntry) +void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry) { if (pEntry) { diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 70b954e3b63f..c38b3f3baae8 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -231,7 +231,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : { if ( pNames[nName] == sBibliography ) continue; - SvLBoxEntry* pEntry = m_aListLB.InsertEntry(pNames[nName]); + SvTreeListEntry* pEntry = m_aListLB.InsertEntry(pNames[nName]); AddressUserData_Impl* pUserData = new AddressUserData_Impl(); pEntry->SetUserData(pUserData); if(pNames[nName] == rCurrentData.sDataSource) @@ -270,7 +270,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : SwAddressListDialog::~SwAddressListDialog() { - SvLBoxEntry* pEntry = m_aListLB.First(); + SvTreeListEntry* pEntry = m_aListLB.First(); while(pEntry) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pEntry->GetUserData()); @@ -281,7 +281,7 @@ SwAddressListDialog::~SwAddressListDialog() IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) { - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); if(pSelect && xMgr.is()) { @@ -350,7 +350,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl) String sNewSource = SwNewDBMgr::LoadAndRegisterDataSource(); if(sNewSource.Len()) { - SvLBoxEntry* pNewSource = m_aListLB.InsertEntry(sNewSource); + SvTreeListEntry* pNewSource = m_aListLB.InsertEntry(sNewSource); pNewSource->SetUserData(new AddressUserData_Impl()); m_aListLB.Select(pNewSource); } @@ -449,7 +449,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton) { - SvLBoxEntry* pEntry = m_aListLB.FirstSelected(); + SvTreeListEntry* pEntry = m_aListLB.FirstSelected(); AddressUserData_Impl* pUserData = pEntry ? static_cast<AddressUserData_Impl*>(pEntry->GetUserData()) : 0; if(pUserData && !pUserData->sURL.isEmpty()) { @@ -481,13 +481,13 @@ IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton) IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl) { - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); Application::PostUserEvent( STATIC_LINK( this, SwAddressListDialog, StaticListBoxSelectHdl_Impl ), pSelect ); return 0; } -IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*, pSelect) +IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEntry*, pSelect) { //prevent nested calls of the select handler if(pThis->m_bInSelectHdl) @@ -547,7 +547,7 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*, // detect the number of tables for a data source // if only one is available then set it at the entry void SwAddressListDialog::DetectTablesAndQueries( - SvLBoxEntry* pSelect, + SvTreeListEntry* pSelect, bool bWidthDialog) { try @@ -645,7 +645,7 @@ void SwAddressListDialog::DetectTablesAndQueries( IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton) { EnterWait(); - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); @@ -671,7 +671,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, OKHdl_Impl) uno::Reference< XDataSource> SwAddressListDialog::GetSource() { uno::Reference< XDataSource> xRet; - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); @@ -684,7 +684,7 @@ uno::Reference< XDataSource> SwAddressListDialog::GetSource() SharedConnection SwAddressListDialog::GetConnection() { SharedConnection xRet; - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); @@ -696,7 +696,7 @@ SharedConnection SwAddressListDialog::GetConnection() uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier() { uno::Reference< XColumnsSupplier> xRet; - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); @@ -708,7 +708,7 @@ uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier() ::rtl::OUString SwAddressListDialog::GetFilter() { ::rtl::OUString sRet; - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 704682270a54..f87e6be660ce 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -78,7 +78,7 @@ class SwAddressListDialog : public SfxModalDialog String m_sConnecting; String m_sCreatedURL; - SvLBoxEntry* m_pCreatedDataSource; + SvTreeListEntry* m_pCreatedDataSource; bool m_bInSelectHdl; @@ -88,7 +88,7 @@ class SwAddressListDialog : public SfxModalDialog SwDBData m_aDBData; - void DetectTablesAndQueries(SvLBoxEntry* pSelect, bool bWidthDialog); + void DetectTablesAndQueries(SvTreeListEntry* pSelect, bool bWidthDialog); DECL_LINK(FilterHdl_Impl, void *); DECL_LINK(LoadHdl_Impl, void *); @@ -98,7 +98,7 @@ class SwAddressListDialog : public SfxModalDialog DECL_LINK(TableSelectHdl_Impl, PushButton*); DECL_LINK(OKHdl_Impl, void *); - DECL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*); + DECL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEntry*); public: SwAddressListDialog(SwMailMergeAddressBlockPage* pParent); diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index e1b593969562..f0ddabff3e71 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -238,7 +238,7 @@ void SwDBTreeList::InitTreeList() void SwDBTreeList::AddDataSource(const String& rSource) { Image aImg = aImageList.GetImage(IMG_DB); - SvLBoxEntry* pEntry = InsertEntry(rSource, aImg, aImg, NULL, sal_True); + SvTreeListEntry* pEntry = InsertEntry(rSource, aImg, aImg, NULL, sal_True); SvTreeListBox::Select(pEntry); } @@ -252,14 +252,14 @@ void SwDBTreeList::ShowColumns(sal_Bool bShowCol) SetUpdateMode(sal_False); - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while (pEntry) { - pEntry = (SvLBoxEntry*)GetRootLevelParent( pEntry ); + pEntry = (SvTreeListEntry*)GetRootLevelParent( pEntry ); Collapse(pEntry); // zuklappen - SvLBoxEntry* pChild; + SvTreeListEntry* pChild; while ((pChild = FirstChild(pEntry)) != 0L) GetModel()->Remove(pChild); @@ -274,7 +274,7 @@ void SwDBTreeList::ShowColumns(sal_Bool bShowCol) } } -void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent) +void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) { if (!pParent->HasChildren()) { @@ -369,7 +369,7 @@ void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent) for (long i = 0; i < nCount; i++) { sTableName = pTblNames[i]; - SvLBoxEntry* pTableEntry = InsertEntry(sTableName, aImg, aImg, pParent, bShowColumns); + SvTreeListEntry* pTableEntry = InsertEntry(sTableName, aImg, aImg, pParent, bShowColumns); //to discriminate between queries and tables the user data of table entries is set pTableEntry->SetUserData((void*)0); } @@ -387,7 +387,7 @@ void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent) for (long i = 0; i < nCount; i++) { sQueryName = pQueryNames[i]; - SvLBoxEntry* pQueryEntry = InsertEntry(sQueryName, aImg, aImg, pParent, bShowColumns); + SvTreeListEntry* pQueryEntry = InsertEntry(sQueryName, aImg, aImg, pParent, bShowColumns); pQueryEntry->SetUserData((void*)1); } } @@ -402,7 +402,7 @@ void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent) IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData ) { - SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight ); + SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight ); if (GetParent(pRight) && GetParent(GetParent(pRight))) return COMPARE_GREATER; // don't sort column names @@ -413,7 +413,7 @@ IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData ) String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, sal_Bool* pbIsTable) { String sDBName; - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if (pEntry && GetParent(pEntry)) { @@ -437,8 +437,8 @@ String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, sal_Boo ------------------------------------------------------------------------*/ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const String& rColumnName) { - SvLBoxEntry* pParent; - SvLBoxEntry* pChild; + SvTreeListEntry* pParent; + SvTreeListEntry* pChild; sal_uInt16 nParent = 0; sal_uInt16 nChild = 0; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 997d63e3a593..7fcf1d8b5f97 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -583,7 +583,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( { m_aFieldFT.Show(); m_aFieldCB.Show(); - SvLBoxEntry* pEntry = m_aAddressElementsLB.InsertEntry(String(SW_RES(ST_SALUTATION ))); + SvTreeListEntry* pEntry = m_aAddressElementsLB.InsertEntry(String(SW_RES(ST_SALUTATION ))); pEntry->SetUserData((void*)(sal_Int32)USER_DATA_SALUTATION ); pEntry = m_aAddressElementsLB.InsertEntry(String(SW_RES(ST_PUNCTUATION))); pEntry->SetUserData((void*)(sal_Int32)USER_DATA_PUNCTUATION ); @@ -624,7 +624,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( for(sal_uInt16 i = 0; i < rHeaders.Count(); ++i) { const XubString& rHeader = rHeaders.GetString( i ); - SvLBoxEntry* pEntry = m_aAddressElementsLB.InsertEntry(rHeader); + SvTreeListEntry* pEntry = m_aAddressElementsLB.InsertEntry(rHeader); pEntry->SetUserData((void*)(sal_IntPtr)i); } m_aOK.SetClickHdl(LINK(this, SwCustomizeAddressBlockDialog, OKHdl_Impl)); @@ -676,7 +676,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, ImageButton*, pBut { if(&m_aInsertFieldIB == pButton) { - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetCurEntry(); if(pEntry) { String sEntry = m_aAddressElementsLB.GetEntryText(pEntry); @@ -711,7 +711,7 @@ sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl() if(sSelected.Len()) for(sal_uLong i = 0; i < m_aAddressElementsLB.GetEntryCount(); ++i) { - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetEntry(i); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetEntry(i); String sEntry = m_aAddressElementsLB.GetEntryText(pEntry); if( sSelected.Equals( sEntry, 1, sSelected.Len() - 2 ) ) { @@ -728,7 +728,7 @@ bool SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData) String sEntry; for(sal_uLong i = 0; i < m_aAddressElementsLB.GetEntryCount(); ++i) { - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetEntry(i); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetEntry(i); if((sal_Int32)(sal_IntPtr)pEntry->GetUserData() == nUserData) { sEntry = m_aAddressElementsLB.GetEntryText(pEntry); @@ -827,7 +827,7 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl() m_aRightIB.Enable(nMove & MOVE_ITEM_RIGHT ); m_aDownIB.Enable(nMove & MOVE_ITEM_DOWN); m_aRemoveFieldIB.Enable(m_aDragED.HasCurrentItem() ? sal_True : sal_False); - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetCurEntry(); m_aInsertFieldIB.Enable( pEntry && (0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || m_aFieldCB.GetText().Len())); } @@ -847,7 +847,7 @@ void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress) { for(sal_uLong i = 0; i < m_aAddressElementsLB.GetEntryCount(); ++i) { - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetEntry(i); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetEntry(i); String sEntry = m_aAddressElementsLB.GetEntryText(pEntry); sEntry += '>'; sEntry.Insert('<', 0); @@ -1358,7 +1358,7 @@ DDListBox::~DDListBox() void DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if(pEntry) { ReleaseMouse(); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index a8b9fab9b2cd..8e912fac17ea 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -118,7 +118,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, String sEntry = pTbls[i]; sEntry += '\t'; sEntry += m_sTable; - SvLBoxEntry* pEntry = m_aTableLB.InsertEntry(sEntry); + SvTreeListEntry* pEntry = m_aTableLB.InsertEntry(sEntry); pEntry->SetUserData((void*)0); } } @@ -133,7 +133,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, String sEntry = pQueries[i]; sEntry += '\t'; sEntry += m_sQuery; - SvLBoxEntry* pEntry = m_aTableLB.InsertEntry(sEntry); + SvTreeListEntry* pEntry = m_aTableLB.InsertEntry(sEntry); pEntry->SetUserData((void*)1); } } @@ -145,7 +145,7 @@ SwSelectDBTableDialog::~SwSelectDBTableDialog() IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) { - SvLBoxEntry* pEntry = m_aTableLB.FirstSelected(); + SvTreeListEntry* pEntry = m_aTableLB.FirstSelected(); if(pEntry) { ::rtl::OUString sTableOrQuery = m_aTableLB.GetEntryText(pEntry, 0); @@ -184,14 +184,14 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) String SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable) { - SvLBoxEntry* pEntry = m_aTableLB.FirstSelected(); + SvTreeListEntry* pEntry = m_aTableLB.FirstSelected(); bIsTable = pEntry->GetUserData() ? false : true; return pEntry ? m_aTableLB.GetEntryText(pEntry, 0) : String(); } void SwSelectDBTableDialog::SetSelectedTable(const String& rTable, bool bIsTable) { - SvLBoxEntry* pEntry = m_aTableLB.First(); + SvTreeListEntry* pEntry = m_aTableLB.First(); while(pEntry) { if((m_aTableLB.GetEntryText(pEntry, 0) == rTable) && diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 56b399a3c733..3be654ee003c 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -431,7 +431,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) if(bDontCheckPasswd) return sal_True; sal_Bool bRet = sal_True; - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); while( pEntry ) { SectReprPtr pRepr = (SectReprPtr)pEntry->GetUserData(); @@ -474,10 +474,10 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) /*--------------------------------------------------------------------- Description: recursively look for child-sections ---------------------------------------------------------------------*/ -void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry ) +void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry ) { SwSection* pSect = 0; - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; if (!pFmt) { @@ -506,7 +506,7 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry else { SwSections aTmpArr; - SvLBoxEntry* pNEntry; + SvTreeListEntry* pNEntry; sal_uInt16 nCnt = pFmt->GetChildSections(aTmpArr,SORTSECT_POS); if( nCnt ) { @@ -555,7 +555,7 @@ sal_uInt16 SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt ) SwEditRegionDlg::~SwEditRegionDlg( ) { - SvLBoxEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = aTree.First(); while( pEntry ) { delete (SectRepr*)pEntry->GetUserData(); @@ -567,7 +567,7 @@ SwEditRegionDlg::~SwEditRegionDlg( ) void SwEditRegionDlg::SelectSection(const String& rSectionName) { - SvLBoxEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = aTree.First(); while(pEntry) { SectReprPtr pRepr = (SectReprPtr)pEntry->GetUserData(); @@ -591,7 +591,7 @@ void SwEditRegionDlg::SelectSection(const String& rSectionName) IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) { bDontCheckPasswd = sal_True; - SvLBoxEntry* pEntry=pBox->FirstSelected(); + SvTreeListEntry* pEntry=pBox->FirstSelected(); aHideCB .Enable(sal_True); // edit in readonly sections aEditInReadonlyCB.Enable(sal_True); @@ -803,7 +803,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) rSh.StartAllAction(); rSh.StartUndo(); rSh.ResetSelect( 0,sal_False ); - SvLBoxEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = aTree.First(); while( pEntry ) { @@ -873,7 +873,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) if(!CheckPasswd(pBox)) return 0; pBox->EnableTriState( sal_False ); - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); sal_Bool bCheck = STATE_CHECK == pBox->GetState(); while( pEntry ) @@ -899,7 +899,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) if(!CheckPasswd(pBox)) return 0; pBox->EnableTriState( sal_False ); - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { @@ -928,7 +928,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) if(!CheckPasswd(pBox)) return 0; pBox->EnableTriState( sal_False ); - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { @@ -948,9 +948,9 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) { if(!CheckPasswd()) return 0; - SvLBoxEntry* pEntry = aTree.FirstSelected(); - SvLBoxEntry* pChild; - SvLBoxEntry* pParent; + SvTreeListEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pChild; + SvTreeListEntry* pParent; // at first mark all selected while(pEntry) { @@ -963,7 +963,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) while(pEntry) { const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData(); - SvLBoxEntry* pRemove = 0; + SvTreeListEntry* pRemove = 0; sal_Bool bRestart = sal_False; if(pSectRepr->IsSelected()) { @@ -1015,7 +1015,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) { if(!CheckPasswd(pBox)) return 0; - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); pBox->EnableTriState(sal_False); sal_Bool bMulti = 1 < aTree.GetSelectionCount(); sal_Bool bFile = pBox->IsChecked(); @@ -1098,7 +1098,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) { if(!CheckPasswd()) return 0; - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); if(pEntry) { @@ -1165,7 +1165,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) SFX_ITEM_SET == eFrmDirState|| SFX_ITEM_SET == eLRState) { - SvLBoxEntry* pSelEntry = aTree.FirstSelected(); + SvTreeListEntry* pSelEntry = aTree.FirstSelected(); while( pSelEntry ) { SectReprPtr pRepr = (SectReprPtr)pSelEntry->GetUserData(); @@ -1204,7 +1204,7 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) if(!CheckPasswd()) return 0; pEdit->SetSelection(aSelect); - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData(); if(pEdit == &aFileNameED) @@ -1251,7 +1251,7 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) { if(!CheckPasswd(pBox)) return 0; - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); if(pEntry) { sal_Bool bFile = aFileCB.IsChecked(); @@ -1307,7 +1307,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) aPasswdCB.Check(!aPasswdCB.IsChecked()); return 0; } - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); sal_Bool bSet = bChange ? bChange : aPasswdCB.IsChecked(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) @@ -1360,7 +1360,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl) { if(!CheckPasswd(0)) return 0; - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); if (pEntry) { @@ -1380,7 +1380,7 @@ IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit *, pEdit ) if(!CheckPasswd(0)) return 0; pEdit->SetSelection(aSelect); - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { @@ -1409,7 +1409,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) } } - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); OSL_ENSURE( pEntry, "no entry found" ); if ( pEntry ) { diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index e9d5e531bb43..4221967662db 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -606,7 +606,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet) void SwVisitingCardPage::ClearUserData() { - SvLBoxEntry* pEntry = aAutoTextLB.First(); + SvTreeListEntry* pEntry = aAutoTextLB.First(); while(pEntry) { delete (String*)pEntry->GetUserData(); @@ -619,7 +619,7 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt, { for( sal_uInt32 i = 0; i < nCnt; ++i ) { - SvLBoxEntry* pEntry = aAutoTextLB.InsertEntry( pNames[ i ] ); + SvTreeListEntry* pEntry = aAutoTextLB.InsertEntry( pNames[ i ] ); pEntry->SetUserData( new String( pValues[ i ] )); } } @@ -689,7 +689,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) if(pGroup) aLabItem.sGlossaryGroup = *pGroup; - SvLBoxEntry* pSelEntry = aAutoTextLB.FirstSelected(); + SvTreeListEntry* pSelEntry = aAutoTextLB.FirstSelected(); if(pSelEntry) aLabItem.sGlossaryBlockName = *(String*)pSelEntry->GetUserData(); rSet.Put(aLabItem); @@ -698,7 +698,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) static void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) { - SvLBoxEntry* pEntry = rAutoTextLB.First(); + SvTreeListEntry* pEntry = rAutoTextLB.First(); while(pEntry) { if(*(String*)pEntry->GetUserData() == rBlockName) @@ -713,7 +713,7 @@ static void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName static sal_Bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) { - SvLBoxEntry* pEntry = rAutoTextLB.First(); + SvTreeListEntry* pEntry = rAutoTextLB.First(); while(pEntry) { if(*(String*)pEntry->GetUserData() == rBlockName) @@ -760,7 +760,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet& rSet) } if(lcl_FindBlock(aAutoTextLB, aLabItem.sGlossaryBlockName)) { - SvLBoxEntry* pSelEntry = aAutoTextLB.FirstSelected(); + SvTreeListEntry* pSelEntry = aAutoTextLB.FirstSelected(); if( pSelEntry && *(String*)pSelEntry->GetUserData() != String(aLabItem.sGlossaryBlockName)) { diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 7e025963e129..b97a30eb8666 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -120,7 +120,7 @@ void SwVisitingCardPage::InitFrameControl() IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl) { - SvLBoxEntry* pSel = aAutoTextLB.FirstSelected(); + SvTreeListEntry* pSel = aAutoTextLB.FirstSelected(); String sEntry; if( pSel ) sEntry = *(String*)pSel->GetUserData(); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 0a5ad8910e31..3b120faaa761 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -40,7 +40,7 @@ void SwFldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt ) if ( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { String sEntry( GetEntryText( pEntry ) ); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index 782f4571013d..b924f87c9dfb 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -30,7 +30,7 @@ public: SwFldRefTreeListBox(Window* pParent, const ResId& rResId); virtual ~SwFldRefTreeListBox(); -// virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); +// virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); }; #endif diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 5c0e9c0a2523..4f7ad7736a57 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -131,8 +131,8 @@ void SwChangeDBDlg::FillDBPopup() size_t nCount = aDBNameList.size(); aUsedDBTLB.Clear(); - SvLBoxEntry *pFirst = 0; - SvLBoxEntry *pLast = 0; + SvTreeListEntry *pFirst = 0; + SvTreeListEntry *pLast = 0; for(size_t k = 0; k < nCount; k++) { @@ -151,13 +151,13 @@ void SwChangeDBDlg::FillDBPopup() } -SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName) +SvTreeListEntry* SwChangeDBDlg::Insert(const String& rDBName) { String sDBName(rDBName.GetToken(0, DB_DELIM)); String sTableName(rDBName.GetToken(1, DB_DELIM)); sal_IntPtr nCommandType = rDBName.GetToken(2, DB_DELIM).ToInt32(); - SvLBoxEntry* pParent; - SvLBoxEntry* pChild; + SvTreeListEntry* pParent; + SvTreeListEntry* pChild; sal_uInt16 nParent = 0; sal_uInt16 nChild = 0; @@ -175,14 +175,14 @@ SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName) if (sTableName == aUsedDBTLB.GetEntryText(pChild)) return pChild; } - SvLBoxEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent); + SvTreeListEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent); pRet->SetUserData((void*)nCommandType); return pRet; } } pParent = aUsedDBTLB.InsertEntry(sDBName, aDBImg, aDBImg); - SvLBoxEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent); + SvTreeListEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent); pRet->SetUserData((void*)nCommandType); return pRet; } @@ -207,7 +207,7 @@ void SwChangeDBDlg::UpdateFlds() { std::vector<String> aDBNames; aDBNames.reserve(aUsedDBTLB.GetSelectionCount()); - SvLBoxEntry* pEntry = aUsedDBTLB.FirstSelected(); + SvTreeListEntry* pEntry = aUsedDBTLB.FirstSelected(); while( pEntry ) { @@ -256,7 +256,7 @@ IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) { sal_Bool bEnable = sal_False; - SvLBoxEntry* pEntry = aAvailDBTLB.GetCurEntry(); + SvTreeListEntry* pEntry = aAvailDBTLB.GetCurEntry(); if (pEntry) { diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index e9f543140b6d..354b88708180 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -401,7 +401,7 @@ void SwFldDBPage::CheckInsert() sal_Bool bInsert = sal_True; sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - SvLBoxEntry* pEntry = aDatabaseTLB.GetCurEntry(); + SvTreeListEntry* pEntry = aDatabaseTLB.GetCurEntry(); if (pEntry) { @@ -427,8 +427,8 @@ void SwFldDBPage::CheckInsert() IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) { - SvLBoxEntry* pColEntry; - SvLBoxEntry* pEntry = pColEntry = pBox->GetCurEntry(); + SvTreeListEntry* pColEntry; + SvTreeListEntry* pEntry = pColEntry = pBox->GetCurEntry(); if (pEntry) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 812b2e7fa690..d368c41f347b 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -103,9 +103,9 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) // display SubTypes in TypeLB sal_uInt16 nTypeId = TYP_DOCINFOFLD; - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; - SvLBoxEntry* pInfo = 0; + SvTreeListEntry* pInfo = 0; sal_uInt16 nSubType = USHRT_MAX; if (IsFldEdit()) @@ -213,7 +213,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) IMPL_LINK_NOARG(SwFldDokInfPage, TypeHdl) { // save old ListBoxPos - SvLBoxEntry* pOldEntry = pSelEntry; + SvTreeListEntry* pOldEntry = pSelEntry; // current ListBoxPos pSelEntry = aTypeTLB.FirstSelected(); @@ -474,7 +474,7 @@ void SwFldDokInfPage::FillUserData() { String sData(rtl::OUString(USER_DATA_VERSION)); sData += ';'; - SvLBoxEntry* pEntry = aTypeTLB.FirstSelected(); + SvTreeListEntry* pEntry = aTypeTLB.FirstSelected(); sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX; sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 0ab9d75758c4..fa13ecf5fdd0 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -52,7 +52,7 @@ class SwFldDokInfPage : public SwFldPage NumFormatListBox aFormatLB; CheckBox aFixedCB; - SvLBoxEntry* pSelEntry; + SvTreeListEntry* pSelEntry; com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xCustomPropertySet; String aInfoStr; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 34f82f218d9d..837c7d42316b 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -112,7 +112,7 @@ void SwFldRefPage::SaveSelectedTxtNode() mnSavedSelectedPos = 0; if ( aSelectionToolTipLB.IsVisible() ) { - SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); + SvTreeListEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); if ( pEntry ) { const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); @@ -536,7 +536,7 @@ void SwFldRefPage::UpdateSubType() const IDocumentOutlineNodes* pIDoc( pSh->getIDocumentOutlineNodesAccess() ); pIDoc->getOutlineNodes( maOutlineNodes ); bool bCertainTxtNodeSelected( false ); - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; sal_uInt16 nOutlIdx = 0; for ( nOutlIdx = 0; nOutlIdx < maOutlineNodes.size(); ++nOutlIdx ) { @@ -566,7 +566,7 @@ void SwFldRefPage::UpdateSubType() const IDocumentListItems* pIDoc( pSh->getIDocumentListItemsAccess() ); pIDoc->getNumItems( maNumItems ); bool bCertainTxtNodeSelected( false ); - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; sal_uInt16 nNumItemIdx = 0; for ( nNumItemIdx = 0; nNumItemIdx < maNumItems.size(); ++nNumItemIdx ) { @@ -877,7 +877,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) // #i83479# else if ( nTypeId == REFFLDFLAG_HEADING ) { - SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); + SvTreeListEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); OSL_ENSURE( pEntry, "<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" ); if ( pEntry ) @@ -897,7 +897,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) } else if ( nTypeId == REFFLDFLAG_NUMITEM ) { - SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); + SvTreeListEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); OSL_ENSURE( pEntry, "<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" ); if ( pEntry ) diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index c7f6042c6e47..3395075623a3 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -72,7 +72,7 @@ class SwChangeDBDlg: public SvxStandardDialog virtual void Apply(); void UpdateFlds(); void FillDBPopup(); - SvLBoxEntry* Insert(const String& rDBName); + SvTreeListEntry* Insert(const String& rDBName); void ShowDBName(const SwDBData& rDBData); public: diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 5725a5df0826..29445acf584d 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -110,7 +110,7 @@ class SwContentTree : public SvTreeListBox protected: virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); virtual void DataChanged( const DataChangedEvent& rDCEvt ); SwNavigationPI* GetParentWindow(){return @@ -127,22 +127,22 @@ protected: sal_Bool HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); - void EditEntry( SvLBoxEntry* pEntry, sal_uInt8 nMode ); + void EditEntry( SvTreeListEntry* pEntry, sal_uInt8 nMode ); void GotoContent(SwContent* pCnt); static void SetInDrag(sal_Bool bSet) {bIsInDrag = bSet;} @@ -179,9 +179,9 @@ public: sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_uInt8 nSet); - sal_Bool Expand( SvLBoxEntry* pParent ); + sal_Bool Expand( SvTreeListEntry* pParent ); - sal_Bool Collapse( SvLBoxEntry* pParent ); + sal_Bool Collapse( SvTreeListEntry* pParent ); void ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier); @@ -198,12 +198,12 @@ public: DECL_LINK( ContentDoubleClickHdl, void * ); DECL_LINK( TimerUpdate, void * ); - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual void GetFocus(); virtual void KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); }; @@ -215,13 +215,13 @@ class SwLBoxString : public SvLBoxString { public: - SwLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + SwLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) { } virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); }; namespace sfx2 { class DocumentInserter; } @@ -236,8 +236,8 @@ private: ImageList aEntryImages; SwWrtShell* pActiveShell; // - SvLBoxEntry* pEmphasisEntry; // Drag'n Drop emphasis - SvLBoxEntry* pDDSource; // source for Drag'n Drop + SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis + SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content Window* pDefParentWin; @@ -269,30 +269,30 @@ protected: virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual void DragFinished( sal_Int8 ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput(const KeyEvent& rKEvt); virtual void GetFocus(); virtual void SelectHdl(); virtual void DeselectHdl(); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); void Clear(); diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx index fdcaf5368259..f4e060d13697 100644 --- a/sw/source/ui/inc/dbtree.hxx +++ b/sw/source/ui/inc/dbtree.hxx @@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* ); SW_DLLPRIVATE void InitTreeList(); - SW_DLLPRIVATE virtual void RequestingChildren( SvLBoxEntry* pParent ); + SW_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ); SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index c707f46e25e6..5a4b26284dff 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -63,20 +63,20 @@ class SwGlTreeListBox : public SvTreeListBox { const String sReadonly; - SvLBoxEntry* pDragEntry; + SvTreeListEntry* pDragEntry; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rContainer, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos); public: SwGlTreeListBox(Window* pParent, const ResId& rResId); @@ -148,7 +148,7 @@ class SwGlossaryDlg : public SvxStandardDialog virtual void Apply(); void Init(); - SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort); + SvTreeListEntry* DoesBlockExist(const String& sBlock, const String& rShort); void ShowAutoText(const String& rGroup, const String& rShortName); void ResumeShowAutoText(); diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 908aa53b97ef..162bf6e95457 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -32,7 +32,7 @@ #include <caption.hxx> class SwFldMgr; -class SvLBoxEntry; +class SvTreeListEntry; class SwWrtShell; class SwLoadOptPage : public SfxTabPage @@ -171,7 +171,7 @@ private: void SetOptions( const sal_uInt16 nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0); - void SaveEntry( SvLBoxEntry* pEntry ); + void SaveEntry( SvTreeListEntry* pEntry ); void DrawSample(); public: diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index c90a0edf0e18..6a47e80053c7 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -47,14 +47,14 @@ struct SwRedlineDataChild { const SwRedlineData* pChild; // link to original stacked data const SwRedlineDataChild* pNext; // link to stacked data - SvLBoxEntry* pTLBChild; // corresponding TreeListBox entry + SvTreeListEntry* pTLBChild; // corresponding TreeListBox entry }; struct SwRedlineDataParent { const SwRedlineData* pData; // RedlineDataPtr const SwRedlineDataChild* pNext; // link to stacked data - SvLBoxEntry* pTLBParent; // corresponding TreeListBox entry + SvTreeListEntry* pTLBParent; // corresponding TreeListBox entry String sComment; // redline comment inline sal_Bool operator==( const SwRedlineDataParent& rObj ) const @@ -72,7 +72,7 @@ typedef SwRedlineDataChild* SwRedlineDataChildPtr; typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr; -typedef SvLBoxEntry* SvLBoxEntryPtr; +typedef SvTreeListEntry* SvLBoxEntryPtr; typedef std::vector<SvLBoxEntryPtr> SvLBoxEntryArr; class SW_DLLPUBLIC SwRedlineAcceptDlg @@ -122,7 +122,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0); SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, sal_uInt16 nStack = 0); - SW_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvLBoxEntry& rEntry) const; + SW_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvTreeListEntry& rEntry) const; public: SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt = sal_False); diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index 8fce92f63ed1..37193e4cda4f 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -119,7 +119,7 @@ class SwEditRegionDlg : public SfxModalDialog Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden); - void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry); + void RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry); sal_uInt16 FindArrPos(const SwSectionFmt* pFmt); DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5bf5fc9e1497..d47939182d82 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -590,11 +590,11 @@ public: SvTreeListBox(pWin, rResId), pHeaderBar(0){} virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); void SetHeaderBar(const HeaderBar* pHB) {pHeaderBar = pHB;} }; -long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) +long SwIndexTreeLB::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab) { long nData = (long)pEntry->GetUserData(); if(nData != USHRT_MAX) @@ -610,7 +610,7 @@ long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); KeyCode aCode = rKEvt.GetKeyCode(); sal_Bool bChanged = sal_False; if(pEntry) @@ -749,7 +749,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, for(sal_uInt16 nToken = 0; nToken < comphelper::string::getTokenCount(sStyles, TOX_STYLE_DELIMITER); nToken++) { String sTmp(sStyles.GetToken(nToken, TOX_STYLE_DELIMITER)); - SvLBoxEntry* pEntry = rTLB.InsertEntry(sTmp); + SvTreeListEntry* pEntry = rTLB.InsertEntry(sTmp); pEntry->SetUserData(reinterpret_cast<void*>(i)); } } @@ -768,7 +768,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, if(rName.Len() > 0) { - SvLBoxEntry* pEntry = rTLB.First(); + SvTreeListEntry* pEntry = rTLB.First(); sal_Bool bFound = sal_False; while(pEntry && !bFound) { @@ -795,7 +795,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl) pStyleArr[i].Erase(); SwIndexTreeLB& rTLB = aHeaderTree.GetTreeListBox(); - SvLBoxEntry* pEntry = rTLB.First(); + SvTreeListEntry* pEntry = rTLB.First(); while(pEntry) { long nLevel = (long)pEntry->GetUserData(); @@ -823,7 +823,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl) IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) { sal_Bool bLeft = pBtn == &aLeftPB; - SvLBoxEntry* pEntry = aHeaderTree.GetTreeListBox().FirstSelected(); + SvTreeListEntry* pEntry = aHeaderTree.GetTreeListBox().FirstSelected(); if(pEntry) { long nLevel = (long)pEntry->GetUserData(); @@ -1802,7 +1802,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { sal_uInt16 nLevel = static_cast< sal_uInt16 >(GetModel()->GetAbsPos(pEntry)); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index fce09987c2de..b0cb52534d0e 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -114,7 +114,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, sTemp += '\t'; pData->sPath = aPathLB.GetEntry((sal_uInt16)sGroup.GetToken(1, GLOS_DELIM).ToInt32()); sTemp += pData->sPath; - SvLBoxEntry* pEntry = aGroupTLB.InsertEntry(sTemp); + SvTreeListEntry* pEntry = aGroupTLB.InsertEntry(sTemp); pEntry->SetUserData(pData); } @@ -142,7 +142,7 @@ void SwGlossaryGroupDlg::Apply() //when the current group is deleted, the current group has to be relocated if(aGroupTLB.GetEntryCount()) { - SvLBoxEntry* pFirst = aGroupTLB.First(); + SvTreeListEntry* pFirst = aGroupTLB.First(); GlosBibUserData* pUserData = (GlosBibUserData*)pFirst->GetUserData(); pGlosHdl->SetCurGroup(pUserData->sGroupName); } @@ -192,7 +192,7 @@ void SwGlossaryGroupDlg::Apply() IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) { aNewPB.Enable(sal_False); - SvLBoxEntry* pFirstEntry = aGroupTLB.FirstSelected(); + SvTreeListEntry* pFirstEntry = aGroupTLB.FirstSelected(); if(pFirstEntry) { GlosBibUserData* pUserData = (GlosBibUserData*)pFirstEntry->GetUserData(); @@ -202,7 +202,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) sal_uLong nPos = aGroupTLB.GetEntryPos(sName, 0); if( 0xffffffff > nPos) { - SvLBoxEntry* pEntry = aGroupTLB.GetEntry(nPos); + SvTreeListEntry* pEntry = aGroupTLB.GetEntry(nPos); GlosBibUserData* pFoundData = (GlosBibUserData*)pEntry->GetUserData(); String sGroup = pFoundData->sGroupName; bExists = sGroup == sEntry; @@ -224,7 +224,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl) String sTemp(aNameED.GetText()); sTemp += '\t'; sTemp += aPathLB.GetSelectEntry(); - SvLBoxEntry* pEntry = aGroupTLB.InsertEntry(sTemp); + SvTreeListEntry* pEntry = aGroupTLB.InsertEntry(sTemp); GlosBibUserData* pData = new GlosBibUserData; pData->sPath = aPathLB.GetSelectEntry(); pData->sGroupName = sGroup; @@ -239,7 +239,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl) IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) { - SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); + SvTreeListEntry* pEntry = aGroupTLB.FirstSelected(); if(!pEntry) { pButton->Enable(sal_False); @@ -293,7 +293,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) { - SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); + SvTreeListEntry* pEntry = aGroupTLB.FirstSelected(); GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); String sEntryText(aGroupTLB.GetEntryText(pEntry)); String sEntry(pUserData->sGroupName); @@ -385,7 +385,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl) aGroupTLB.MakeVisible(aGroupTLB.GetEntry( nPos )); } } - SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); + SvTreeListEntry* pEntry = aGroupTLB.FirstSelected(); if(pEntry) { GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); @@ -432,7 +432,7 @@ void FEdit::KeyInput( const KeyEvent& rKEvent ) void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if(pEntry) { SvLBoxTab* pTab; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 7448a13f09ed..e59447e5a603 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -299,10 +299,10 @@ SwGlossaryDlg::~SwGlossaryDlg() ------------------------------------------------------------------------*/ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) { - SvLBoxEntry* pEntry = pBox->FirstSelected(); + SvTreeListEntry* pEntry = pBox->FirstSelected(); if(!pEntry) return 0; - SvLBoxEntry* pParent = pBox->GetParent(pEntry) ? pBox->GetParent(pEntry) : pEntry; + SvTreeListEntry* pParent = pBox->GetParent(pEntry) ? pBox->GetParent(pEntry) : pEntry; GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData(); String *pGlosGroup = ::GetCurrGlosGroup(); (*pGlosGroup) = pGroupData->sGroupName; @@ -366,11 +366,11 @@ void SwGlossaryDlg::Apply() /* -------------------------------------------------- * does the title exist in the selected group? * --------------------------------------------------*/ -SvLBoxEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock, +SvTreeListEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock, const String& rShort) { // look for possible entry in TreeListBox - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); if(pEntry) { if(aCategoryBox.GetParent(pEntry)) @@ -378,7 +378,7 @@ SvLBoxEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock, sal_uInt32 nChildCount = aCategoryBox.GetChildCount( pEntry ); for(sal_uInt32 i = 0; i < nChildCount; i++) { - SvLBoxEntry* pChild = aCategoryBox.GetEntry( pEntry, i ); + SvTreeListEntry* pChild = aCategoryBox.GetEntry( pEntry, i ); if(rBlock == aCategoryBox.GetEntryText(pChild) && (!rShort.Len() || rShort == *(String*)pChild->GetUserData())) { @@ -434,7 +434,7 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit ) IMPL_LINK_INLINE_START( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) { - SvLBoxEntry* pEntry = pBox->FirstSelected(); + SvTreeListEntry* pEntry = pBox->FirstSelected(); if(pBox->GetParent(pEntry) && !bIsDocReadOnly) EndDialog( RET_OK ); return 0; @@ -443,7 +443,7 @@ IMPL_LINK_INLINE_END( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn ) { - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); const String aEditText(aNameED.GetText()); const sal_Bool bHasEntry = aEditText.Len() && aShortNameEdit.GetText().Len(); @@ -492,11 +492,11 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) } if(pGlossaryHdl->NewGlossary(aStr, aShortName, sal_False, bNoAttr )) { - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); if(aCategoryBox.GetParent(pEntry)) pEntry = aCategoryBox.GetParent(pEntry); - SvLBoxEntry* pChild = aCategoryBox.InsertEntry(aStr, pEntry); + SvTreeListEntry* pChild = aCategoryBox.InsertEntry(aStr, pEntry); pChild->SetUserData(new String(aShortName)); aNameED.SetText(aStr); aShortNameEdit.SetText(aShortName); @@ -534,8 +534,8 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) pNewNameDlg->GetNewShort(), pNewNameDlg->GetNewName())) { - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); - SvLBoxEntry* pNewEntry = aCategoryBox.InsertEntry( + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pNewEntry = aCategoryBox.InsertEntry( pNewNameDlg->GetNewName(), aCategoryBox.GetParent(pEntry)); pNewEntry->SetUserData(new String(pNewNameDlg->GetNewShort())); delete (String*)pEntry->GetUserData(); @@ -556,9 +556,9 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) const String aTitle(aNameED.GetText()); if(aTitle.Len() && pGlossaryHdl->DelGlossary(aShortName)) { - SvLBoxEntry* pChild = DoesBlockExist(aTitle, aShortName); + SvTreeListEntry* pChild = DoesBlockExist(aTitle, aShortName); OSL_ENSURE(pChild, "entry not found!"); - SvLBoxEntry* pParent = aCategoryBox.GetParent(pChild); + SvTreeListEntry* pParent = aCategoryBox.GetParent(pChild); aCategoryBox.Select(pParent); aCategoryBox.GetModel()->Remove(pChild); @@ -691,7 +691,7 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) Init(); //if new groups were created - select one of them String sNewGroup = pDlg->GetCreatedGroupName(); - SvLBoxEntry* pEntry = aCategoryBox.First(); + SvTreeListEntry* pEntry = aCategoryBox.First(); while(sNewGroup.Len() && pEntry) { if(!aCategoryBox.GetParent(pEntry)) @@ -733,7 +733,7 @@ void SwGlossaryDlg::Init() aCategoryBox.Clear(); // display text block regions const sal_uInt16 nCnt = pGlossaryHdl->GetGroupCnt(); - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; const String sSelStr(::GetCurrGlosGroup()->GetToken(0, GLOS_DELIM)); const sal_uInt16 nSelPath = static_cast< sal_uInt16 >(::GetCurrGlosGroup()->GetToken(1, GLOS_DELIM).ToInt32()); // #i66304# - "My AutoText" comes from mytexts.bau, but should be translated @@ -749,7 +749,7 @@ void SwGlossaryDlg::Init() sTitle = sGroupName.GetToken( 0, GLOS_DELIM ); if(sTitle == sMyAutoTextEnglish) sTitle = sMyAutoTextTranslated; - SvLBoxEntry* pEntry = aCategoryBox.InsertEntry( sTitle ); + SvTreeListEntry* pEntry = aCategoryBox.InsertEntry( sTitle ); sal_uInt16 nPath = static_cast< sal_uInt16 >(sGroupName.GetToken( 1, GLOS_DELIM ).ToInt32()); GroupUserData* pData = new GroupUserData; @@ -768,7 +768,7 @@ void SwGlossaryDlg::Init() for(sal_uInt16 i = 0; i < nCount; ++i) { String sGroupTitle(pGlossaryHdl->GetGlossaryName(i)); - SvLBoxEntry* pChild = aCategoryBox.InsertEntry( + SvTreeListEntry* pChild = aCategoryBox.InsertEntry( sGroupTitle, pEntry); pChild->SetUserData(new String(pGlossaryHdl->GetGlossaryShortName(i))); } @@ -778,7 +778,7 @@ void SwGlossaryDlg::Init() if(!pSelEntry) { //find a non-readonly group - SvLBoxEntry* pSearch = aCategoryBox.First(); + SvTreeListEntry* pSearch = aCategoryBox.First(); while(pSearch) { if(!aCategoryBox.GetParent(pSearch)) @@ -896,7 +896,7 @@ SwGlTreeListBox::SwGlTreeListBox(Window* pParent, const ResId& rResId) : void SwGlTreeListBox::Clear() { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while(pEntry) { if(GetParent(pEntry)) @@ -911,7 +911,7 @@ void SwGlTreeListBox::Clear() void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); // there's only help for groups' names if(pEntry) { @@ -962,7 +962,7 @@ void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt ) DragDropMode SwGlTreeListBox::NotifyStartDrag( TransferDataContainer& /*rContainer*/, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { DragDropMode eRet; pDragEntry = pEntry; @@ -971,7 +971,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag( else { SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent(); - SvLBoxEntry* pParent = GetParent(pEntry); + SvTreeListEntry* pParent = GetParent(pEntry); GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData(); String sEntry(pGroupData->sGroupName); @@ -989,19 +989,19 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag( return eRet; } -sal_Bool SwGlTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry) +sal_Bool SwGlTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry) { // TODO: Readonly - check still missing! - SvLBoxEntry* pSrcParent = GetParent(pEntry) ? GetParent(pEntry) : pEntry; - SvLBoxEntry* pDestParent = + SvTreeListEntry* pSrcParent = GetParent(pEntry) ? GetParent(pEntry) : pEntry; + SvTreeListEntry* pDestParent = GetParent(pDragEntry ) ? GetParent(pDragEntry ) : pDragEntry ; return pDestParent != pSrcParent; } -sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& /*rpNewParent*/, +sal_Bool SwGlTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& /*rpNewParent*/, sal_uLong& /*rNewChildPos*/ ) { @@ -1012,8 +1012,8 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, } // 1. move to different groups? // 2. allowed to write in both groups? - SvLBoxEntry* pSrcParent = GetParent(pEntry); - SvLBoxEntry* pDestParent = + SvTreeListEntry* pSrcParent = GetParent(pEntry); + SvTreeListEntry* pDestParent = GetParent(pTarget) ? GetParent(pTarget) : pTarget; sal_Bool bRet = sal_False; if(pDestParent != pSrcParent) @@ -1037,7 +1037,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, sDestName, sTitle, sal_True ); if(bRet) { - SvLBoxEntry* pChild = InsertEntry(sTitle, pDestParent); + SvTreeListEntry* pChild = InsertEntry(sTitle, pDestParent); pChild->SetUserData(new String(sShortName)); GetModel()->Remove(pEntry); } @@ -1045,9 +1045,9 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, return sal_False; // otherwise the entry is being set automatically } -sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& /*rpNewParent*/, +sal_Bool SwGlTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& /*rpNewParent*/, sal_uLong& /*rNewChildPos*/ ) { @@ -1058,8 +1058,8 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, { pTarget = GetEntry(0); } - SvLBoxEntry* pSrcParent = GetParent(pEntry); - SvLBoxEntry* pDestParent = + SvTreeListEntry* pSrcParent = GetParent(pEntry); + SvTreeListEntry* pDestParent = GetParent(pTarget) ? GetParent(pTarget) : pTarget; sal_Bool bRet = sal_False; if(pDestParent != pSrcParent) @@ -1085,7 +1085,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, sDestName, sTitle, sal_False ); if(bRet) { - SvLBoxEntry* pChild = InsertEntry(sTitle, pDestParent); + SvTreeListEntry* pChild = InsertEntry(sTitle, pDestParent); pChild->SetUserData(new String(sShortName)); } } @@ -1094,7 +1094,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, String SwGlossaryDlg::GetCurrGrpName() const { - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); String sRet; if(pEntry) { diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index ebf8dea60323..22fa068ea84e 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -271,7 +271,7 @@ void SwRedlineAcceptDlg::Init(sal_uInt16 nStart) pTable->SetUpdateMode(sal_True); // #i69618# this moves the list box to the right position, visually - SvLBoxEntry* pSelEntry = pTable->FirstSelected(); + SvTreeListEntry* pSelEntry = pTable->FirstSelected(); if( pSelEntry ) pTable->MakeVisible( pSelEntry, sal_True ); //#i70937#, force the scroll } @@ -323,7 +323,7 @@ void SwRedlineAcceptDlg::InitAuthors() sal_Bool bEnable = pTable->GetEntryCount() != 0 && !pSh->getIDocumentRedlineAccess()->GetRedlinePassword().getLength(); sal_Bool bSel = pTable->FirstSelected() != 0; - SvLBoxEntry* pSelEntry = pTable->FirstSelected(); + SvTreeListEntry* pSelEntry = pTable->FirstSelected(); while (pSelEntry) { sal_uInt16 nPos = GetRedlinePos(*pSelEntry); @@ -628,7 +628,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRe pData->bDisabled = sal_True; sChild = GetRedlineText(rRedln, pData->aDateTime, nStack); - SvLBoxEntry* pChild = pTable->InsertEntry(sChild, pData, pParent->pTLBParent); + SvTreeListEntry* pChild = pTable->InsertEntry(sChild, pData, pParent->pTLBParent); pRedlineChild->pTLBChild = pChild; if (!bValidParent) @@ -668,7 +668,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd) // set the cursor after the last entry because otherwise performance problem in TLB. // TLB would otherwise reset the cursor at every Remove (expensive) sal_uInt16 nPos = Min((sal_uInt16)nCount, (sal_uInt16)aRedlineParents.size()); - SvLBoxEntry *pCurEntry = NULL; + SvTreeListEntry *pCurEntry = NULL; while( ( pCurEntry == NULL ) && ( nPos > 0 ) ) { --nPos; @@ -701,7 +701,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd) break; } } - SvLBoxEntry *pEntry = aRedlineParents[i].pTLBParent; + SvTreeListEntry *pEntry = aRedlineParents[i].pTLBParent; if (pEntry) { long nIdx = aLBoxArr.size() - 1L; @@ -740,7 +740,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd) return; // no redlines in the document RedlinData *pData; - SvLBoxEntry *pParent; + SvTreeListEntry *pParent; SwRedlineDataParent* pRedlineParent; const SwRedline* pCurrRedline; if( !nStart && !pTable->FirstSelected() ) @@ -792,10 +792,10 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd) void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); - SvLBoxEntry* pEntry = bSelect ? pTable->FirstSelected() : pTable->First(); + SvTreeListEntry* pEntry = bSelect ? pTable->FirstSelected() : pTable->First(); sal_uLong nPos = LONG_MAX; - typedef std::vector<SvLBoxEntry*> ListBoxEntries_t; + typedef std::vector<SvTreeListEntry*> ListBoxEntries_t; ListBoxEntries_t aRedlines; // don't activate @@ -888,7 +888,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ) pTPView->EnableUndo(); } -sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvLBoxEntry& rEntry ) const +sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvTreeListEntry& rEntry ) const { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); return pSh->FindRedlineOfData( *((SwRedlineDataParent*)((RedlinData *) @@ -973,14 +973,14 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl) //#107938# But not only ask pTable if it has the focus. To move // the selection to the selected redline any child of pParentDlg // may the focus. - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; if (pParentDlg->HasChildPathFocus()) pSelEntry = pTable->FirstSelected(); if( pSelEntry ) { - SvLBoxEntry* pActEntry = pSelEntry; + SvTreeListEntry* pActEntry = pSelEntry; pSh->StartAction(); pSh->EnterStdMode(); pSh->SetCareWin(pParentDlg); @@ -1039,12 +1039,12 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) case COMMAND_CONTEXTMENU: { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); - SvLBoxEntry* pEntry = pTable->FirstSelected(); + SvTreeListEntry* pEntry = pTable->FirstSelected(); const SwRedline *pRed = 0; if (pEntry) { - SvLBoxEntry* pTopEntry = pEntry; + SvTreeListEntry* pTopEntry = pEntry; if (pTable->GetParent(pEntry)) pTopEntry = pTable->GetParent(pEntry); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 980b3f87c846..fdf845e8397a 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -116,12 +116,12 @@ sal_Bool SwContentTree::bIsInDrag = sal_False; namespace { - static sal_Bool lcl_IsContent(SvLBoxEntry* pEntry) + static sal_Bool lcl_IsContent(SvTreeListEntry* pEntry) { return ((SwTypeNumber*)pEntry->GetUserData())->GetTypeId() == CTYPE_CNT; } - static sal_Bool lcl_IsContentType(SvLBoxEntry* pEntry) + static sal_Bool lcl_IsContentType(SvTreeListEntry* pEntry) { return ((SwTypeNumber*)pEntry->GetUserData())->GetTypeId() == CTYPE_CTT; } @@ -941,7 +941,7 @@ static void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - SvLBoxEntry* pEntry = pTargetEntry; + SvTreeListEntry* pEntry = pTargetEntry; if( pEntry && ( nRootType == CONTENT_TYPE_OUTLINE ) && lcl_IsContent( pEntry ) ) { SwOutlineContent* pOutlineContent = ( SwOutlineContent* )( pEntry->GetUserData() ); @@ -952,7 +952,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { while( pEntry->HasChildren() ) { - SvLBoxEntry* pChildEntry = FirstChild( pEntry ); + SvTreeListEntry* pChildEntry = FirstChild( pEntry ); while( pChildEntry ) { pEntry = pChildEntry; @@ -1030,7 +1030,7 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) pPop->InsertItem(2, aContextStrings[ST_DRAGMODE - ST_CONTEXT_FIRST]); pPop->InsertItem(3, aContextStrings[ST_DISPLAY - ST_CONTEXT_FIRST]); //jetzt noch bearbeiten - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; //Bearbeiten nur, wenn die angezeigten Inhalte aus der aktiven View kommen if((bIsActive || pActiveShell == pActiveView->GetWrtShellPtr()) && 0 != (pEntry = FirstSelected()) && lcl_IsContent(pEntry)) @@ -1137,7 +1137,7 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) /*************************************************************************** Beschreibung: Einrueckung fuer outlines (und sections) ***************************************************************************/ -long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) +long SwContentTree::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab) { sal_uInt16 nLevel = 0; if(lcl_IsContent(pEntry)) @@ -1160,7 +1160,7 @@ long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) /*************************************************************************** Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt ***************************************************************************/ -void SwContentTree::RequestingChildren( SvLBoxEntry* pParent ) +void SwContentTree::RequestingChildren( SvTreeListEntry* pParent ) { // ist es ein Inhaltstyp? if(lcl_IsContentType(pParent)) @@ -1176,7 +1176,7 @@ void SwContentTree::RequestingChildren( SvLBoxEntry* pParent ) ***************************************************************/ if(pCntType->GetType() == CONTENT_TYPE_OUTLINE) { - SvLBoxEntry* pChild = 0; + SvTreeListEntry* pChild = 0; for(sal_uInt16 i = 0; i < nCount; i++) { const SwContent* pCnt = pCntType->GetMember(i); @@ -1236,7 +1236,7 @@ void SwContentTree::RequestingChildren( SvLBoxEntry* pParent ) /*************************************************************************** Beschreibung: Expand - Zustand fuer Inhaltstypen merken ***************************************************************************/ -sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) +sal_Bool SwContentTree::Expand( SvTreeListEntry* pParent ) { if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) || (nRootType == CONTENT_TYPE_OUTLINE)) @@ -1258,7 +1258,7 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) SwWrtShell* pShell = GetWrtShell(); sal_Bool bBool = SvTreeListBox::Expand(pParent); - SvLBoxEntry* pChild = Next(pParent); + SvTreeListEntry* pChild = Next(pParent); while(pChild && lcl_IsContent(pChild) && pParent->HasChildren()) { if(pChild->HasChildren()) @@ -1294,7 +1294,7 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) /*************************************************************************** Beschreibung: Collapse - Zustand fuer Inhaltstypen merken ***************************************************************************/ -sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) +sal_Bool SwContentTree::Collapse( SvTreeListEntry* pParent ) { sal_Bool bRet; if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) || @@ -1334,7 +1334,7 @@ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) ***************************************************************************/ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); // ist es ein Inhaltstyp? OSL_ENSURE(pEntry, "no current entry!"); if(pEntry) @@ -1370,7 +1370,7 @@ void SwContentTree::Display( sal_Bool bActive ) } // erst den selektierten Eintrag auslesen, um ihn spaeter evtl. wieder // zu selektieren -> die UserDaten sind hier nicht mehr gueltig! - SvLBoxEntry* pOldSelEntry = FirstSelected(); + SvTreeListEntry* pOldSelEntry = FirstSelected(); String sEntryName; // Name des Eintrags sal_uInt16 nEntryRelPos = 0; // rel. Pos zu seinem Parent sal_uInt32 nOldEntryCount = GetEntryCount(); @@ -1382,7 +1382,7 @@ void SwContentTree::Display( sal_Bool bActive ) nOldScrollPos = pVScroll->GetThumbPos(); sEntryName = GetEntryText(pOldSelEntry); - SvLBoxEntry* pParantEntry = pOldSelEntry; + SvTreeListEntry* pParantEntry = pOldSelEntry; while( GetParent(pParantEntry)) { pParantEntry = GetParent(pParantEntry); @@ -1412,7 +1412,7 @@ void SwContentTree::Display( sal_Bool bActive ) } if(pShell) { - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; if(nRootType == USHRT_MAX) { for(sal_uInt16 nCntType = CONTENT_TYPE_OUTLINE; @@ -1425,7 +1425,7 @@ void SwContentTree::Display( sal_Bool bActive ) (*ppContentT) = new SwContentType(pShell, nCntType, nOutlineLevel ); String sEntry = (*ppContentT)->GetName(); - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; const Image& rImage = aEntryImages.GetImage(SID_SW_START + nCntType); sal_Bool bChOnDemand = 0 != (*ppContentT)->GetMemberCount(); pEntry = InsertEntry(sEntry, rImage, rImage, @@ -1441,8 +1441,8 @@ void SwContentTree::Display( sal_Bool bActive ) if(nEntryRelPos && nCntType == nLastSelType) { // jetzt vielleicht noch ein Child selektieren - SvLBoxEntry* pChild = pEntry; - SvLBoxEntry* pTemp = 0; + SvTreeListEntry* pChild = pEntry; + SvTreeListEntry* pTemp = 0; sal_uInt16 nPos = 1; while(0 != (pChild = Next(pChild))) { @@ -1478,7 +1478,7 @@ void SwContentTree::Display( sal_Bool bActive ) if(!(*ppRootContentT)) (*ppRootContentT) = new SwContentType(pShell, nRootType, nOutlineLevel ); const Image& rImage = aEntryImages.GetImage(20000 + nRootType); - SvLBoxEntry* pParent = InsertEntry( + SvTreeListEntry* pParent = InsertEntry( (*ppRootContentT)->GetName(), rImage, rImage, 0, sal_False, LIST_APPEND, *ppRootContentT); @@ -1504,7 +1504,7 @@ void SwContentTree::Display( sal_Bool bActive ) { //feststellen, wo der Cursor steht const sal_uInt16 nActPos = pShell->GetOutlinePos(MAXLEVEL); - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while( 0 != (pEntry = Next(pEntry)) ) { @@ -1519,8 +1519,8 @@ void SwContentTree::Display( sal_Bool bActive ) else { // jetzt vielleicht noch ein Child selektieren - SvLBoxEntry* pChild = pParent; - SvLBoxEntry* pTemp = 0; + SvTreeListEntry* pChild = pParent; + SvTreeListEntry* pTemp = 0; sal_uInt16 nPos = 1; while(0 != (pChild = Next(pChild))) { @@ -1571,7 +1571,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, { SwWrtShell* pWrtShell = GetWrtShell(); OSL_ENSURE(pWrtShell, "no Shell!"); - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if(!pEntry || lcl_IsContentType(pEntry) || !pWrtShell) return sal_False; String sEntry; @@ -1713,7 +1713,7 @@ sal_Bool SwContentTree::ToggleToRoot() { if(!bIsRoot) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); const SwContentType* pCntType; if(pEntry) { @@ -1770,7 +1770,7 @@ sal_Bool SwContentTree::HasContentChanged() else if(bIsRoot) { sal_Bool bOutline = sal_False; - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); if(!pEntry) bRepaint = sal_True; else @@ -1784,7 +1784,7 @@ sal_Bool SwContentTree::HasContentChanged() { sal_uInt16 nSelLevel = USHRT_MAX; - SvLBoxEntry* pFirstSel; + SvTreeListEntry* pFirstSel; if(bOutline && 0 != ( pFirstSel = FirstSelected()) && lcl_IsContent(pFirstSel)) @@ -1824,7 +1824,7 @@ sal_Bool SwContentTree::HasContentChanged() { //feststellen, wo der Cursor steht const sal_uInt16 nActPos = GetWrtShell()->GetOutlinePos(MAXLEVEL); - SvLBoxEntry* pFirstEntry = First(); + SvTreeListEntry* pFirstEntry = First(); while( 0 != (pFirstEntry = Next(pFirstEntry)) ) { @@ -1843,7 +1843,7 @@ sal_Bool SwContentTree::HasContentChanged() } else { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { sal_Bool bNext = sal_True; // mindestens ein Next muss sein @@ -1906,7 +1906,7 @@ sal_Bool SwContentTree::HasContentChanged() } else { - SvLBoxEntry* pChild = FirstChild(pEntry); + SvTreeListEntry* pChild = FirstChild(pEntry); for(sal_uInt16 j = 0; j < nChildCount; j++) { const SwContent* pCnt = pArrType->GetMember(j); @@ -1920,8 +1920,8 @@ sal_Bool SwContentTree::HasContentChanged() } if(bRemoveChildren) { - SvLBoxEntry* pChild = FirstChild(pEntry); - SvLBoxEntry* pRemove = pChild; + SvTreeListEntry* pChild = FirstChild(pEntry); + SvTreeListEntry* pRemove = pChild; for(sal_uInt16 j = 0; j < nChildCount; j++) { pChild = Next(pRemove); @@ -1962,12 +1962,12 @@ sal_Bool SwContentTree::HasContentChanged() ***************************************************************************/ void SwContentTree::FindActiveTypeAndRemoveUserData() { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if(pEntry) { // wird Clear ueber TimerUpdate gerufen, kann nur fuer die Root // die Gueltigkeit der UserData garantiert werden - SvLBoxEntry* pParent; + SvTreeListEntry* pParent; while(0 != (pParent = GetParent(pEntry))) pEntry = pParent; if(pEntry->GetUserData() && lcl_IsContentType(pEntry)) @@ -2071,7 +2071,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) SwWrtShell* pShell = GetWrtShell(); sal_Int8 nActOutlineLevel = nOutlineLevel; sal_uInt16 nActPos = pShell->GetOutlinePos(nActOutlineLevel); - SvLBoxEntry* pFirstEntry = FirstSelected(); + SvTreeListEntry* pFirstEntry = FirstSelected(); if (pFirstEntry && lcl_IsContent(pFirstEntry)) { if ( (bIsRoot && nRootType == CONTENT_TYPE_OUTLINE) || @@ -2102,7 +2102,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) else if(bModifier) { sal_uInt16 nActEndPos = nActPos; - SvLBoxEntry* pEntry = pFirstEntry; + SvTreeListEntry* pEntry = pFirstEntry; sal_uInt16 nActLevel = ((SwOutlineContent*) pFirstEntry->GetUserData())->GetOutlineLevel(); pEntry = Next(pEntry); @@ -2192,7 +2192,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) if(!bIsRoot) { const sal_uInt16 nCurrPos = pShell->GetOutlinePos(MAXLEVEL); - SvLBoxEntry* pFirst = First(); + SvTreeListEntry* pFirst = First(); while( 0 != (pFirst = Next(pFirst)) && lcl_IsContent(pFirst)) { @@ -2265,7 +2265,7 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate) DragDropMode SwContentTree::NotifyStartDrag( TransferDataContainer& rContainer, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { DragDropMode eMode = (DragDropMode)0; if( bIsActive && nRootType == CONTENT_TYPE_OUTLINE && @@ -2286,8 +2286,8 @@ DragDropMode SwContentTree::NotifyStartDrag( Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t Children verschoben ***************************************************************************/ -sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, SvLBoxEntry*& , sal_uLong& ) +sal_Bool SwContentTree::NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, SvTreeListEntry*& , sal_uLong& ) { if(!bDocChgdInDragging) { @@ -2300,7 +2300,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt nTargetPos != USHRT_MAX) { - SvLBoxEntry* pNext = Next(pTarget); + SvTreeListEntry* pNext = Next(pTarget); if(pNext) nTargetPos = (( SwOutlineContent* )pNext->GetUserData())->GetPos() -1; else @@ -2325,8 +2325,8 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e Children verschoben ***************************************************************************/ -sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, SvLBoxEntry*& , sal_uLong& ) +sal_Bool SwContentTree::NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, SvTreeListEntry*& , sal_uLong& ) { if(!bDocChgdInDragging) { @@ -2340,7 +2340,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt nTargetPos != USHRT_MAX) { - SvLBoxEntry* pNext = Next(pTarget); + SvTreeListEntry* pNext = Next(pTarget); if(pNext) nTargetPos = (( SwOutlineContent* )pNext->GetUserData())->GetPos() - 1; else @@ -2362,7 +2362,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, /*************************************************************************** Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType ***************************************************************************/ -sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) +sal_Bool SwContentTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) { return pEntry != 0; } @@ -2374,7 +2374,7 @@ sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt ) { Point aPos( rMEvt.GetPosPixel()); - SvLBoxEntry* pEntry = GetEntry( aPos, sal_True ); + SvTreeListEntry* pEntry = GetEntry( aPos, sal_True ); if( !pEntry && rMEvt.IsLeft() && rMEvt.IsMod1() && (rMEvt.GetClicks() % 2) == 0) Control::MouseButtonDown( rMEvt ); else @@ -2413,7 +2413,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) const KeyCode aCode = rEvent.GetKeyCode(); if(aCode.GetCode() == KEY_RETURN) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if ( pEntry ) { switch(aCode.GetModifier()) @@ -2441,7 +2441,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) } else if(aCode.GetCode() == KEY_DELETE && 0 == aCode.GetModifier()) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if(pEntry && lcl_IsContent(pEntry) && ((SwContent*)pEntry->GetUserData())->GetParent()->IsDeletable() && @@ -2465,7 +2465,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { sal_uInt16 nType; @@ -2576,7 +2576,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) void SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { - SvLBoxEntry* pFirst = FirstSelected(); + SvTreeListEntry* pFirst = FirstSelected(); switch( nSelectedPopupEntry ) { //Outlinelevel @@ -2707,12 +2707,12 @@ void SwContentTree::ShowActualView() Beschreibung: Hier sollen die Buttons zum Verschieben von Outlines en-/disabled werden ***************************************************************************/ -sal_Bool SwContentTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) +sal_Bool SwContentTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { if(!pEntry) return sal_False; sal_Bool bEnable = sal_False; - SvLBoxEntry* pParentEntry = GetParent(pEntry); + SvTreeListEntry* pParentEntry = GetParent(pEntry); while(pParentEntry && (!lcl_IsContentType(pParentEntry))) { pParentEntry = GetParent(pParentEntry); @@ -2747,7 +2747,7 @@ void SwContentType::RemoveNewline(String& rEntry) } } -void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) +void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode) { SwContent* pCnt = (SwContent*)pEntry->GetUserData(); GotoContent(pCnt); @@ -3127,14 +3127,14 @@ sal_Bool NaviContentBookmark::Paste( TransferableDataHelper& rData ) class SwContentLBoxString : public SvLBoxString { public: - SwContentLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + SwContentLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {} virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); }; -void SwContentTree::InitEntry(SvLBoxEntry* pEntry, +void SwContentTree::InitEntry(SvTreeListEntry* pEntry, const XubString& rStr ,const Image& rImg1,const Image& rImg2, SvLBoxButtonKind eButtonKind) { @@ -3146,7 +3146,7 @@ void SwContentTree::InitEntry(SvLBoxEntry* pEntry, } void SwContentLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { if(lcl_IsContent(pEntry) && ((SwContent *)pEntry->GetUserData())->IsInvisible()) diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index f3ce370b6301..56eff33cd687 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -194,7 +194,7 @@ SwGlobalTree::~SwGlobalTree() sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; - SvLBoxEntry* pLast = (SvLBoxEntry*)LastVisible(); + SvTreeListEntry* pLast = (SvTreeListEntry*)LastVisible(); if(pEmphasisEntry) { ImplShowTargetEmphasis( Prev(pEmphasisEntry), sal_False ); @@ -205,10 +205,10 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) ImplShowTargetEmphasis( pLast, sal_False); } - SvLBoxEntry* pDropEntry = bLastEntryEmphasis ? 0 : GetEntry(rEvt.maPosPixel); + SvTreeListEntry* pDropEntry = bLastEntryEmphasis ? 0 : GetEntry(rEvt.maPosPixel); if( bIsInternalDrag ) { - SvLBoxEntry* pDummy = 0; + SvTreeListEntry* pDummy = 0; sal_uLong nInsertionPos = LIST_APPEND; NotifyMoving( pDropEntry, pDDSource, pDummy, nInsertionPos ); } @@ -277,7 +277,7 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt ) //initiate scrolling GetDropTarget( rEvt.maPosPixel ); - SvLBoxEntry* pLast = (SvLBoxEntry*)LastVisible(); + SvTreeListEntry* pLast = (SvTreeListEntry*)LastVisible(); if( rEvt.mbLeaving ) { if( pEmphasisEntry ) @@ -293,7 +293,7 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt ) } else { - SvLBoxEntry* pDropEntry = GetEntry( rEvt.maPosPixel ); + SvTreeListEntry* pDropEntry = GetEntry( rEvt.maPosPixel ); if(bIsInternalDrag) { if( pDDSource != pDropEntry ) @@ -431,10 +431,10 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox) sal_uInt16 SwGlobalTree::GetEnableFlags() const { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); sal_uInt16 nSelCount = (sal_uInt16)GetSelectionCount(); sal_uInt16 nEntryCount = (sal_uInt16)GetEntryCount(); - SvLBoxEntry* pPrevEntry = pEntry ? Prev(pEntry) : 0; + SvTreeListEntry* pPrevEntry = pEntry ? Prev(pEntry) : 0; sal_uInt16 nRet = 0; if(nSelCount == 1 || !nEntryCount) @@ -467,7 +467,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); const SwGlblDocContent* pCont = pEntry ? (const SwGlblDocContent*)pEntry->GetUserData() : 0; if( pCont && GLBLDOC_SECTION == pCont->GetType()) @@ -511,7 +511,7 @@ void SwGlobalTree::SelectHdl() { sal_uInt16 nSelCount = (sal_uInt16)GetSelectionCount(); - SvLBoxEntry* pSel = FirstSelected(); + SvTreeListEntry* pSel = FirstSelected(); sal_uInt16 nAbsPos = pSel ? (sal_uInt16)GetModel()->GetAbsPos(pSel) : 0; SwNavigationPI* pNavi = GetParentWindow(); sal_Bool bReadonly = !pActiveShell || @@ -532,21 +532,21 @@ void SwGlobalTree::DeselectHdl() } DragDropMode SwGlobalTree::NotifyStartDrag( TransferDataContainer& , - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { bIsInternalDrag = sal_True; pDDSource = pEntry; return SV_DRAGDROP_CTRL_MOVE; } -long SwGlobalTree::GetTabPos( SvLBoxEntry*, SvLBoxTab* pTab) +long SwGlobalTree::GetTabPos( SvTreeListEntry*, SvLBoxTab* pTab) { return pTab->GetPos() - GLBL_TABPOS_SUB; } -sal_Bool SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry*&, +sal_Bool SwGlobalTree::NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry*&, sal_uLong& ) { @@ -561,16 +561,16 @@ sal_Bool SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget, return sal_False; } -sal_Bool SwGlobalTree::NotifyCopying( SvLBoxEntry* /*pTarget*/, - SvLBoxEntry* /*pEntry*/, - SvLBoxEntry*& /*rpNewParent*/, +sal_Bool SwGlobalTree::NotifyCopying( SvTreeListEntry* /*pTarget*/, + SvTreeListEntry* /*pEntry*/, + SvTreeListEntry*& /*rpNewParent*/, sal_uLong& /*rNewChildPos*/ ) { return sal_False; } -sal_Bool SwGlobalTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) +sal_Bool SwGlobalTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) { return pEntry != 0; } @@ -594,7 +594,7 @@ void SwGlobalTree::DragFinished( sal_Int8 nAction ) void SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt ) { Point aPos( rMEvt.GetPosPixel()); - SvLBoxEntry* pEntry = GetEntry( aPos, sal_True ); + SvTreeListEntry* pEntry = GetEntry( aPos, sal_True ); if( !pEntry && rMEvt.IsLeft() && rMEvt.IsMod1() && (rMEvt.GetClicks() % 2) == 0) Control::MouseButtonDown( rMEvt ); else @@ -641,7 +641,7 @@ void SwGlobalTree::Display(sal_Bool bOnlyUpdateUserData) sal_uInt16 nCount = pSwGlblDocContents->size(); if(bOnlyUpdateUserData && GetEntryCount() == pSwGlblDocContents->size()) { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); for( sal_uInt16 i = 0; i < nCount; i++) { SwGlblDocContent* pCont = (*pSwGlblDocContents)[i]; @@ -652,7 +652,7 @@ void SwGlobalTree::Display(sal_Bool bOnlyUpdateUserData) else { SetUpdateMode( sal_False ); - SvLBoxEntry* pOldSelEntry = FirstSelected(); + SvTreeListEntry* pOldSelEntry = FirstSelected(); String sEntryName; // Name des Eintrags sal_uInt16 nSelPos = USHRT_MAX; if(pOldSelEntry) @@ -664,7 +664,7 @@ void SwGlobalTree::Display(sal_Bool bOnlyUpdateUserData) if(!pSwGlblDocContents) Update( sal_False ); - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; for( sal_uInt16 i = 0; i < nCount; i++) { SwGlblDocContent* pCont = (*pSwGlblDocContents)[i]; @@ -693,7 +693,7 @@ void SwGlobalTree::Display(sal_Bool bOnlyUpdateUserData) } break; } - SvLBoxEntry* pEntry = InsertEntry(sEntry, aImage, aImage, + SvTreeListEntry* pEntry = InsertEntry(sEntry, aImage, aImage, 0, sal_False, LIST_APPEND, pCont); if(sEntry == sEntryName) { @@ -780,7 +780,7 @@ IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu) void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); SwGlblDocContent* pCont = pEntry ? (SwGlblDocContent*)pEntry->GetUserData() : 0; // wird waehrend des Dialogs ein RequestHelp gerufen, // dann geht der Content verloren. Deshalb wird hier eine @@ -797,7 +797,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry { // zwei Durchlaeufe: zuerst die Bereiche, dann die Verzeichnisse // aktualisieren - SvLBoxEntry* pSelEntry = FirstSelected(); + SvTreeListEntry* pSelEntry = FirstSelected(); while( pSelEntry ) { SwGlblDocContent* pContent = (SwGlblDocContent*)pSelEntry->GetUserData(); @@ -853,7 +853,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry // sind mehrere Eintraege selektiert, dann muss nach jedem delete // das Array neu gefuellt werden. Damit man sich nichts merken muss, // beginnt das Loeschen am Ende - SvLBoxEntry* pSelEntry = LastSelected(); + SvTreeListEntry* pSelEntry = LastSelected(); SwGlblDocContents* pTempContents = 0; pActiveShell->StartAction(); while(pSelEntry) @@ -1052,7 +1052,7 @@ void SwGlobalTree::HideTree() void SwGlobalTree::ExecCommand(sal_uInt16 nCmd) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); OSL_ENSURE(pEntry, "gleich knallt's"); if(FN_GLOBAL_EDIT == nCmd) { @@ -1129,7 +1129,7 @@ sal_Bool SwGlobalTree::Update(sal_Bool bHard) SwGlblDocContent* pLeft = (*pTempContents)[i]; SwGlblDocContent* pRight = (*pSwGlblDocContents)[i]; GlobalDocContentType eType = pLeft->GetType(); - SvLBoxEntry* pEntry = GetEntry(i); + SvTreeListEntry* pEntry = GetEntry(i); String sTemp = GetEntryText(pEntry); if ( eType != pRight->GetType() || @@ -1203,7 +1203,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); if(pCont->GetType() == GLBLDOC_SECTION) OpenDoc(pCont); @@ -1223,7 +1223,7 @@ IMPL_STATIC_LINK_NOINSTANCE(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG) return 0; } -void SwGlobalTree::InitEntry(SvLBoxEntry* pEntry, +void SwGlobalTree::InitEntry(SvTreeListEntry* pEntry, const XubString& rStr ,const Image& rImg1,const Image& rImg2, SvLBoxButtonKind eButtonKind) { @@ -1235,7 +1235,7 @@ void SwGlobalTree::InitEntry(SvLBoxEntry* pEntry, } void SwLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); if(pCont->GetType() == GLBLDOC_SECTION && @@ -1272,7 +1272,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen sal_Bool bMove = sal_False; if ( !_pContent ) { - SvLBoxEntry* pLast = (SvLBoxEntry*)LastVisible(); + SvTreeListEntry* pLast = (SvTreeListEntry*)LastVisible(); _pContent = (SwGlblDocContent*)pLast->GetUserData(); bMove = sal_True; } diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 8695dfc66af1..70acc3da63ce 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -601,7 +601,7 @@ void SwNavigationPI::_ZoomOut() aContentTree.ShowTree(); aDocListBox.Show(); } - SvLBoxEntry* pFirst = aContentTree.FirstSelected(); + SvTreeListEntry* pFirst = aContentTree.FirstSelected(); if(pFirst) aContentTree.Select(pFirst, sal_True); // toolbox enablen pConfig->SetSmall( sal_False ); @@ -628,7 +628,7 @@ void SwNavigationPI::_ZoomIn() ((SfxDockingWindow*)GetParent())->SetMinOutputSizePixel(Size( aMinOutSizePixel.Width(), aSz.Height())); pFloat->SetOutputSizePixel(aSz); - SvLBoxEntry* pFirst = aContentTree.FirstSelected(); + SvTreeListEntry* pFirst = aContentTree.FirstSelected(); if(pFirst) aContentTree.Select(pFirst, sal_True); // toolbox enablen pConfig->SetSmall( sal_True ); diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 26b03fb06582..91def5575271 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -142,7 +142,7 @@ private: DECL_LINK( ViewCertHdl, void* ); DECL_LINK( CertSelectHdl, void* ); void Clear( void ); - SvLBoxEntry* InsertCert( SvLBoxEntry* _pParent, const OUString& _rName, + SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, cssu::Reference< dcss::security::XCertificate > rxCert, bool bValid); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 27a486dca6fd..cfc0db0f22f3 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -46,7 +46,7 @@ sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const { sal_uInt16 nSel = INVAL_SEL; - SvLBoxEntry* pSel = maCertLB.FirstSelected(); + SvTreeListEntry* pSel = maCertLB.FirstSelected(); if( pSel ) nSel = (sal_uInt16) ( sal_uIntPtr ) pSel->GetUserData(); @@ -177,7 +177,7 @@ void CertificateChooser::ImplInitialize() sEntry.append( XmlSec::GetContentPart( maCerts[ nC ]->getIssuerName() ) ); sEntry.append( '\t' ); sEntry.append( XmlSec::GetDateString( maCerts[ nC ]->getNotValidAfter() ) ); - SvLBoxEntry* pEntry = maCertLB.InsertEntry( sEntry.makeStringAndClear() ); + SvTreeListEntry* pEntry = maCertLB.InsertEntry( sEntry.makeStringAndClear() ); pEntry->SetUserData( ( void* )(sal_IntPtr)nC ); // missuse user data as index } diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 7a7486e229c8..de1076006189 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -223,7 +223,7 @@ void CertificateViewerDetailsTP::Clear( void ) { maElementML.SetText( OUString() ); sal_uLong i = 0; - SvLBoxEntry* pEntry = maElementsLB.GetEntry( i ); + SvTreeListEntry* pEntry = maElementsLB.GetEntry( i ); while( pEntry ) { delete ( Details_UserDatat* ) pEntry->GetUserData(); @@ -237,7 +237,7 @@ void CertificateViewerDetailsTP::Clear( void ) void CertificateViewerDetailsTP::InsertElement( const OUString& _rField, const OUString& _rValue, const OUString& _rDetails, bool _bFixedWidthFont ) { - SvLBoxEntry* pEntry = maElementsLB.InsertEntry( _rField ); + SvTreeListEntry* pEntry = maElementsLB.InsertEntry( _rField ); maElementsLB.SetEntryText( _rValue, pEntry, 1 ); pEntry->SetUserData( ( void* ) new Details_UserDatat( _rDetails, _bFixedWidthFont ) ); } @@ -335,7 +335,7 @@ void CertificateViewerDetailsTP::ActivatePage() IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl) { - SvLBoxEntry* pEntry = maElementsLB.FirstSelected(); + SvTreeListEntry* pEntry = maElementsLB.FirstSelected(); OUString aElementText; bool bFixedWidthFont; if( pEntry ) @@ -426,7 +426,7 @@ void CertificateViewerCertPathTP::ActivatePage() const Reference< security::XCertificate >* pCertPath = aCertPath.getConstArray(); sal_Int32 i, nCnt = aCertPath.getLength(); - SvLBoxEntry* pParent = NULL; + SvTreeListEntry* pParent = NULL; for( i = nCnt; i; ) { const Reference< security::XCertificate > rCert = pCertPath[ --i ]; @@ -453,7 +453,7 @@ void CertificateViewerCertPathTP::ActivatePage() IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) { - SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); + SvTreeListEntry* pEntry = maCertPathLB.FirstSelected(); if( pEntry ) { CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, false ); @@ -466,7 +466,7 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) { OUString sStatus; - SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); + SvTreeListEntry* pEntry = maCertPathLB.FirstSelected(); if( pEntry ) { CertPath_UserData* pData = (CertPath_UserData*) pEntry->GetUserData(); @@ -483,7 +483,7 @@ void CertificateViewerCertPathTP::Clear( void ) { maCertStatusML.SetText( OUString() ); sal_uLong i = 0; - SvLBoxEntry* pEntry = maCertPathLB.GetEntry( i ); + SvTreeListEntry* pEntry = maCertPathLB.GetEntry( i ); while( pEntry ) { delete ( CertPath_UserData* ) pEntry->GetUserData(); @@ -494,12 +494,12 @@ void CertificateViewerCertPathTP::Clear( void ) maCertPathLB.Clear(); } -SvLBoxEntry* CertificateViewerCertPathTP::InsertCert( - SvLBoxEntry* _pParent, const OUString& _rName, cssu::Reference< dcss::security::XCertificate > rxCert, +SvTreeListEntry* CertificateViewerCertPathTP::InsertCert( + SvTreeListEntry* _pParent, const OUString& _rName, cssu::Reference< dcss::security::XCertificate > rxCert, bool bValid) { Image aImage = bValid ? maCertImage : maCertNotValidatedImage; - SvLBoxEntry* pEntry = maCertPathLB.InsertEntry( _rName, aImage, aImage, _pParent ); + SvTreeListEntry* pEntry = maCertPathLB.InsertEntry( _rName, aImage, aImage, _pParent ); pEntry->SetUserData( ( void* ) new CertPath_UserData( rxCert, bValid ) ); return pEntry; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 951ed3171c72..9cee3b5bfee3 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -679,7 +679,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() aImage = maSigsValidImg.GetImage(); } - SvLBoxEntry* pEntry = maSignaturesLB.InsertEntry( OUString(), aImage, aImage ); + SvTreeListEntry* pEntry = maSignaturesLB.InsertEntry( OUString(), aImage, aImage ); maSignaturesLB.SetEntryText( aSubject, pEntry, 1 ); maSignaturesLB.SetEntryText( aIssuer, pEntry, 2 ); maSignaturesLB.SetEntryText( aDateTimeStr, pEntry, 3 ); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index c814c5968cba..a86fca3fc7c1 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -314,7 +314,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void ) // create from RawData xCert = mpDlg->mxSecurityEnvironment->createCertificateFromAscii( rEntry[ 2 ] ); - SvLBoxEntry* pLBEntry = maTrustCertLB.InsertEntry( XmlSec::GetContentPart( xCert->getSubjectName() ) ); + SvTreeListEntry* pLBEntry = maTrustCertLB.InsertEntry( XmlSec::GetContentPart( xCert->getSubjectName() ) ); maTrustCertLB.SetEntryText( XmlSec::GetContentPart( xCert->getIssuerName() ), pLBEntry, 1 ); maTrustCertLB.SetEntryText( XmlSec::GetDateTimeString( xCert->getNotValidAfter() ), pLBEntry, 2 ); pLBEntry->SetUserData( ( void* ) (sal_IntPtr)nEntry ); // missuse user data as index |