Rename GetSelectEntryPos -> GetSelectedEntryPos

Change-Id: I0bd4cb463575af843c72d9c8aaf91742203532a4
Reviewed-on: https://gerrit.libreoffice.org/42283
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

40 files changed, 169 insertions, 169 deletions

diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index af5431197000..66d6517d08fa 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -181,7 +181,7 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
     if (!maInputRange.IsValid())
         return;
 
-    sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos();
+    sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectedEntryPos();
     sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>(mpDistributionCombo->GetEntryData(aSelectedIndex));
 
     sal_uInt32 seedValue;
@@ -380,7 +380,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, void)
 
 IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, void)
 {
-    sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos();
+    sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectedEntryPos();
     sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) );
     if (aSelectedId == DIST_UNIFORM ||
         aSelectedId == DIST_UNIFORM_INTEGER)
@@ -396,7 +396,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, v
 
 IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Edit&, void)
 {
-    sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos();
+    sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectedEntryPos();
     sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) );
     if (aSelectedId == DIST_UNIFORM ||
         aSelectedId == DIST_UNIFORM_INTEGER)
@@ -418,7 +418,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, CheckChanged, CheckBox&, void)
 
 IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, void)
 {
-    sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos();
+    sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectedEntryPos();
     sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) );
 
     mpParameter1Value->SetMin(SAL_MIN_INT64);
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index a96d31a233b3..d3b04e6751d9 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -570,9 +570,9 @@ void    AbstractScShowTabDlg_Impl::SetDescription(
     pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId );
 }
 
-sal_Int32 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_Int32 nPos) const
+sal_Int32 AbstractScShowTabDlg_Impl::GetSelectedEntryPos(sal_Int32 nPos) const
 {
-    return pDlg->GetSelectEntryPos( nPos);
+    return pDlg->GetSelectedEntryPos( nPos);
 }
 
 OUString AbstractScShowTabDlg_Impl::GetSelectedEntry(sal_Int32 nPos) const
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index ee9d80af5842..eec36a0c9ccb 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -337,7 +337,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg
     virtual sal_Int32 GetSelectEntryCount() const override;
     virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) override;
     virtual OUString  GetSelectedEntry(sal_Int32 nPos) const override;
-    virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const override;
+    virtual sal_Int32 GetSelectedEntryPos(sal_Int32 nPos) const override;
 };
 
 class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg
