diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-08-06 17:03:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-08-07 10:05:53 +0200 |
| commit | 4e5c785b1564f7e4444a426a1523ff7fc88f93d6 (patch) | |
| tree | 2d6303c6ab50bfa6dba0f95ff1b54e4446fcd78c /vcl | |
| parent | 045847237d5a40b2679d53533db4937aa1c9ac3e (diff) | |
IMnemonicEntryList interface of SvTreeListBox is unused
Change-Id: I56a97d0ef82353aaf3c2ab482c1d782b5dfc8000
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100263
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/treelist/treelistbox.cxx | 54 |
1 files changed, 14 insertions, 40 deletions
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index af55a6ff1133..cd0729c23350 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -930,26 +930,27 @@ void SvTreeListBox::EndEditing( bool bCancel ) nImpFlags &= ~SvTreeListBoxFlags::IN_EDT; } - -const void* SvTreeListBox::FirstSearchEntry( OUString& _rEntryText ) const +vcl::StringEntryIdentifier SvTreeListBox::CurrentEntry( OUString& _out_entryText ) const { - SvTreeListEntry* pEntry = GetCurEntry(); - if ( pEntry ) - pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( NextSearchEntry( pEntry, _rEntryText ) ) ); - else + // always accept the current entry if there is one + SvTreeListEntry* pEntry( GetCurEntry() ); + if (pEntry) { - pEntry = FirstSelected(); - if ( !pEntry ) - pEntry = First(); + _out_entryText = GetEntryText(pEntry); + return pEntry; } + pEntry = FirstSelected(); + if ( !pEntry ) + pEntry = First(); + if ( pEntry ) - _rEntryText = GetEntryText( pEntry ); + _out_entryText = GetEntryText( pEntry ); return pEntry; } -const void* SvTreeListBox::NextSearchEntry( const void* _pCurrentSearchEntry, OUString& _rEntryText ) const +vcl::StringEntryIdentifier SvTreeListBox::NextEntry(vcl::StringEntryIdentifier _pCurrentSearchEntry, OUString& _out_entryText) const { SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pCurrentSearchEntry ) ); @@ -974,12 +975,12 @@ const void* SvTreeListBox::NextSearchEntry( const void* _pCurrentSearchEntry, OU pEntry = First(); if ( pEntry ) - _rEntryText = GetEntryText( pEntry ); + _out_entryText = GetEntryText( pEntry ); return pEntry; } -void SvTreeListBox::SelectSearchEntry( const void* _pEntry ) +void SvTreeListBox::SelectEntry(vcl::StringEntryIdentifier _pEntry) { SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) ); DBG_ASSERT( pEntry, "SvTreeListBox::SelectSearchEntry: invalid entry!" ); @@ -991,33 +992,6 @@ void SvTreeListBox::SelectSearchEntry( const void* _pEntry ) Select( pEntry ); } -void SvTreeListBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const -{ - // nothing to do here, we have no "execution" -} - -vcl::StringEntryIdentifier SvTreeListBox::CurrentEntry( OUString& _out_entryText ) const -{ - // always accept the current entry if there is one - SvTreeListEntry* pCurrentEntry( GetCurEntry() ); - if ( pCurrentEntry ) - { - _out_entryText = GetEntryText( pCurrentEntry ); - return pCurrentEntry; - } - return FirstSearchEntry( _out_entryText ); -} - -vcl::StringEntryIdentifier SvTreeListBox::NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const -{ - return NextSearchEntry( _currentEntry, _out_entryText ); -} - -void SvTreeListBox::SelectEntry( vcl::StringEntryIdentifier _entry ) -{ - SelectSearchEntry( _entry ); -} - bool SvTreeListBox::HandleKeyInput( const KeyEvent& _rKEvt ) { if ( _rKEvt.GetKeyCode().IsMod1() ) |