diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-07-03 10:59:38 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-07-04 06:32:58 +0200 |
| commit | 93516e9181d321fe2579308d95de85cefe21a05d (patch) | |
| tree | df025cde30395cf59547dbdc1a0ec90338d33229 | |
| parent | 5db79db0f0c7c432d933433192506d234f6cd26e (diff) | |
tdf#161853 SvxIconChoiceCtrlEntry: Drop means to manually set neighbours
This mechanism to manually sort the entries by setting
a link/pointer to the neighbours isn't actually used, so
drop the code to maintain a linked list.
See
Change-Id: I44eceb41866bb6d99ccea032f98637a42dabc9ee
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Wed Jul 3 10:44:46 2024 +0200
tdf#161853 Drop always null SvxIconChoiceCtrl_Impl::pHead
Change-Id: Ib939145999725232d803103dc1fd0b49fa2d425a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169916
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
| -rw-r--r-- | include/vcl/toolkit/ivctrl.hxx | 25 | ||||
| -rw-r--r-- | vcl/source/control/ivctrl.cxx | 2 |
2 files changed, 0 insertions, 27 deletions
diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx index 059494b5e05e..2973b74f2015 100644 --- a/include/vcl/toolkit/ivctrl.hxx +++ b/include/vcl/toolkit/ivctrl.hxx @@ -73,14 +73,6 @@ class SvxIconChoiceCtrlEntry tools::Rectangle aGridRect; // Only valid in Grid-mode sal_Int32 nPos; - /* - The insert position in the Insertlist is equal to the (sort) order stated at the Insert - (-> Order of the anchors in the anchors-list!). In "AutoArrange" mode the visible order - can differ. The entries will be linked because of this. - */ - SvxIconChoiceCtrlEntry* pblink; // backward (left neighbour) - SvxIconChoiceCtrlEntry* pflink; // forward (right neighbour) - SvxIconChoiceCtrlTextMode eTextMode; sal_uInt16 nX,nY; // for keyboard control SvxIconViewFlags nFlags; @@ -89,23 +81,6 @@ class SvxIconChoiceCtrlEntry void SetFlags( SvxIconViewFlags nMask ) { nFlags |= nMask; } void AssignFlags( SvxIconViewFlags _nFlags ) { nFlags = _nFlags; } - // set left neighbour (A <-> B ==> A <-> this <-> B) - void SetBacklink( SvxIconChoiceCtrlEntry* pA ) - { - pA->pflink->pblink = this; // X <- B - this->pflink = pA->pflink; // X -> B - this->pblink = pA; // A <- X - pA->pflink = this; // A -> X - } - // Unlink (A <-> this <-> B ==> A <-> B) - void Unlink() - { - this->pblink->pflink = this->pflink; - this->pflink->pblink = this->pblink; - this->pflink = nullptr; - this->pblink = nullptr; - } - public: SvxIconChoiceCtrlEntry( OUString aText, Image aImage ); diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index 765f1f0b2637..1cab3e097c77 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -59,8 +59,6 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( OUString _aText, : aImage(std::move(_aImage)) , aText(std::move(_aText)) , nPos(0) - , pblink(nullptr) - , pflink(nullptr) , eTextMode(SvxIconChoiceCtrlTextMode::Short) , nX(0) , nY(0) |