diff --git a/sc/source/ui/cctrl/cbnumberformat.cxx b/sc/source/ui/cctrl/cbnumberformat.cxx
index dede89437b7c..163b4ad22273 100644
--- a/sc/source/ui/cctrl/cbnumberformat.cxx
+++ b/sc/source/ui/cctrl/cbnumberformat.cxx
@@ -49,7 +49,7 @@ IMPL_STATIC_LINK(ScNumberFormat, NumFormatSelectHdl, ListBox&, rBox, void)
         SfxDispatcher* pDisp = SfxViewFrame::Current()->GetBindings().GetDispatcher();
         if(pDisp)
         {
-            const sal_Int32 nVal = rBox.GetSelectEntryPos();
+            const sal_Int32 nVal = rBox.GetSelectedEntryPos();
             SfxUInt16Item aItem(SID_NUMBER_TYPE_FORMAT, nVal);
             pDisp->ExecuteList(SID_NUMBER_TYPE_FORMAT,
                     SfxCallMode::RECORD, {&aItem});
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index b41b2cd21e49..a147a7287968 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -30,8 +30,8 @@ void GetType(const ListBox& rLstBox, const Edit& rEd, ScColorScaleEntry* pEntry,
 {
     double nVal = 0;
     sal_uInt32 nIndex = 0;
-    pEntry->SetType(static_cast<ScColorScaleEntryType>(rLstBox.GetSelectEntryPos()));
-    switch(rLstBox.GetSelectEntryPos())
+    pEntry->SetType(static_cast<ScColorScaleEntryType>(rLstBox.GetSelectedEntryPos()));
+    switch(rLstBox.GetSelectedEntryPos())
     {
         case COLORSCALE_AUTO:
         case COLORSCALE_MIN:
@@ -165,7 +165,7 @@ namespace {
 
 void GetAxesPosition(ScDataBarFormatData* pData, const ListBox* rLbox)
 {
-    switch(rLbox->GetSelectEntryPos())
+    switch(rLbox->GetSelectedEntryPos())
     {
         case 0:
             pData->meAxisPosition = databar::AUTOMATIC;
@@ -198,7 +198,7 @@ ScDataBarFormatData* ScDataBarSettingsDlg::GetData()
     ScDataBarFormatData* pData = new ScDataBarFormatData();
     pData->maPositiveColor = mpLbPos->GetSelectEntryColor();
     pData->mpNegativeColor.reset(new Color(mpLbNeg->GetSelectEntryColor()));
-    pData->mbGradient = ( mpLbFillType->GetSelectEntryPos() == 1 );
+    pData->mbGradient = ( mpLbFillType->GetSelectedEntryPos() == 1 );
     pData->mpUpperLimit.reset(new ScColorScaleEntry());
     pData->mpLowerLimit.reset(new ScColorScaleEntry());
     pData->maAxisColor = mpLbAxisCol->GetSelectEntryColor();
@@ -216,10 +216,10 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl, Button*, void )
 {
     //check that min < max
     bool bWarn = false;
-    sal_Int32 nSelectMin = mpLbTypeMin->GetSelectEntryPos();
+    sal_Int32 nSelectMin = mpLbTypeMin->GetSelectedEntryPos();
     if( nSelectMin == COLORSCALE_MAX )
         bWarn = true;
-    sal_Int32 nSelectMax = mpLbTypeMax->GetSelectEntryPos();
+    sal_Int32 nSelectMax = mpLbTypeMax->GetSelectedEntryPos();
     if( nSelectMax == COLORSCALE_MIN )
         bWarn = true;
     if(!bWarn) // databar length checks
@@ -235,7 +235,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl, Button*, void )
         if(rtl::math::approxEqual(nMinValue, nMaxValue) || nMinValue > nMaxValue || nMaxValue > 100 || nMinValue < 0)
             bWarn = true;
     }
-    if(!bWarn && mpLbTypeMin->GetSelectEntryPos() == mpLbTypeMax->GetSelectEntryPos())
+    if(!bWarn && mpLbTypeMin->GetSelectedEntryPos() == mpLbTypeMax->GetSelectedEntryPos())
     {
 
         if(nSelectMax != COLORSCALE_FORMULA && nSelectMax != COLORSCALE_AUTO)
@@ -267,7 +267,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl, Button*, void )
 
 IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void )
 {
-    sal_Int32 nSelectMin = mpLbTypeMin->GetSelectEntryPos();
+    sal_Int32 nSelectMin = mpLbTypeMin->GetSelectedEntryPos();
     if( nSelectMin <= COLORSCALE_MAX)
         mpEdMin->Disable();
     else
@@ -282,7 +282,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void )
         }
     }
 
-    sal_Int32 nSelectMax = mpLbTypeMax->GetSelectEntryPos();
+    sal_Int32 nSelectMax = mpLbTypeMax->GetSelectedEntryPos();
     if(nSelectMax <= COLORSCALE_MAX)
         mpEdMax->Disable();
     else
@@ -300,7 +300,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void )
 
 IMPL_LINK_NOARG( ScDataBarSettingsDlg, PosSelectHdl, ListBox&, void )
 {
-    sal_Int32 axisPos = mpLbAxisPos->GetSelectEntryPos();
+    sal_Int32 axisPos = mpLbAxisPos->GetSelectedEntryPos();
     if(axisPos != 2 && axisPos != 1) // disable if axis vertical position is automatic
     {
         mpLenMin->Disable();
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index ca1cfbdedf40..0ca7db2bb994 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -261,7 +261,7 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox&, rBox, void)
     if(itr == maEntries.end())
         return;
 
-    sal_Int32 nPos = rBox.GetSelectEntryPos();
+    sal_Int32 nPos = rBox.GetSelectedEntryPos();
     switch(nPos)
     {
         case 0:
@@ -326,7 +326,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void)
     if(itr == maEntries.end())
         return;
 
-    sal_Int32 nPos = pBox->GetSelectEntryPos();
+    sal_Int32 nPos = pBox->GetSelectedEntryPos();
     switch(nPos)
     {
         case 0:
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 53b5da126957..af081bf65606 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -284,7 +284,7 @@ void ScConditionFrmtEntry::Init(ScCondFormatDlg* pDialogParent)
 
 ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const
 {
-    ScConditionMode eMode = EntryPosToConditionMode(maLbCondType->GetSelectEntryPos());
+    ScConditionMode eMode = EntryPosToConditionMode(maLbCondType->GetSelectedEntryPos());
     OUString aExpr1 = maEdVal1->GetText();
     OUString aExpr2;
     if (GetNumberEditFields(eMode) == 2)
@@ -408,7 +408,7 @@ sal_Int32 ScConditionFrmtEntry::GetNumberEditFields( ScConditionMode eMode )
 
 OUString ScConditionFrmtEntry::GetExpressionString()
 {
-    return ScCondFormatHelper::GetExpression(CONDITION, maLbCondType->GetSelectEntryPos(), maEdVal1->GetText(), maEdVal2->GetText());
+    return ScCondFormatHelper::GetExpression(CONDITION, maLbCondType->GetSelectedEntryPos(), maEdVal1->GetText(), maEdVal2->GetText());
 }
 
 ScFormatEntry* ScConditionFrmtEntry::GetEntry() const
@@ -418,7 +418,7 @@ ScFormatEntry* ScConditionFrmtEntry::GetEntry() const
 
 void ScConditionFrmtEntry::SetActive()
 {
-    ScConditionMode eMode = EntryPosToConditionMode(maLbCondType->GetSelectEntryPos());
+    ScConditionMode eMode = EntryPosToConditionMode(maLbCondType->GetSelectedEntryPos());
     maLbCondType->Show();
     switch(GetNumberEditFields(eMode))
     {
@@ -477,7 +477,7 @@ namespace {
 
 void StyleSelect( ListBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow& rWdPreview )
 {
-    if(rLbStyle.GetSelectEntryPos() == 0)
+    if(rLbStyle.GetSelectedEntryPos() == 0)
     {
         // call new style dialog
         SfxUInt16Item aFamilyItem( SID_STYLE_FAMILY, (sal_uInt16) SfxStyleFamily::Para );
@@ -686,7 +686,7 @@ void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const
 {
 
     // color scale does not have the automatic entry
-    sal_Int32 nPos = rType.GetSelectEntryPos();
+    sal_Int32 nPos = rType.GetSelectedEntryPos();
     if(!bDataBar)
         ++nPos;
 
@@ -852,7 +852,7 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox&, rBox, void )
         return;
 
     bool bEnableEdit = true;
-    sal_Int32 nPos = rBox.GetSelectEntryPos();
+    sal_Int32 nPos = rBox.GetSelectedEntryPos();
     if(nPos < 2)
     {
         bEnableEdit = false;
@@ -945,7 +945,7 @@ ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const
 {
     ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc);
     pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin.get(), *maLbColMin.get(), *maEdMin.get(), mpDoc, maPos));
-    if(maLbColorFormat->GetSelectEntryPos() == 1)
+    if(maLbColorFormat->GetSelectedEntryPos() == 1)
         pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMiddle.get(), *maLbColMiddle.get(), *maEdMiddle.get(), mpDoc, maPos));
     pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax.get(), *maLbColMax.get(), *maEdMax.get(), mpDoc, maPos));
     return pColorScale;
@@ -1012,7 +1012,7 @@ IMPL_LINK( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void )
         return;
 
     bool bEnableEdit = true;
-    sal_Int32 nPos = rBox.GetSelectEntryPos();
+    sal_Int32 nPos = rBox.GetSelectedEntryPos();
     if(nPos < 2)
     {
         bEnableEdit = false;
@@ -1026,7 +1026,7 @@ IMPL_LINK( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void )
 
 IMPL_LINK_NOARG( ScConditionFrmtEntry, ConditionTypeSelectHdl, ListBox&, void )
 {
-    sal_Int32 nSelectPos = maLbCondType->GetSelectEntryPos();
+    sal_Int32 nSelectPos = maLbCondType->GetSelectedEntryPos();
     ScConditionMode eMode = EntryPosToConditionMode(nSelectPos);
     switch(GetNumberEditFields(eMode))
     {
@@ -1191,13 +1191,13 @@ void ScDataBarFrmtEntry::SetInactive()
 
 IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void )
 {
-    sal_Int32 nSelectPos = maLbDataBarMinType->GetSelectEntryPos();
+    sal_Int32 nSelectPos = maLbDataBarMinType->GetSelectedEntryPos();
     if(nSelectPos <= COLORSCALE_MAX)
         maEdDataBarMin->Disable();
     else
         maEdDataBarMin->Enable();
 
-    nSelectPos = maLbDataBarMaxType->GetSelectEntryPos();
+    nSelectPos = maLbDataBarMaxType->GetSelectedEntryPos();
     if(nSelectPos <= COLORSCALE_MAX)
         maEdDataBarMax->Disable();
     else
@@ -1300,7 +1300,7 @@ void ScDateFrmtEntry::Notify( SfxBroadcaster&, const SfxHint& rHint )
 ScFormatEntry* ScDateFrmtEntry::GetEntry() const
 {
     ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc);
-    condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(maLbDateEntry->GetSelectEntryPos());
+    condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(maLbDateEntry->GetSelectedEntryPos());
     pNewEntry->SetDateType(eType);
     pNewEntry->SetStyleName(maLbStyle->GetSelectedEntry());
     return pNewEntry;
@@ -1413,7 +1413,7 @@ void ScIconSetFrmtDataEntry::dispose()
 
 ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const
 {
-    sal_Int32 nPos = maLbEntryType->GetSelectEntryPos();
+    sal_Int32 nPos = maLbEntryType->GetSelectedEntryPos();
     OUString aText = maEdEntry->GetText();
     ScColorScaleEntry* pEntry = new ScColorScaleEntry();
 
@@ -1513,7 +1513,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl, ListBox&, void )
 {
     const ScIconSetMap* pMap = ScIconSetFormat::g_IconSetMap;
 
-    sal_Int32 nPos = maLbIconSetType->GetSelectEntryPos();
+    sal_Int32 nPos = maLbIconSetType->GetSelectedEntryPos();
     sal_uInt32 nElements = pMap[nPos].nElements;
 
     for (auto it = maEntries.begin(); it != maEntries.end(); ++it)
@@ -1567,7 +1567,7 @@ ScFormatEntry* ScIconSetFrmtEntry::GetEntry() const
     ScIconSetFormat* pFormat = new ScIconSetFormat(mpDoc);
 
     ScIconSetFormatData* pData = new ScIconSetFormatData;
-    pData->eIconSetType = static_cast<ScIconSetType>(maLbIconSetType->GetSelectEntryPos());
+    pData->eIconSetType = static_cast<ScIconSetType>(maLbIconSetType->GetSelectedEntryPos());
     for(ScIconSetFrmtDataEntriesType::const_iterator itr = maEntries.begin(),
             itrEnd = maEntries.end(); itr != itrEnd; ++itr)
     {
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index a175220c62ea..ffcb614d4e46 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -385,7 +385,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl, Button*, void)
             theOutParam.nCol            = aDestAddress.Col();
             theOutParam.nRow            = aDestAddress.Row();
             theOutParam.nTab            = aDestAddress.Tab();
-            theOutParam.eFunction       = LbPosToFunc( pLbFunc->GetSelectEntryPos() );
+            theOutParam.eFunction       = LbPosToFunc( pLbFunc->GetSelectedEntryPos() );
             theOutParam.bByCol          = pBtnByCol->IsChecked();
             theOutParam.bByRow          = pBtnByRow->IsChecked();
             theOutParam.bReferenceData  = pBtnRefs->IsChecked();
@@ -473,7 +473,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, Button*, pBtn, void )
     else if ( pBtn == pBtnRemove )
     {
         while ( pLbConsAreas->GetSelectEntryCount() )
-            pLbConsAreas->RemoveEntry( pLbConsAreas->GetSelectEntryPos() );
+            pLbConsAreas->RemoveEntry( pLbConsAreas->GetSelectedEntryPos() );
         pBtnRemove->Disable();
     }
 }
@@ -490,7 +490,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void )
     else if ( (&rLb == pLbDataArea) || (&rLb == pLbDestArea) )
     {
         Edit*   pEd = (&rLb == pLbDataArea) ? pEdDataArea : pEdDestArea;
-        const sal_Int32 nSelPos = rLb.GetSelectEntryPos();
+        const sal_Int32 nSelPos = rLb.GetSelectedEntryPos();
 
         if (    pRangeUtil
             && (nSelPos > 0)
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index c981c14817e1..b7058d95a722 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -97,7 +97,7 @@ void ScDataPilotDatabaseDlg::dispose()
 
 void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc )
 {
-    const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos();
+    const sal_Int32 nSelect = m_pLbType->GetSelectedEntryPos();
 
     rDesc.aDBName = m_pLbDatabase->GetSelectedEntry();
     rDesc.aObject = m_pCbObject->GetText();
@@ -127,7 +127,7 @@ void ScDataPilotDatabaseDlg::FillObjects()
     if (aDatabaseName.isEmpty())
         return;
 
-    const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos();
+    const sal_Int32 nSelect = m_pLbType->GetSelectedEntryPos();
     if ( nSelect > DP_TYPELIST_QUERY )
         return;                                 // only tables and queries
 
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 81320c4c1da1..7a314a4cacc9 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -83,7 +83,7 @@ bool ScDataPilotSourceTypeDlg::IsNamedRange() const
 
 OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const
 {
-    const sal_Int32 nPos = m_pLbNamedRange->GetSelectEntryPos();
+    const sal_Int32 nPos = m_pLbNamedRange->GetSelectedEntryPos();
     return m_pLbNamedRange->GetEntry(nPos);
 }
 
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 02784428a192..2fa9c702f16f 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -323,21 +323,21 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
     pLbConnect1->Hide();
     // Disable/Enable Logic:
 
-       (pLbField1->GetSelectEntryPos() != 0)
-    && (pLbField2->GetSelectEntryPos() != 0)
+       (pLbField1->GetSelectedEntryPos() != 0)
+    && (pLbField2->GetSelectedEntryPos() != 0)
         ? pLbConnect2->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(1).eConnect )
         : pLbConnect2->SetNoSelection();
 
-       (pLbField2->GetSelectEntryPos() != 0)
-    && (pLbField3->GetSelectEntryPos() != 0)
+       (pLbField2->GetSelectedEntryPos() != 0)
+    && (pLbField3->GetSelectedEntryPos() != 0)
         ? pLbConnect3->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(2).eConnect )
         : pLbConnect3->SetNoSelection();
 
-       (pLbField3->GetSelectEntryPos() != 0)
-    && (pLbField4->GetSelectEntryPos() != 0)
+       (pLbField3->GetSelectedEntryPos() != 0)
+    && (pLbField4->GetSelectedEntryPos() != 0)
         ? pLbConnect4->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(3).eConnect )
         : pLbConnect4->SetNoSelection();
-    if ( pLbField1->GetSelectEntryPos() == 0 )
+    if ( pLbField1->GetSelectedEntryPos() == 0 )
     {
         pLbConnect2->Disable();
         pLbField2->Disable();
@@ -351,7 +351,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
         pEdVal2->Disable();
     }
 
-    if ( pLbField2->GetSelectEntryPos() == 0 )
+    if ( pLbField2->GetSelectedEntryPos() == 0 )
     {
         pLbConnect3->Disable();
         pLbField3->Disable();
@@ -364,7 +364,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
         pLbCond3->Disable();
         pEdVal3->Disable();
     }
-    if ( pLbField3->GetSelectEntryPos() == 0 )
+    if ( pLbField3->GetSelectedEntryPos() == 0 )
     {
         pLbConnect4->Disable();
         pLbField4->Disable();
@@ -466,7 +466,7 @@ void ScFilterDlg::UpdateValueList( size_t nList )
     if (pDoc && nList > 0 && nList <= QUERY_ENTRY_COUNT)
     {
         ComboBox*   pValList        = maValueEdArr[nList-1].get();
-        const sal_Int32 nFieldSelPos = maFieldLbArr[nList-1]->GetSelectEntryPos();
+        const sal_Int32 nFieldSelPos = maFieldLbArr[nList-1]->GetSelectedEntryPos();
         sal_Int32 nListPos = 0;
         OUString aCurValue = pValList->GetText();
 
@@ -561,7 +561,7 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList )
     if (nList == 0 || nList > QUERY_ENTRY_COUNT)
         return;
 
-    size_t nFieldSelPos = maFieldLbArr[nList-1]->GetSelectEntryPos();
+    size_t nFieldSelPos = maFieldLbArr[nList-1]->GetSelectedEntryPos();
     if (!nFieldSelPos)
         return;
 
@@ -739,7 +739,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
         pLbCond1->Enable();
         pEdVal1->Enable();
 
-        const sal_Int32 nConnect1 = pLbConnect1->GetSelectEntryPos();
+        const sal_Int32 nConnect1 = pLbConnect1->GetSelectedEntryPos();
         size_t nQE = nOffset;
         theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect1;
         if (maRefreshExceptQuery.size() < nQE + 1)
@@ -753,7 +753,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
         pLbCond2->Enable();
         pEdVal2->Enable();
 
-        const sal_Int32 nConnect2 = pLbConnect2->GetSelectEntryPos();
+        const sal_Int32 nConnect2 = pLbConnect2->GetSelectedEntryPos();
         size_t nQE = 1+nOffset;
         theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect2;
         if (maRefreshExceptQuery.size() < nQE + 1)
@@ -766,7 +766,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
         pLbCond3->Enable();
         pEdVal3->Enable();
 
-        const sal_Int32 nConnect3 = pLbConnect3->GetSelectEntryPos();
+        const sal_Int32 nConnect3 = pLbConnect3->GetSelectedEntryPos();
         size_t nQE = 2 + nOffset;
         theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect3;
         if (maRefreshExceptQuery.size() < nQE + 1)
@@ -780,7 +780,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
         pLbCond4->Enable();
         pEdVal4->Enable();
 
-        const sal_Int32 nConnect4 = pLbConnect4->GetSelectEntryPos();
+        const sal_Int32 nConnect4 = pLbConnect4->GetSelectedEntryPos();
         size_t nQE = 3 + nOffset;
         theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect4;
         if (maRefreshExceptQuery.size() < nQE + 1)
@@ -789,7 +789,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
     }
     else if ( &rLb == pLbField1 )
     {
-        if ( pLbField1->GetSelectEntryPos() == 0 )
+        if ( pLbField1->GetSelectedEntryPos() == 0 )
         {
             pLbConnect2->SetNoSelection();
             pLbConnect3->SetNoSelection();
@@ -836,13 +836,13 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
                 pLbConnect2->Enable();
             }
             theQueryData.GetEntry(nOffset).bDoQuery = true;
-            const sal_Int32 nField  = rLb.GetSelectEntryPos();
+            const sal_Int32 nField  = rLb.GetSelectedEntryPos();
             theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
         }
     }
     else if ( &rLb == pLbField2 )
     {
-        if ( pLbField2->GetSelectEntryPos() == 0 )
+        if ( pLbField2->GetSelectedEntryPos() == 0 )
         {
             pLbConnect3->SetNoSelection();
             pLbConnect4->SetNoSelection();
@@ -882,7 +882,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
             {
                 pLbConnect3->Enable();
             }
-            const sal_Int32 nField = rLb.GetSelectEntryPos();
+            const sal_Int32 nField = rLb.GetSelectedEntryPos();
             sal_uInt16 nQ=1+nOffset;
             theQueryData.GetEntry(nQ).bDoQuery = true;
             theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
@@ -890,7 +890,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
     }
     else if ( &rLb == pLbField3 )
     {
-        if ( pLbField3->GetSelectEntryPos() == 0 )
+        if ( pLbField3->GetSelectedEntryPos() == 0 )
         {
             pLbConnect4->SetNoSelection();
             pLbField4->SelectEntryPos( 0 );
@@ -923,7 +923,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
                 pLbConnect4->Enable();
             }
 
-            const sal_Int32 nField = rLb.GetSelectEntryPos();
+            const sal_Int32 nField = rLb.GetSelectedEntryPos();
             sal_uInt16 nQ=2+nOffset;
             theQueryData.GetEntry(nQ).bDoQuery = true;
             theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
@@ -932,7 +932,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
     }
     else if ( &rLb == pLbField4 )
     {
-        if ( pLbField4->GetSelectEntryPos() == 0 )
+        if ( pLbField4->GetSelectedEntryPos() == 0 )
         {
             ClearValueList( 4 );
             sal_uInt16 nTemp=nOffset+3;
@@ -950,7 +950,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
         else
         {
             UpdateValueList( 4 );
-            const sal_Int32 nField = rLb.GetSelectEntryPos();
+            const sal_Int32 nField = rLb.GetSelectedEntryPos();
             sal_uInt16 nQ=3+nOffset;
             theQueryData.GetEntry(nQ).bDoQuery = true;
             theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
@@ -959,22 +959,22 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void )
     }
     else if ( &rLb == pLbCond1)
     {
-        theQueryData.GetEntry(nOffset).eOp=(ScQueryOp)rLb.GetSelectEntryPos();
+        theQueryData.GetEntry(nOffset).eOp=(ScQueryOp)rLb.GetSelectedEntryPos();
     }
     else if ( &rLb == pLbCond2)
     {
         sal_uInt16 nQ=1+nOffset;
-        theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos();
+        theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectedEntryPos();
     }
     else if ( &rLb == pLbCond3)
     {
         sal_uInt16 nQ=2+nOffset;
-        theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos();
+        theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectedEntryPos();
     }
     else
     {
         sal_uInt16 nQ=3+nOffset;
-        theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos();
+        theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectedEntryPos();
     }
 }
 
@@ -988,10 +988,10 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, Button*, pBox, void )
 
     if ( pBox == pBtnHeader )              // Field list and value list
     {
-        const sal_Int32 nCurSel1 = pLbField1->GetSelectEntryPos();
-        const sal_Int32 nCurSel2 = pLbField2->GetSelectEntryPos();
-        const sal_Int32 nCurSel3 = pLbField3->GetSelectEntryPos();
-        const sal_Int32 nCurSel4 = pLbField4->GetSelectEntryPos();
+        const sal_Int32 nCurSel1 = pLbField1->GetSelectedEntryPos();
+        const sal_Int32 nCurSel2 = pLbField2->GetSelectedEntryPos();
+        const sal_Int32 nCurSel3 = pLbField3->GetSelectedEntryPos();
+        const sal_Int32 nCurSel4 = pLbField4->GetSelectedEntryPos();
         FillFieldLists();
         pLbField1->SelectEntryPos( nCurSel1 );
         pLbField2->SelectEntryPos( nCurSel2 );
@@ -1059,7 +1059,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, Edit&, rEd, void )
 
     ScQueryEntry& rEntry = theQueryData.GetEntry( nQE );
     ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
-    bool bDoThis = (pLbField->GetSelectEntryPos() != 0);
+    bool bDoThis = (pLbField->GetSelectedEntryPos() != 0);
     rEntry.bDoQuery = bDoThis;
 
     if ( rEntry.bDoQuery || maRefreshExceptQuery[nQE] )
@@ -1086,11 +1086,11 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, Edit&, rEd, void )
             rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString;
         }
 
-        const sal_Int32 nField = pLbField->GetSelectEntryPos();
+        const sal_Int32 nField = pLbField->GetSelectedEntryPos();
         rEntry.nField = nField ? (theQueryData.nCol1 +
             static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0);
 
-        ScQueryOp eOp  = (ScQueryOp)pLbCond->GetSelectEntryPos();
+        ScQueryOp eOp  = (ScQueryOp)pLbCond->GetSelectedEntryPos();
         rEntry.eOp     = eOp;
         if (maHasDates[nQE] && !bByEmptyOrNotByEmpty)
             rItem.meType = ScQueryEntry::ByDate;
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index deea6733f395..a492b92264d7 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -211,7 +211,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void )
     if ( &rLb == pLbCopyArea )
     {
         OUString aString;
-        const sal_Int32 nSelPos = pLbCopyArea->GetSelectEntryPos();
+        const sal_Int32 nSelPos = pLbCopyArea->GetSelectedEntryPos();
 
         if ( nSelPos > 0 )
             aString = *static_cast<OUString*>(pLbCopyArea->GetEntryData( nSelPos ));
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 37da46a92b63..523cb31ae075 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -211,17 +211,17 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
 
     // disable/enable logic:
 
-       (m_pLbField1->GetSelectEntryPos() != 0)
-    && (m_pLbField2->GetSelectEntryPos() != 0)
+       (m_pLbField1->GetSelectedEntryPos() != 0)
+    && (m_pLbField2->GetSelectedEntryPos() != 0)
         ? m_pLbConnect1->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(1).eConnect )
         : m_pLbConnect1->SetNoSelection();
 
