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>

4 files changed, 11 insertions, 11 deletions

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 15fdb0df0777..9f0cacfc0176 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1625,7 +1625,7 @@ SvTreeListEntry* ScCheckListBox::FindEntry( SvTreeListEntry* pParent, const OUSt
         if ( sNode == GetEntryText( pEntry ) )
             return pEntry;
 
-        pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
+        pEntry = pParent ? pEntry->NextSibling() : GetEntry( ++nRootPos );
     }
     return nullptr;
 }
@@ -1711,7 +1711,7 @@ void ScCheckListBox::CheckAllChildren( SvTreeListEntry* pParent, bool bCheck )
     while ( pEntry )
     {
         CheckAllChildren( pEntry, bCheck );
-        pEntry = NextSibling( pEntry );
+        pEntry = pEntry->NextSibling();
     }
 }
 
@@ -1739,7 +1739,7 @@ void ScCheckListBox::CheckEntry( SvTreeListEntry* pParent, bool bCheck )
                     bChildChecked = true;
                     break;
                 }
-                pChild = NextSibling( pChild );
+                pChild = pChild->NextSibling();
             }
             SetCheckButtonState( pAncestor, bChildChecked ? SvButtonState::Checked : SvButtonState::Unchecked );
             pAncestor = GetParent(pAncestor);
@@ -1807,7 +1807,7 @@ void ScCheckListBox::CountCheckedEntries( SvTreeListEntry* pParent, sal_uLong& n
     while ( pEntry )
     {
         CountCheckedEntries( pEntry, nCount );
-        pEntry = NextSibling( pEntry );
+        pEntry = pEntry->NextSibling();
     }
 }
 
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 6520573b2eac..0664058641bb 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -525,7 +525,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle )
             {
                 m_pLbConflicts->Select( pEntry );
             }
-            pEntry = SvTreeListBox::NextSibling( pEntry );
+            pEntry = pEntry->NextSibling();
         }
     }
 }
@@ -633,7 +633,7 @@ void ScConflictsDlg::KeepAllHandler( bool bMine )
     while ( pRootEntry )
     {
         SetConflictAction( pRootEntry, eConflictAction );
-        pRootEntry = SvTreeListBox::NextSibling( pRootEntry );
+        pRootEntry = pRootEntry->NextSibling();
     }
     m_pLbConflicts->SetUpdateMode( false );
     m_pLbConflicts->Clear();
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index f5308dfacba3..f3f9b3a74064 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -333,7 +333,7 @@ void ScContentTree::GetEntryIndexes( ScContentId& rnRootIndex, sal_uLong& rnChil
                     rnChildIndex = nEntry;
                     bFound = true;  // exit the while loop
                 }
-                pIterEntry = NextSibling( pIterEntry );
+                pIterEntry = pIterEntry->NextSibling();
                 ++nEntry;
             }
 
@@ -1138,7 +1138,7 @@ bool ScContentTree::NoteStringsChanged()
         if (lcl_NoteString(*pNote) != GetEntryText(pEntry))
             return true;
 
-        pEntry = NextSibling(pEntry);
+        pEntry = pEntry->NextSibling();
     }
 
     return pEntry != nullptr;
@@ -1184,7 +1184,7 @@ bool ScContentTree::DrawNamesChanged( ScContentId nType )
                             if ( ScDrawLayer::GetVisibleName( pObject ) != GetEntryText(pEntry) )
                                 bEqual = false;
 
-                            pEntry = NextSibling( pEntry );
+                            pEntry = pEntry->NextSibling();
                         }
                     }
                     pObject = aIter.Next();
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 7350ad76f7c6..fc5b3f067241 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -337,7 +337,7 @@ void ScXMLSourceDlg::DefaultElementSelected(SvTreeListEntry& rEntry)
     {
         // Only an element with no child elements (leaf element) can be linked.
         bool bHasChild = false;
-        for (SvTreeListEntry* pChild = mpLbTree->FirstChild(&rEntry); pChild; pChild = SvTreeListBox::NextSibling(pChild))
+        for (SvTreeListEntry* pChild = mpLbTree->FirstChild(&rEntry); pChild; pChild = pChild->NextSibling())
         {
             ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pChild);
             OSL_ASSERT(pUserData);
@@ -482,7 +482,7 @@ bool ScXMLSourceDlg::IsParentDirty(SvTreeListEntry* pEntry) const
 
 bool ScXMLSourceDlg::IsChildrenDirty(SvTreeListEntry* pEntry) const
 {
-    for (SvTreeListEntry* pChild = mpLbTree->FirstChild(pEntry); pChild; pChild = SvTreeListBox::NextSibling(pChild))
+    for (SvTreeListEntry* pChild = mpLbTree->FirstChild(pEntry); pChild; pChild = pChild->NextSibling())
     {
         ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pChild);
         OSL_ASSERT(pUserData);