From 9f8ffc8dfed61eb8460d92ce85b20effe5114f87 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 13 Feb 2015 13:31:57 +0200 Subject: add GetSelectEntryData to ListBox and ComboBox to reduce code clutter like pLbSelect->GetEntryData(pLbSelect->GetSelectEntryPos()) since this is a fairly frequent operation. Change-Id: I41daf30fdeda2442ad1ac829e12f553233bae184 Reviewed-on: https://gerrit.libreoffice.org/14472 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- basctl/source/basicide/basicbox.cxx | 2 +- basctl/source/basicide/baside2b.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 198e003e320b..8abae513fe10 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -452,7 +452,7 @@ void LanguageBox::ClearBox() void LanguageBox::SetLanguage() { - LanguageEntry* pEntry = (LanguageEntry*)GetEntryData( GetSelectEntryPos() ); + LanguageEntry* pEntry = (LanguageEntry*)GetSelectEntryData(); if ( pEntry ) GetShell()->GetCurLocalizationMgr()->handleSetCurrentLocale( pEntry->m_aLocale ); } diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 60fa48ad46dc..3413afa7d3c7 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2669,16 +2669,16 @@ void CodeCompleteListBox::InsertSelectedEntry() GetParentEditView()->SetSelection( pCodeCompleteWindow->pParent->GetLastHighlightPortionTextSelection() ); GetParentEditView()->DeleteSelected(); - if( !GetEntry( GetSelectEntryPos() ).isEmpty() ) + if( !GetSelectEntry().isEmpty() ) {//if the user selected something - GetParentEditView()->InsertText( GetEntry(GetSelectEntryPos()), false ); + GetParentEditView()->InsertText( GetSelectEntry(), false ); } } else { - if( !GetEntry( GetSelectEntryPos() ).isEmpty() ) + if( !GetSelectEntry().isEmpty() ) {//if the user selected something - GetParentEditView()->InsertText( GetEntry(GetSelectEntryPos()), false ); + GetParentEditView()->InsertText( GetSelectEntry(), false ); } } HideAndRestoreFocus(); -- cgit