-       (m_pLbField2->GetSelectEntryPos() != 0)
-    && (m_pLbField3->GetSelectEntryPos() != 0)
+       (m_pLbField2->GetSelectedEntryPos() != 0)
+    && (m_pLbField3->GetSelectedEntryPos() != 0)
         ? m_pLbConnect2->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(2).eConnect )
         : m_pLbConnect2->SetNoSelection();
 
-    if ( m_pLbField1->GetSelectEntryPos() == 0 )
+    if ( m_pLbField1->GetSelectedEntryPos() == 0 )
     {
         m_pLbConnect1->Disable();
         m_pLbField2->Disable();
@@ -235,7 +235,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
         m_pEdVal2->Disable();
     }
 
-    if ( m_pLbField2->GetSelectEntryPos() == 0 )
+    if ( m_pLbField2->GetSelectedEntryPos() == 0 )
     {
         m_pLbConnect2->Disable();
         m_pLbField3->Disable();
@@ -289,7 +289,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
     if ( pDoc && nList>0 && nList<=3 )
     {
         ComboBox*   pValList        = aValueEdArr[nList-1].get();
-        sal_Int32   nFieldSelPos    = aFieldLbArr[nList-1]->GetSelectEntryPos();
+        sal_Int32   nFieldSelPos    = aFieldLbArr[nList-1]->GetSelectedEntryPos();
         sal_Int32   nListPos        = 0;
         OUString    aCurValue       = pValList->GetText();
 
@@ -350,17 +350,17 @@ sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField )
 const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
 {
     ScQueryParam    theParam( theQueryData );
-    sal_Int32          nConnect1 = m_pLbConnect1->GetSelectEntryPos();
-    sal_Int32          nConnect2 = m_pLbConnect2->GetSelectEntryPos();
+    sal_Int32          nConnect1 = m_pLbConnect1->GetSelectedEntryPos();
+    sal_Int32          nConnect2 = m_pLbConnect2->GetSelectedEntryPos();
 
     svl::SharedStringPool& rPool = pViewData->GetDocument()->GetSharedStringPool();
 
     for ( SCSIZE i=0; i<3; i++ )
     {
-        const sal_Int32 nField = aFieldLbArr[i]->GetSelectEntryPos();
-        ScQueryOp   eOp     = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos();
+        const sal_Int32 nField = aFieldLbArr[i]->GetSelectedEntryPos();
+        ScQueryOp   eOp     = (ScQueryOp)aCondLbArr[i]->GetSelectedEntryPos();
 
-        bool bDoThis = (aFieldLbArr[i]->GetSelectEntryPos() != 0);
+        bool bDoThis = (aFieldLbArr[i]->GetSelectedEntryPos() != 0);
         theParam.GetEntry(i).bDoQuery = bDoThis;
 
         if ( bDoThis )
@@ -449,7 +449,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void )
     }
     else if (&rLb == m_pLbField1)
     {
-        if ( m_pLbField1->GetSelectEntryPos() == 0 )
+        if ( m_pLbField1->GetSelectedEntryPos() == 0 )
         {
             m_pLbConnect1->SetNoSelection();
             m_pLbConnect2->SetNoSelection();
@@ -481,7 +481,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void )
     }
     else if (&rLb == m_pLbField2)
     {
-        if ( m_pLbField2->GetSelectEntryPos() == 0 )
+        if ( m_pLbField2->GetSelectedEntryPos() == 0 )
         {
             m_pLbConnect2->SetNoSelection();
             m_pLbField3->SelectEntryPos( 0 );
@@ -505,7 +505,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void )
     }
     else if (&rLb == m_pLbField3)
     {
-        ( m_pLbField3->GetSelectEntryPos() == 0 )
+        ( m_pLbField3->GetSelectedEntryPos() == 0 )
             ? ClearValueList( 3 )
             : UpdateValueList( 3 );
     }
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 74e5f947e9c8..95060eeec84a 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -173,7 +173,7 @@ PivotFunc ScDPFunctionListBox::GetSelection() const
 {
     PivotFunc nFuncMask = PivotFunc::NONE;
     for( sal_Int32 nSel = 0, nCount = GetSelectEntryCount(); nSel < nCount; ++nSel )
-        nFuncMask |= spnFunctions[ GetSelectEntryPos( nSel ) ];
+        nFuncMask |= spnFunctions[ GetSelectedEntryPos( nSel ) ];
     return nFuncMask;
 }
 
@@ -239,7 +239,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const
     aRef.ReferenceType = mxLbTypeWrp->GetControlValue();
     aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectedEntry());
 
