From d99b65c864cc3358238e4eac651f12a34d05e2d9 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Thu, 14 Sep 2017 16:57:06 +0200 Subject: Rename GetSelectEntryPos -> GetSelectedEntryPos Change-Id: I0bd4cb463575af843c72d9c8aaf91742203532a4 Reviewed-on: https://gerrit.libreoffice.org/42283 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt --- cui/source/dialogs/cuicharmap.cxx | 4 ++-- cui/source/dialogs/cuifmsearch.cxx | 16 ++++++++-------- cui/source/dialogs/cuigaldlg.cxx | 2 +- cui/source/dialogs/hangulhanjadlg.cxx | 8 ++++---- cui/source/dialogs/hldocntp.cxx | 8 ++++---- cui/source/dialogs/hltpbase.cxx | 2 +- cui/source/dialogs/multipat.cxx | 4 ++-- cui/source/dialogs/showcols.cxx | 2 +- cui/source/dialogs/thesdlg.cxx | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'cui/source/dialogs') diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 72d81f410f3f..770cd82a1ce7 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -635,7 +635,7 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph) IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, ListBox&, void) { - const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pFontLB->GetSelectedEntryPos(); const sal_uInt16 nFont = (sal_uInt16)reinterpret_cast(m_pFontLB->GetEntryData( nPos )); aFont = GetDevFont( nFont ); aFont.SetWeight( WEIGHT_DONTKNOW ); @@ -722,7 +722,7 @@ void SvxCharacterMap::setCharName(sal_UCS4 nDecimalValue) IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) { - const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pSubsetLB->GetSelectedEntryPos(); const Subset* pSubset = static_cast (m_pSubsetLB->GetEntryData(nPos)); if( pSubset && !isSearchMode) { diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 0227d3699cfc..9d025f17f7c2 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -297,7 +297,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) if (pButton == m_prbSingleField) { m_plbField->Enable(); - m_pSearchEngine->RebuildUsedFields(m_plbField->GetSelectEntryPos()); + m_pSearchEngine->RebuildUsedFields(m_plbField->GetSelectedEntryPos()); } else { @@ -409,17 +409,17 @@ IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void) { DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unexpected : not exactly one entry selected!"); - m_pSearchEngine->SetPosition(m_plbPosition->GetSelectEntryPos()); + m_pSearchEngine->SetPosition(m_plbPosition->GetSelectedEntryPos()); } IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) { DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unexpected : not exactly one entry select!"); - m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectEntryPos()); + m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectedEntryPos()); // calls m_pSearchEngine->InvalidatePreviousLoc too - sal_Int32 nCurrentContext = m_plbForm->GetSelectEntryPos(); + sal_Int32 nCurrentContext = m_plbForm->GetSelectedEntryPos(); if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND) m_arrContextFields[nCurrentContext] = m_plbField->GetSelectedEntry(); } @@ -551,7 +551,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox&, rBox, void) { - InitContext(rBox.GetSelectEntryPos()); + InitContext(rBox.GetSelectedEntryPos()); } void FmSearchDialog::EnableSearchUI(bool bEnable) @@ -674,13 +674,13 @@ IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint, Timer *, void) void FmSearchDialog::OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPos) { FmFoundRecordInformation friInfo; - friInfo.nContext = m_plbForm->GetSelectEntryPos(); + friInfo.nContext = m_plbForm->GetSelectedEntryPos(); // if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway friInfo.aPosition = aCursorPos; if (m_prbAllFields->IsChecked()) friInfo.nFieldPos = nFieldPos; else - friInfo.nFieldPos = m_plbField->GetSelectEntryPos(); + friInfo.nFieldPos = m_plbField->GetSelectedEntryPos(); // this of course implies that I have really searched in the field that is selected in the listbox, // which is made sure in RebuildUsedFields @@ -736,7 +736,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, if (m_lnkCanceledNotFoundHdl.IsSet()) { FmFoundRecordInformation friInfo; - friInfo.nContext = m_plbForm->GetSelectEntryPos(); + friInfo.nContext = m_plbForm->GetSelectedEntryPos(); // if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway friInfo.aPosition = pProgress->aBookmark; m_lnkCanceledNotFoundHdl.Call(friInfo); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index a6f3ff16084c..945ba73c3d53 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -289,7 +289,7 @@ void TakeThread::execute() for( sal_Int32 i = 0; i < nEntries && schedule(); ++i ) { - const sal_Int32 nPos = mpBrowser->bTakeAll ? i : mpBrowser->m_pLbxFound->GetSelectEntryPos( i ); + const sal_Int32 nPos = mpBrowser->bTakeAll ? i : mpBrowser->m_pLbxFound->GetSelectedEntryPos( i ); const INetURLObject aURL( mpBrowser->aFoundList[ nPos ]); mrTakenList.push_back( (sal_uLong)nPos ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index d28cf058215c..ba8774d347c1 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -491,7 +491,7 @@ namespace svx m_bInSelectionUpdate = true; if( pControl == m_aListBox.get() ) { - sal_uInt16 nPos = m_aListBox->GetSelectEntryPos(); + sal_uInt16 nPos = m_aListBox->GetSelectedEntryPos(); m_aValueSet->SelectItem( nPos+1 ); //itemid == pos+1 (id 0 has special meaning) } else @@ -1058,14 +1058,14 @@ namespace svx DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); if( pEntry ) { - ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this, m_aDictList, m_pDictsLB->GetSelectEntryPos()); + ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this, m_aDictList, m_pDictsLB->GetSelectedEntryPos()); aEdDlg->Execute(); } } IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void) { - sal_uLong nSelPos = m_pDictsLB->GetSelectEntryPos(); + sal_uLong nSelPos = m_pDictsLB->GetSelectedEntryPos(); if( nSelPos != TREELIST_ENTRY_NOTFOUND ) { Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] ); @@ -1518,7 +1518,7 @@ namespace svx IMPL_LINK_NOARG( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void ) { - InitEditDictDialog( m_aBookLB->GetSelectEntryPos() ); + InitEditDictDialog( m_aBookLB->GetSelectedEntryPos() ); } IMPL_LINK_NOARG( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void ) diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 64239c21d1bd..772360f4ab37 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -85,7 +85,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri } if ( bIsValidURL ) { - sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) aURLObject.SetExtension( static_cast(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt ); } @@ -337,7 +337,7 @@ void SvxHyperlinkNewDocTp::DoApply () if ( !aStrNewName.isEmpty() ) { // get private-url - sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos=0; OUString aStrDocName ( static_cast( @@ -448,10 +448,10 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void) INetURLObject aNewURL( aStrTmp ); if( !aStrName.isEmpty() && !aNewURL.getExtension().isEmpty() && - m_pLbDocTypes->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + m_pLbDocTypes->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { // get private-url - const sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos(); aNewURL.setExtension( static_cast(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt ); } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index bae6b299bd78..e09d52039381 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -427,7 +427,7 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( OUString& aStrName, aStrIntName = mpEdText->GetText(); aStrName = mpEdIndication->GetText(); aStrFrame = mpCbbFrame->GetText(); - eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1); + eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectedEntryPos()+1); // Ask dialog whether the current doc is a HTML-doc if (static_cast(mpDialog.get())->IsHTMLDoc()) eMode = (SvxLinkInsertMode) ( sal_uInt16(eMode) | HLINK_HTMLMODE ); diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 7bc05a3cdc43..9b521a28543a 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -51,7 +51,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void) { sal_uLong nCount = m_pPathLB->GetEntryCount(); - bool bIsSelected = m_pPathLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + bool bIsSelected = m_pPathLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND; bool bEnable = nCount > 1; m_pDelBtn->Enable(bEnable && bIsSelected); } @@ -156,7 +156,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pPathLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pPathLB->GetSelectedEntryPos(); m_pPathLB->RemoveEntry( nPos ); sal_Int32 nCnt = m_pPathLB->GetEntryCount(); diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 50b35c157f6c..d2c950b8f6a2 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -59,7 +59,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk, Button*, void) css::uno::Reference< css::beans::XPropertySet > xCol; for (sal_Int32 i=0; i < m_pList->GetSelectEntryCount(); ++i) { - m_xColumns->getByIndex(sal::static_int_cast(reinterpret_cast(m_pList->GetEntryData(m_pList->GetSelectEntryPos(i))))) >>= xCol; + m_xColumns->getByIndex(sal::static_int_cast(reinterpret_cast(m_pList->GetEntryData(m_pList->GetSelectedEntryPos(i))))) >>= xCol; if (xCol.is()) { try diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 19f86c41b5de..6efcaa29d171 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -380,7 +380,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void ) { if (!m_pWordCB->IsTravelSelect()) // act only upon return key and not when traveling with cursor keys { - const sal_Int32 nPos = rBox.GetSelectEntryPos(); + const sal_Int32 nPos = rBox.GetSelectedEntryPos(); OUString aStr( rBox.GetEntry( nPos ) ); aStr = linguistic::GetThesaurusReplaceText( aStr ); m_pWordCB->SetText( aStr ); -- cgit