diff options
Diffstat (limited to 'cui')
45 files changed, 425 insertions, 425 deletions
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 ); |