-    sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectEntryPos();
+    sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectedEntryPos();
     switch( nBaseItemPos )
     {
         case SC_BASEITEM_PREV_POS:
@@ -292,7 +292,7 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa
 
     // select base field
     mpLbBaseField->SelectEntry(aSelectedEntry);
-    if( mpLbBaseField->GetSelectEntryPos() >= mpLbBaseField->GetEntryCount() )
+    if( mpLbBaseField->GetSelectedEntryPos() >= mpLbBaseField->GetEntryCount() )
         mpLbBaseField->SelectEntryPos( 0 );
     SelectHdl( *mpLbBaseField.get() );    // fills base item list, selects base item
 
@@ -393,7 +393,7 @@ IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void )
 
         // update item list for current base field
         mbEmptyItem = false;
-        size_t nBasePos = mpLbBaseField->GetSelectEntryPos();
+        size_t nBasePos = mpLbBaseField->GetSelectedEntryPos();
         if( nBasePos < mrLabelVec.size() )
         {
             const vector<ScDPLabelData::Member>& rMembers = mrLabelVec[nBasePos]->maMembers;
@@ -605,7 +605,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
 
     if( m_pRbSortMan->IsChecked() )
         rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::MANUAL;
-    else if( m_pLbSortBy->GetSelectEntryPos() == SC_SORTNAME_POS )
+    else if( m_pLbSortBy->GetSelectedEntryPos() == SC_SORTNAME_POS )
         rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::NAME;
     else
         rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::DATA;
@@ -645,7 +645,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
 
     // *** HIERARCHY ***
 
-    rLabelData.mnUsedHier = m_pLbHierarchy->GetSelectEntryCount() ? m_pLbHierarchy->GetSelectEntryPos() : 0;
+    rLabelData.mnUsedHier = m_pLbHierarchy->GetSelectEntryCount() ? m_pLbHierarchy->GetSelectedEntryPos() : 0;
 }
 
 void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayout )
