diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-02 17:23:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-03 08:16:19 +0200 |
commit | 904c97bbdf4c76709dbcacb11292668b98a9efd8 (patch) | |
tree | 42855fdaf74aca15c6674836a8f603d22aa87744 /cui | |
parent | bb1d5780226bb1b9156580972eea9aa849178742 (diff) |
move SvTreeList::*Sibling to SvTreeListEntry
since they don't depend on SvTreeList at all
Change-Id: If48c83976a95943e5cfa92490d68f74281cf4b5f
Reviewed-on: https://gerrit.libreoffice.org/56819
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/cfg.cxx | 4 | ||||
-rw-r--r-- | cui/source/customize/cfgutil.cxx | 8 | ||||
-rw-r--r-- | cui/source/customize/eventdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optaboutconfig.cxx | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 63d19ebdd808..44784ae283f5 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1823,12 +1823,12 @@ void SvxConfigPage::MoveEntry( bool bMoveUp ) { // Move Up is just a Move Down with the source and target reversed pTargetEntry = pSourceEntry; - pSourceEntry = SvTreeListBox::PrevSibling( pTargetEntry ); + pSourceEntry = pTargetEntry->PrevSibling(); pToSelect = pTargetEntry; } else { - pTargetEntry = SvTreeListBox::NextSibling( pSourceEntry ); + pTargetEntry = pSourceEntry->NextSibling(); pToSelect = pSourceEntry; } diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 5dc7153f1c94..1907bae13dee 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -1116,13 +1116,13 @@ void SfxConfigGroupListBox::SelectMacro( const OUString& rBasic, pMethod = pFunctionListBox->Next( pMethod ); } } - pMod = NextSibling( pMod ); + pMod = pMod->NextSibling(); } } - pLib = NextSibling( pLib ); + pLib = pLib->NextSibling(); } } - pEntry = NextSibling( pEntry ); + pEntry = pEntry->NextSibling(); } } @@ -1261,7 +1261,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void ) { // Select the next entry in the list if possible SvTreeListEntry* current = m_pCommands->FirstSelected(); - SvTreeListEntry* next = SvTreeListBox::NextSibling( current ); + SvTreeListEntry* next = current->NextSibling(); if ( next != nullptr ) { diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index f3892aadbb0c..5c1f1c31ac0c 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -111,7 +111,7 @@ void SvxEventConfigPage::dispose() OUString const * pEventName = static_cast<OUString const *>(pE->GetUserData()); delete pEventName; pE->SetUserData(nullptr); - pE = SvTreeListBox::NextSibling( pE ); + pE = pE->NextSibling(); } m_pSaveInListBox.clear(); SvxMacroTabPage_::dispose(); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index d05d4fb5efe0..f629f349271e 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -219,7 +219,7 @@ namespace } break; } - pEntry = SvTreeListBox::NextSibling(pEntry); + pEntry = pEntry->NextSibling(); } } } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 91fa1b76a815..12ff8b2236ef 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -125,7 +125,7 @@ void SFTreeListBox::deleteTree( SvTreeListEntry* pEntry ) pEntry = FirstChild( pEntry ); while ( pEntry ) { - SvTreeListEntry* pNextEntry = NextSibling( pEntry ); + SvTreeListEntry* pNextEntry = pEntry->NextSibling(); deleteTree( pEntry ); GetModel()->Remove( pEntry ); pEntry = pNextEntry; @@ -141,7 +141,7 @@ void SFTreeListBox::deleteAllTree() { while ( pEntry ) { - SvTreeListEntry* pNextEntry = NextSibling( pEntry ) ; + SvTreeListEntry* pNextEntry = pEntry->NextSibling(); deleteTree( pEntry ); GetModel()->Remove( pEntry ); pEntry = pNextEntry; @@ -1154,7 +1154,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() pEntry = pTmpEntry; break; } - pTmpEntry = SvTreeListBox::NextSibling( pTmpEntry ); + pTmpEntry = pTmpEntry->NextSibling(); } if ( !pTmpEntry ) break; diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 32f7a010447e..cb4cd323a4fc 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -875,7 +875,7 @@ void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry) OUString sParentName = sPath.copy(prevIndex+1, index - prevIndex - 1); bool hasEntry = false; - for(pParentEntry = m_pPrefBox->FirstChild(pGrandParentEntry); pParentEntry != nullptr; pParentEntry = SvTreeListBox::NextSibling(pParentEntry)) + for(pParentEntry = m_pPrefBox->FirstChild(pGrandParentEntry); pParentEntry != nullptr; pParentEntry = pParentEntry->NextSibling()) if(static_cast< SvLBoxString& >(pParentEntry->GetItem(1)).GetText() == sParentName) { hasEntry = true; |