diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-07-01 16:29:56 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-07-02 10:02:39 +0200 |
| commit | 9877ab0b5ebadf70a138db582f298bf0e5d1cd9e (patch) | |
| tree | fac76b19c55795eb3c0d9c524eb3aa343e0ad0c7 /vcl | |
| parent | 01fa9762bcf761e5a1fd9eac6740e6829f21b5b1 (diff) | |
tdf#161853 vcl: Drop unnecessary indirection for icon choice control
Just call `SvxIconChoiceCtrl_Impl::SetEntryTextMode` directly,
instead of doing so via the `pView`, and drop the now unused
`SvtIconChoiceCtrl::SetEntryTextMode`.
Change-Id: I9b42f1bee6984e2c34814addd998cefd56dbe7f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169837
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/imivctl1.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/ivctrl.cxx | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index ed52e38a39a4..e9dbc5690a56 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -979,12 +979,12 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) if( rKEvt.GetKeyCode().IsShift() ) { if( pCursor ) - pView->SetEntryTextMode(SvxIconChoiceCtrlTextMode::Full, *pCursor); + SetEntryTextMode(SvxIconChoiceCtrlTextMode::Full, *pCursor); } if( rKEvt.GetKeyCode().IsMod1() ) { if( pCursor ) - pView->SetEntryTextMode(SvxIconChoiceCtrlTextMode::Short, *pCursor); + SetEntryTextMode(SvxIconChoiceCtrlTextMode::Short, *pCursor); } break; #endif diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index 2afe55a21258..61fa316bd796 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -238,13 +238,6 @@ void SvtIconChoiceCtrl::Command(const CommandEvent& rCEvt) Control::Command(rCEvt); } -#ifdef DBG_UTIL -void SvtIconChoiceCtrl::SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry& rEntry ) -{ - _pImpl->SetEntryTextMode(eMode, rEntry); -} -#endif - sal_Int32 SvtIconChoiceCtrl::GetEntryCount() const { return _pImpl ? _pImpl->GetEntryCount() : 0; |