@@ -720,7 +720,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou
 
     // m_pLbShowUsing already filled above
     m_pLbShowUsing->SelectEntry( maLabelData.maShowInfo.DataField );
-    if( m_pLbShowUsing->GetSelectEntryPos() >= m_pLbShowUsing->GetEntryCount() )
+    if( m_pLbShowUsing->GetSelectedEntryPos() >= m_pLbShowUsing->GetEntryCount() )
         m_pLbShowUsing->SelectEntryPos( 0 );
 
     CheckHdl(m_pCbShow);      // enable/disable dependent controls
@@ -808,7 +808,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox&, rLBox, void )
 {
     if (&rLBox == m_pLbHierarchy)
     {
-        mrDPObj.GetMembers(maLabelData.mnCol, m_pLbHierarchy->GetSelectEntryPos(), maLabelData.maMembers);
+        mrDPObj.GetMembers(maLabelData.mnCol, m_pLbHierarchy->GetSelectedEntryPos(), maLabelData.maMembers);
         InitHideListBox();
     }
 }
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 7f9eac1ff9d9..e263298377be 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -596,7 +596,7 @@ void ScImportAsciiDlg::SaveParameters()
                      pCkbQuotedAsText->IsChecked(), pCkbDetectNumber->IsChecked(),
                      pRbFixed->IsChecked(),
                      static_cast<sal_Int32>(pNfRow->GetValue()),
-                     pLbCharSet->GetSelectEntryPos(),
+                     pLbCharSet->GetSelectedEntryPos(),
                      static_cast<sal_uInt16>(pLbCustomLang->GetSelectLanguage()), meCall );
 }
 
@@ -745,7 +745,7 @@ IMPL_LINK( ScImportAsciiDlg, FirstRowHdl, Edit&, rEdit, void )
 IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox&, rListBox, void )
 {
     if( &rListBox == pLbType )
-        mpTableBox->Execute( CSVCMD_SETCOLUMNTYPE, rListBox.GetSelectEntryPos() );
+        mpTableBox->Execute( CSVCMD_SETCOLUMNTYPE, rListBox.GetSelectedEntryPos() );
 }
 
 IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void)
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index a9bbf8b00443..72cccc163506 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -420,7 +420,7 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void )
     if ( &rLb == pLbFilterArea )
     {
         OUString  aString;
-        const sal_Int32 nSelPos = pLbFilterArea->GetSelectEntryPos();
+        const sal_Int32 nSelPos = pLbFilterArea->GetSelectedEntryPos();
 
         if ( nSelPos > 0 )
             aString = *static_cast<OUString*>(pLbFilterArea->GetEntryData( nSelPos ));
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 38c967f01610..cc62a5e1f839 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -190,7 +190,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ )
         // Enable or disable field depending on preceding Listbox selection
         maSortKeyItems[0]->EnableField();
         for ( sal_uInt16 i=1; i<nSortKeyCount; i++ )
-            if ( maSortKeyItems[i - 1]->m_pLbSort->GetSelectEntryPos() == 0 )
+            if ( maSortKeyItems[i - 1]->m_pLbSort->GetSelectedEntryPos() == 0 )
                 maSortKeyItems[i]->DisableField();
             else
                 maSortKeyItems[i]->EnableField();
@@ -226,7 +226,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ )
     }
 
     // Make sure that there is always a last undefined sort key
-    if ( maSortKeyItems[nSortKeyCount - 1]->m_pLbSort->GetSelectEntryPos() > 0 )
+    if ( maSortKeyItems[nSortKeyCount - 1]->m_pLbSort->GetSelectedEntryPos() > 0 )
         SetLastSortKey( nSortKeyCount );
 }
 
@@ -249,7 +249,7 @@ bool ScTabPageSortFields::FillItemSet( SfxItemSet* rArgSet )
 
     for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
     {
-        nSortPos.push_back( maSortKeyItems[i]->m_pLbSort->GetSelectEntryPos() );
+        nSortPos.push_back( maSortKeyItems[i]->m_pLbSort->GetSelectedEntryPos() );
 
         if ( nSortPos[i] == LISTBOX_ENTRY_NOTFOUND ) nSortPos[i] = 0;
     }
@@ -304,7 +304,7 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
         {
             std::vector<sal_uInt16> nCurSel;
             for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
-                nCurSel.push_back( maSortKeyItems[i]->m_pLbSort->GetSelectEntryPos() );
+                nCurSel.push_back( maSortKeyItems[i]->m_pLbSort->GetSelectedEntryPos() );
 
             bHasHeader  = pDlg->GetHeaders();
             bSortByRows = pDlg->GetByRows();
@@ -732,7 +732,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet )
     aNewSortData.nDestTab        = theOutPos.Tab();
     aNewSortData.bUserDef        = m_pBtnSortUser->IsChecked();
     aNewSortData.nUserIndex      = (m_pBtnSortUser->IsChecked())
-                                   ? m_pLbSortUser->GetSelectEntryPos()
+                                   ? m_pLbSortUser->GetSelectedEntryPos()
                                    : 0;
 
     // get locale
@@ -745,7 +745,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet )
     {
         uno::Sequence<OUString> aAlgos = pColWrap->listCollatorAlgorithms(
                 aNewSortData.aCollatorLocale );
-        const sal_Int32 nSel = m_pLbAlgorithm->GetSelectEntryPos();
+        const sal_Int32 nSel = m_pLbAlgorithm->GetSelectedEntryPos();
         if ( nSel < aAlgos.getLength() )
             sAlg = aAlgos[nSel];
     }
@@ -880,7 +880,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void )
     if (&rLb == m_pLbOutPos)
     {
         OUString  aString;
-        const sal_Int32 nSelPos = m_pLbOutPos->GetSelectEntryPos();
+        const sal_Int32 nSelPos = m_pLbOutPos->GetSelectedEntryPos();
 
         if ( nSelPos > 0 )
             aString = *static_cast<OUString*>(m_pLbOutPos->GetEntryData( nSelPos ));
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index bbc06737796b..8b23073925e3 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -200,7 +200,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16       nGroupNo,
 
     std::unique_ptr<ScSubTotalFunc[]> pFunctions;
     std::unique_ptr<SCCOL[]>          pSubTotals;
-    const sal_Int32 nGroup      = mpLbGroup->GetSelectEntryPos();
+    const sal_Int32 nGroup      = mpLbGroup->GetSelectedEntryPos();
     const sal_Int32 nEntryCount = mpLbColumns->GetEntryCount();
     const sal_Int32 nCheckCount = mpLbColumns->GetCheckedEntryCount();
 
@@ -356,8 +356,8 @@ void ScTpSubTotalGroup::SelectHdl(const void *pLb)
     if (   (mpLbColumns->GetEntryCount() > 0)
         && (mpLbColumns->GetSelectionCount() > 0) )
     {
-        const sal_Int32 nFunction   = mpLbFunctions->GetSelectEntryPos();
-        const sal_Int32 nColumn     = mpLbColumns->GetSelectEntryPos();
+        const sal_Int32 nFunction   = mpLbFunctions->GetSelectedEntryPos();
+        const sal_Int32 nColumn     = mpLbColumns->GetSelectedEntryPos();
         sal_uInt16*     pFunction   = static_cast<sal_uInt16*>(mpLbColumns->GetEntryData( nColumn ));
 
         OSL_ENSURE( pFunction, "EntryData not found!" );
@@ -548,7 +548,7 @@ bool ScTpSubTotalOptions::FillItemSet( SfxItemSet* rArgSet )
     theSubTotalData.bAscending      = pBtnAscending->IsChecked();
     theSubTotalData.bUserDef        = pBtnUserDef->IsChecked();
     theSubTotalData.nUserIndex      = (pBtnUserDef->IsChecked())
-                                    ? pLbUserDef->GetSelectEntryPos()
+                                    ? pLbUserDef->GetSelectedEntryPos()
                                     : 0;
 
     rArgSet->Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) );
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 59507799a2c9..4a3a32c99e64 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -465,9 +465,9 @@ bool ScTPValidationValue::FillItemSet( SfxItemSet* rArgSet )
         ValidListType::INVISIBLE;
 
     rArgSet->Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>(
-                    lclGetValModeFromPos( m_pLbAllow->GetSelectEntryPos() ) ) ) );
+                    lclGetValModeFromPos( m_pLbAllow->GetSelectedEntryPos() ) ) ) );
     rArgSet->Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>(
-                    lclGetCondModeFromPos( m_pLbValue->GetSelectEntryPos() ) ) ) );
+                    lclGetCondModeFromPos( m_pLbValue->GetSelectedEntryPos() ) ) ) );
     rArgSet->Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) );
     rArgSet->Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) );
     rArgSet->Put( SfxBoolItem( FID_VALID_BLANK, m_pCbAllow->IsChecked() ) );
@@ -478,7 +478,7 @@ bool ScTPValidationValue::FillItemSet( SfxItemSet* rArgSet )
 OUString ScTPValidationValue::GetFirstFormula() const
 {
     OUString aFmlaStr;
-    if( m_pLbAllow->GetSelectEntryPos() == SC_VALIDDLG_ALLOW_LIST )
+    if( m_pLbAllow->GetSelectedEntryPos() == SC_VALIDDLG_ALLOW_LIST )
         lclGetFormulaFromStringList( aFmlaStr, m_pEdList->GetText(), mcFmlaSep );
     else
         aFmlaStr = m_pEdMin->GetText();
@@ -494,7 +494,7 @@ void ScTPValidationValue::SetFirstFormula( const OUString& rFmlaStr )
 {
     // try if formula is a string list, validation mode must already be set
     OUString aStringList;
-    if( (m_pLbAllow->GetSelectEntryPos() == SC_VALIDDLG_ALLOW_RANGE) &&
+    if( (m_pLbAllow->GetSelectedEntryPos() == SC_VALIDDLG_ALLOW_RANGE) &&
         lclGetStringListFromFormula( aStringList, rFmlaStr, mcFmlaSep ) )
     {
         m_pEdList->SetText( aStringList );
@@ -583,7 +583,7 @@ void ScTPValidationValue::RemoveRefDlg()
 
 IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl, Control&, void)
 {
-    const sal_Int32 nPos = m_pLbAllow->GetSelectEntryPos();
+    const sal_Int32 nPos = m_pLbAllow->GetSelectedEntryPos();
 
     if ( nPos == SC_VALIDDLG_ALLOW_RANGE )
     {
@@ -605,7 +605,7 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Control&, rControl, void )
 
 IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, ListBox&, void)
 {
-    const sal_Int32 nLbPos = m_pLbAllow->GetSelectEntryPos();
+    const sal_Int32 nLbPos = m_pLbAllow->GetSelectedEntryPos();
     bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY);
     bool bRange = (nLbPos == SC_VALIDDLG_ALLOW_RANGE);
     bool bList = (nLbPos == SC_VALIDDLG_ALLOW_LIST);
@@ -626,7 +626,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, ListBox&, void)
         m_pFtMin->SetText( maStrList );
     else
     {
-        switch( m_pLbValue->GetSelectEntryPos() )
+        switch( m_pLbValue->GetSelectedEntryPos() )
         {
             case SC_VALIDDLG_DATA_EQUAL:
             case SC_VALIDDLG_DATA_NOTEQUAL:     m_pFtMin->SetText( maStrValue );  break;
@@ -823,7 +823,7 @@ void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
 bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet )
 {
     rArgSet->Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) );
-    rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) );
+    rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectedEntryPos() ) );
     rArgSet->Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) );
     rArgSet->Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) );
 
@@ -832,7 +832,7 @@ bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet )
 
 IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl, ListBox&, void)
 {
-    ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectEntryPos();
+    ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectedEntryPos();
     bool bMacro = ( eStyle == SC_VALERR_MACRO );
 
     m_pBtnSearch->Enable( bMacro );
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 5df386873520..27f8b7f14c00 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -133,7 +133,7 @@ void ScFunctionWin::InitLRUList()
     ScFunctionMgr* pFuncMgr = ScGlobal::GetStarCalcFunctionMgr();
     pFuncMgr->fillLastRecentlyUsedFunctions(aLRUList);
 
-    sal_Int32  nSelPos   = aCatBox->GetSelectEntryPos();
+    sal_Int32  nSelPos   = aCatBox->GetSelectedEntryPos();
 
     if(nSelPos == 0)
         UpdateFunctionList();
@@ -181,7 +181,7 @@ void ScFunctionWin::SetDescription()
     aFiFuncDesc->SetText( EMPTY_OUSTRING );
     const ScFuncDesc* pDesc =
              static_cast<const ScFuncDesc*>(aFuncList->GetEntryData(
-                    aFuncList->GetSelectEntryPos() ));
+                    aFuncList->GetSelectedEntryPos() ));
     if (pDesc)
     {
         pDesc->initArgumentInfo();      // full argument info is needed
@@ -216,7 +216,7 @@ void ScFunctionWin::SetDescription()
 
 void ScFunctionWin::UpdateFunctionList()
 {
-    sal_Int32  nSelPos   = aCatBox->GetSelectEntryPos();
+    sal_Int32  nSelPos   = aCatBox->GetSelectedEntryPos();
     sal_Int32  nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
                             ? (nSelPos-1) : 0;
 
@@ -302,7 +302,7 @@ void ScFunctionWin::DoEnter()
         }
         const ScFuncDesc* pDesc =
              static_cast<const ScFuncDesc*>(aFuncList->GetEntryData(
-                    aFuncList->GetSelectEntryPos() ));
+                    aFuncList->GetSelectedEntryPos() ));
         if (pDesc)
         {
             pFuncDesc=pDesc;
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index 6230b9d14176..dde157b1610e 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -48,7 +48,7 @@ public:
 
     sal_Int32 GetSelectEntryCount() const;
     OUString    GetSelectedEntry(sal_Int32 nPos) const;
-    sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const;
+    sal_Int32 GetSelectedEntryPos(sal_Int32 nPos) const;
 };
 
 #endif
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 94a3a2b0eb0c..fe7e8b63b51d 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -575,7 +575,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void)
 IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void)
 {
     OUString aRangeStr = pLbRange->GetSelectedEntry();
-    sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos();
+    sal_Int32 nSelectPos = pLbRange->GetSelectedEntryPos();
     bool bColName =
         (reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol);
     NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
@@ -633,7 +633,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void)
 // handler called when a row in the listbox is selected, updates form input fields
 IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void)
 {
-    sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos();
+    sal_Int32 nSelectPos = pLbRange->GetSelectedEntryPos();
     const sal_Int32 nCnt = pLbRange->GetEntryCount();
     sal_uInt16 nMoves = 0;
     while ( nSelectPos < nCnt
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index c19644070b04..ff531f6483c9 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -215,7 +215,7 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
         aStrCurSelTable = m_pLbTables->GetSelectedEntry();
         pStr = &aStrCurSelTable;
         if ( pN )
-            *pN = m_pLbTables->GetSelectEntryPos();
+            *pN = m_pLbTables->GetSelectedEntryPos();
         nSelTabIndex = 1;
     }
 
@@ -231,7 +231,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
         aStrCurSelTable = m_pLbTables->GetSelectedEntry( nSelTabIndex );
         pStr = &aStrCurSelTable;
         if ( pN )
-            *pN = m_pLbTables->GetSelectEntryPos( nSelTabIndex );
+            *pN = m_pLbTables->GetSelectedEntryPos( nSelTabIndex );
         nSelTabIndex++;
     }
 
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 820c4affe618..d57bb053c6b3 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -160,7 +160,7 @@ void ScMoveTableDlg::CheckNewTabName()
         return;
     }
 
-    bool bMoveInCurrentDoc = pBtnMove->IsChecked() && pLbDoc->GetSelectEntryPos() == mnCurrentDocPos;
+    bool bMoveInCurrentDoc = pBtnMove->IsChecked() && pLbDoc->GetSelectedEntryPos() == mnCurrentDocPos;
     bool bFound = false;
     const sal_Int32 nLast = pLbTable->GetEntryCount();
     for ( sal_Int32 i=0; i<nLast && !bFound; ++i )
@@ -191,7 +191,7 @@ void ScMoveTableDlg::CheckNewTabName()
 
 ScDocument* ScMoveTableDlg::GetSelectedDoc()
 {
-    sal_Int32 nPos = pLbDoc->GetSelectEntryPos();
+    sal_Int32 nPos = pLbDoc->GetSelectedEntryPos();
     return static_cast<ScDocument*>(pLbDoc->GetEntryData(nPos));
 }
 
@@ -258,9 +258,9 @@ IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, RadioButton&, rBtn, void )
 
 IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl, Button*, void)
 {
-    const sal_Int32 nDocSel  = pLbDoc->GetSelectEntryPos();
+    const sal_Int32 nDocSel  = pLbDoc->GetSelectedEntryPos();
     const sal_Int32 nDocLast = pLbDoc->GetEntryCount()-1;
-    const sal_Int32 nTabSel  = pLbTable->GetSelectEntryPos();
+    const sal_Int32 nTabSel  = pLbTable->GetSelectedEntryPos();
     const sal_Int32 nTabLast = pLbTable->GetEntryCount()-1;
 
     nDocument   = (nDocSel != nDocLast) ? nDocSel : SC_DOC_NEW;
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 7c7eb3fd5704..8f73855c3f60 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -456,7 +456,7 @@ void ScOptSolverDlg::ReadConditions()
         ScOptConditionRow aRowEntry;
         aRowEntry.aLeftStr = mpLeftEdit[nRow]->GetText();
         aRowEntry.aRightStr = mpRightEdit[nRow]->GetText();
-        aRowEntry.nOperator = mpOperator[nRow]->GetSelectEntryPos();
+        aRowEntry.nOperator = mpOperator[nRow]->GetSelectedEntryPos();
 
         long nVecPos = nScrollPos + nRow;
         if ( nVecPos >= (long)maConditions.size() && !aRowEntry.IsDefault() )
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 3105cdd84c23..ed337ffe6b05 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -395,7 +395,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, Button*, void)
 
 IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl, ListBox&, void)
 {
-    nIndex = m_pLbFormat->GetSelectEntryPos();
+    nIndex = m_pLbFormat->GetSelectedEntryPos();
     UpdateChecks();
 
     if ( nIndex == 0 )
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index b1b75f3b366e..c6f1949069a9 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -76,9 +76,9 @@ OUString ScShowTabDlg::GetSelectedEntry(sal_Int32 nPos) const
     return m_pLb->GetSelectedEntry(nPos);
 }
 
-sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const
+sal_Int32 ScShowTabDlg::GetSelectedEntryPos(sal_Int32 nPos) const
 {
-    return m_pLb->GetSelectEntryPos(nPos);
+    return m_pLb->GetSelectedEntryPos(nPos);
 }
 
 IMPL_LINK_NOARG(ScShowTabDlg, DblClkHdl, ListBox&, void)
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 52e8db05f0cd..ad3661c4dffc 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -364,7 +364,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, b
 
 IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl, ListBox&, void)
 {
-    const sal_Int32 nSelectPos = m_pLbEngine->GetSelectEntryPos();
+    const sal_Int32 nSelectPos = m_pLbEngine->GetSelectedEntryPos();
     if ( nSelectPos < maImplNames.getLength() )
     {
         OUString aNewEngine( maImplNames[nSelectPos] );
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index bd8175d056b3..7fcc391f7516 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -154,7 +154,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
 
 const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedScenarioEntry() const
 {
-    size_t nPos = GetSelectEntryPos();
+    size_t nPos = GetSelectedEntryPos();
     return (nPos < maEntries.size()) ? &maEntries[ nPos ] : nullptr;
 }
 
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 6d21cf1c7d08..bad8985794db 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -143,13 +143,13 @@ IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, Button*, pCheckBox, void )
 
 IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox&, rConv, void )
 {
-    maConfig.meStringConversion = (ScCalcConfig::StringConversion)rConv.GetSelectEntryPos();
+    maConfig.meStringConversion = (ScCalcConfig::StringConversion)rConv.GetSelectedEntryPos();
     CoupleEmptyAsZeroToStringConversion();
 }
 
 IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox&, rSyntax, void)
 {
-    maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.GetSelectEntryPos()));
+    maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.GetSelectedEntryPos()));
 }
 
 IMPL_LINK(ScCalcOptionsDialog, CurrentDocOnlyHdl, Button*, pCheckBox, void)
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 30c16b0b2ce3..c5f38a697fb0 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -44,7 +44,7 @@ bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs)
     {
         rCoreAttrs->Put(
             SfxUInt16Item(
-                SID_SC_OPT_KEY_BINDING_COMPAT, m_pLbKeyBindings->GetSelectEntryPos()));
+                SID_SC_OPT_KEY_BINDING_COMPAT, m_pLbKeyBindings->GetSelectedEntryPos()));
         bRet = true;
     }
     return bRet;
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 5aa63a7bacec..f47d17139d07 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -239,12 +239,12 @@ bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet)
     bool bRet = false;
     ScFormulaOptions aOpt;
     bool bEnglishFuncName = mpCbEnglishFuncName->IsChecked();
-    sal_Int16 aSyntaxPos      = mpLbFormulaSyntax->GetSelectEntryPos();
+    sal_Int16 aSyntaxPos      = mpLbFormulaSyntax->GetSelectedEntryPos();
     OUString aSep             = mpEdSepFuncArg->GetText();
     OUString aSepArrayCol     = mpEdSepArrayCol->GetText();
     OUString aSepArrayRow     = mpEdSepArrayRow->GetText();
-    sal_Int16 nOOXMLRecalcMode = mpLbOOXMLRecalcOptions->GetSelectEntryPos();
-    sal_Int16 nODFRecalcMode = mpLbODFRecalcOptions->GetSelectEntryPos();
+    sal_Int16 nOOXMLRecalcMode = mpLbOOXMLRecalcOptions->GetSelectedEntryPos();
+    sal_Int16 nODFRecalcMode = mpLbODFRecalcOptions->GetSelectedEntryPos();
 
     if (mpBtnCustomCalcDefault->IsChecked())
     {
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 229ea952fd2c..0ab4e71fa189 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -455,7 +455,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void )
 {
     if ( &rLb == mpLbLists )
     {
-        sal_Int32 nSelPos = mpLbLists->GetSelectEntryPos();
+        sal_Int32 nSelPos = mpLbLists->GetSelectedEntryPos();
         if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
         {
             if ( !mpFtEntries->IsEnabled() )  mpFtEntries->Enable();
@@ -479,7 +479,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
         if ( !bCancelMode )
         {
             nCancelPos = ( mpLbLists->GetEntryCount() > 0 )
-                            ? mpLbLists->GetSelectEntryPos()
+                            ? mpLbLists->GetSelectedEntryPos()
                             : 0;
             mpLbLists->SetNoSelection();
             mpFtLists->Disable();
@@ -568,7 +568,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
         }
         else // if ( bModifyMode )
         {
-            sal_Int32 nSelList = mpLbLists->GetSelectEntryPos();
+            sal_Int32 nSelList = mpLbLists->GetSelectedEntryPos();
 
             OSL_ENSURE( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" );
 
@@ -608,7 +608,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
     {
         if ( mpLbLists->GetEntryCount() > 0 )
         {
-            sal_Int32 nRemovePos   = mpLbLists->GetSelectEntryPos();
+            sal_Int32 nRemovePos   = mpLbLists->GetSelectedEntryPos();
             OUString aMsg = aStrQueryRemove.getToken( 0, '#' )
                           + mpLbLists->GetEntry( nRemovePos )
                           + aStrQueryRemove.getToken( 1, '#' );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 4e4d0b6b622c..b4250fb477bc 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -247,7 +247,7 @@ DeactivateRC ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
 
 IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void )
 {
-    const sal_Int32 nSelPos = rLb.GetSelectEntryPos();
+    const sal_Int32 nSelPos = rLb.GetSelectedEntryPos();
     ScVObjMode  eMode   = ScVObjMode(nSelPos);
     ScVObjType  eType   = VOBJ_TYPE_OLE;
 
@@ -317,7 +317,7 @@ void ScTpContentOptions::InitGridOpt()
 
 IMPL_LINK( ScTpContentOptions, GridHdl, ListBox&, rLb, void )
 {
-    sal_Int32   nSelPos = rLb.GetSelectEntryPos();
+    sal_Int32   nSelPos = rLb.GetSelectedEntryPos();
     bool    bGrid = ( nSelPos <= 1 );
     bool    bGridOnTop = ( nSelPos == 1 );
 
@@ -423,7 +423,7 @@ VclPtr<SfxTabPage> ScTpLayoutOptions::Create( vcl::Window*          pParent,
 bool    ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet )
 {
     bool bRet = true;
-    const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos();
+    const sal_Int32 nMPos = m_pUnitLB->GetSelectedEntryPos();
     if ( m_pUnitLB->IsValueChangedFromSaved() )
     {
         sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pUnitLB->GetEntryData( nMPos ));
@@ -467,7 +467,7 @@ bool    ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet )
 
     if(m_pAlignLB->IsValueChangedFromSaved())
     {
-        rCoreSet->Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos()));
+        rCoreSet->Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectedEntryPos()));
         bRet = true;
     }
 
@@ -636,7 +636,7 @@ DeactivateRC ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
 
 IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl, ListBox&, void)
 {
-    const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos();
+    const sal_Int32 nMPos = m_pUnitLB->GetSelectedEntryPos();
     if(nMPos != LISTBOX_ENTRY_NOTFOUND)
     {
         FieldUnit eFieldUnit = (FieldUnit)reinterpret_cast<sal_IntPtr>(m_pUnitLB->GetEntryData( nMPos ));
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 7cc054ced048..9626d22e33a1 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -481,7 +481,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void )
             // Printing area changed?
 
             // first try the list box, if "Entire sheet" is selected
-            bool bEntireSheet = (pLbPrintArea->GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE);
+            bool bEntireSheet = (pLbPrintArea->GetSelectedEntryPos() == SC_AREASDLG_PR_ENTIRE);
             SfxBoolItem aEntireSheet( FN_PARAM_4, bEntireSheet );
 
             bool bDataChanged = bEntireSheet != pDoc->IsPrintEntireSheet( nCurTab );
@@ -540,7 +540,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control&, rCtrl, void )
 IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void )
 {
     ListBox* pLb = &rLb;
-    const sal_Int32 nSelPos = pLb->GetSelectEntryPos();
+    const sal_Int32 nSelPos = pLb->GetSelectedEntryPos();
     Edit* pEd = nullptr;
 
     // list box positions of specific entries, default to "repeat row/column" list boxes
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 5965e048bb5e..67155250f87e 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -759,7 +759,7 @@ IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void )
 {
     if ( &rList == m_pLbDefined )
     {
-        ScHFEntryId eSel = static_cast<ScHFEntryId>(m_pLbDefined->GetSelectEntryPos());
+        ScHFEntryId eSel = static_cast<ScHFEntryId>(m_pLbDefined->GetSelectedEntryPos());
         if(!m_pLbDefined->IsTravelSelect())
         {
             ProcessDefinedListSel(eSel, false);
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index fab08754d31e..b596d2d4368f 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -384,13 +384,13 @@ IMPL_LINK( ScTablePage, PageNoHdl, Button*, pBtn, void )
 IMPL_LINK_NOARG(ScTablePage, ScaleHdl, ListBox&, void)
 {
     // controls for Box "Reduce/enlarge"
-    m_pBxScaleAll->Show(m_pLbScaleMode->GetSelectEntryPos() == SC_TPTABLE_SCALE_PERCENT);
+    m_pBxScaleAll->Show(m_pLbScaleMode->GetSelectedEntryPos() == SC_TPTABLE_SCALE_PERCENT);
 
     // controls for Grid "Scale to width/height"
-    m_pGrHeightWidth->Show(m_pLbScaleMode->GetSelectEntryPos() == SC_TPTABLE_SCALE_TO);
+    m_pGrHeightWidth->Show(m_pLbScaleMode->GetSelectedEntryPos() == SC_TPTABLE_SCALE_TO);
 
     // controls for Box "Scale to pages"
-    m_pBxScalePageNum->Show(m_pLbScaleMode->GetSelectEntryPos() == SC_TPTABLE_SCALE_TO_PAGES);
+    m_pBxScalePageNum->Show(m_pLbScaleMode->GetSelectedEntryPos() == SC_TPTABLE_SCALE_TO_PAGES);
 }
 
 // Helper functions for FillItemSet:
@@ -439,7 +439,7 @@ static bool lcl_PutScaleItem( sal_uInt16               nWhich,
                       const SpinField&      rEd,
                       sal_uInt16                nValue )
 {
-    bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
+    bool bIsSel = (rListBox.GetSelectedEntryPos() == nLBEntry);
     bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
                         rEd.IsValueChangedFromSaved() ||
                         !WAS_DEFAULT( nWhich, rOldSet );
@@ -462,7 +462,7 @@ static bool lcl_PutScaleItem2( sal_uInt16               nWhich,
 {
     sal_uInt16 nValue1 = (sal_uInt16)rEd1.GetValue();
     sal_uInt16 nValue2 = (sal_uInt16)rEd2.GetValue();
-    bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
+    bool bIsSel = (rListBox.GetSelectedEntryPos() == nLBEntry);
     bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
                         rEd1.IsValueChangedFromSaved() ||
                         rEd2.IsValueChangedFromSaved() ||
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index e39d6f74431d..89210a7a53a3 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -104,7 +104,7 @@ void NumberFormatPropertyPanel::Initialize()
 
 IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void )
 {
-    const sal_Int32 nVal = rBox.GetSelectEntryPos();
+    const sal_Int32 nVal = rBox.GetSelectedEntryPos();
     if( nVal != mnCategorySelected )
     {
         SfxUInt16Item aItem( SID_NUMBER_TYPE_FORMAT,  nVal );
@@ -268,7 +268,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
             else if ( mpBtnEngineering->IsVisible() )
                 mpBtnEngineering->Check(bThousand);
             mpBtnNegRed->Check(bNegRed);
-            if ( mpLbCategory->GetSelectEntryPos() == 0 )
+            if ( mpLbCategory->GetSelectedEntryPos() == 0 )
                 mpEdDecimals->SetText(""); // tdf#44399
             else if ( mpEdDecimals->IsVisible() )
                 mpEdDecimals->SetValue(nPrecision);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b8ce47a144b2..7103511ced7b 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -255,7 +255,7 @@ void ScFilterListBox::dispose()
 
 void ScFilterListBox::EndInit()
 {
-    sal_Int32 nPos = GetSelectEntryPos();
+    sal_Int32 nPos = GetSelectedEntryPos();
     if ( LISTBOX_ENTRY_NOTFOUND == nPos )
         nSel = 0;
     else
@@ -300,7 +300,7 @@ void ScFilterListBox::SelectHdl()
 {
     if ( !IsTravelSelect() && !bInit && !bCancelled )
     {
-        sal_Int32 nPos = GetSelectEntryPos();
+        sal_Int32 nPos = GetSelectedEntryPos();
         if ( LISTBOX_ENTRY_NOTFOUND != nPos )
         {
             nSel = nPos;
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 36dc62070d65..1787232f057f 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -870,7 +870,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 {
                     const sal_Int32 nSelCount = pDlg->GetSelectEntryCount();
                     for( sal_Int32 nSelIx = 0; nSelIx < nSelCount; ++nSelIx )
-                        aIndexList.insert( aIndexList.begin()+nSelIx, pDlg->GetSelectEntryPos( nSelIx ) );
+                        aIndexList.insert( aIndexList.begin()+nSelIx, pDlg->GetSelectedEntryPos( nSelIx ) );
                     pDlg.disposeAndClear();
                     rReq.AppendItem( SfxIntegerListItem( SID_SELECT_TABLES, aIndexList ) );
                 }