Rename GetSelectEntryPos -> GetSelectedEntryPos

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

accessibility/inc/helper/IComboListBoxHelper.hxx

@@ -55,7 +55,7 @@ namespace accessibility
         virtual void            SelectEntryPos( sal_Int32  nPos, bool bSelect = true ) = 0;
         virtual sal_Int32       GetSelectEntryCount() const = 0;
         virtual void            SetNoSelection() = 0;
-        virtual sal_Int32       GetSelectEntryPos( sal_Int32  nSelIndex ) const = 0;
+        virtual sal_Int32       GetSelectedEntryPos( sal_Int32  nSelIndex ) const = 0;
         virtual bool            IsInDropDown() const = 0;
         virtual tools::Rectangle       GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
         virtual long            GetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0;

accessibility/inc/helper/listboxhelper.hxx

@@ -147,9 +147,9 @@ public:
         m_aComboListBox.SetNoSelection();
     }
 
-    virtual sal_Int32       GetSelectEntryPos( sal_Int32  nSelIndex = 0 ) const override
+    virtual sal_Int32       GetSelectedEntryPos( sal_Int32  nSelIndex = 0 ) const override
     {
-        return m_aComboListBox.GetSelectEntryPos(nSelIndex);
+        return m_aComboListBox.GetSelectedEntryPos(nSelIndex);
     }
 
     virtual bool            IsInDropDown() const override

accessibility/source/standard/vclxaccessiblelist.cxx

@@ -90,7 +90,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
     UpdateVisibleLineCount();
     if(m_pListBoxHelper)
     {
-        m_nCurSelectedPos=m_pListBoxHelper->GetSelectEntryPos(0);
+        m_nCurSelectedPos=m_pListBoxHelper->GetSelectedEntryPos(0);
     }
     sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount());
     m_aAccessibleChildren.reserve(nCount);
@@ -330,7 +330,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
                     {
                         uno::Any    aOldValue,
                                     aNewValue;
-                        sal_Int32 nPos = m_nCurSelectedPos; //m_pListBoxHelper->GetSelectEntryPos();
+                        sal_Int32 nPos = m_nCurSelectedPos; //m_pListBoxHelper->GetSelectedEntryPos();
 
                         if ( nPos == LISTBOX_ENTRY_NOTFOUND )
                             nPos = m_pListBoxHelper->GetTopEntry();
@@ -831,7 +831,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild
     if ( m_pListBoxHelper )
     {
         checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,true);
-        return getAccessibleChild( m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) );
+        return getAccessibleChild( m_pListBoxHelper->GetSelectedEntryPos( (sal_uInt16)nSelectedChildIndex ) );
     }
 
     return nullptr;

avmedia/source/framework/mediacontrol.cxx

@@ -327,7 +327,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox&, p, void )
     MediaItem aExecItem;
     css::media::ZoomLevel eLevel;
 
-    switch( p.GetSelectEntryPos() )
+    switch( p.GetSelectedEntryPos() )
     {
         case AVMEDIA_ZOOMLEVEL_50: eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break;
         case AVMEDIA_ZOOMLEVEL_100: eLevel = css::media::ZoomLevel_ORIGINAL; break;

basctl/source/basicide/basicbox.cxx

@@ -300,7 +300,7 @@ void LibBox::Select()
 
 void LibBox::NotifyIDE()
 {
-    sal_Int32 nSelPos = GetSelectEntryPos();
+    sal_Int32 nSelPos = GetSelectedEntryPos();
     if (LibEntry* pEntry = static_cast<LibEntry*>(GetEntryData(nSelPos)))
     {
         ScriptDocument aDocument( pEntry->GetDocument() );

basctl/source/basicide/baside2b.cxx

@@ -2696,7 +2696,7 @@ void CodeCompleteListBox::KeyInput( const KeyEvent& rKeyEvt )
                 OUString sTypedText = pCodeCompleteWindow->pParent->GetEditEngine()->GetText(aTextSelection);
                 if( !aFuncBuffer.isEmpty() )
                 {
-                    sal_Int32 nInd = GetSelectEntryPos();
+                    sal_Int32 nInd = GetSelectedEntryPos();
                     if( nInd != LISTBOX_ENTRY_NOTFOUND )
                     {//if there is something selected
                         bool bFound = false;

basctl/source/basicide/moduldl2.cxx

@@ -1388,7 +1388,7 @@ void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocati
 
 void LibPage::SetCurLib()
 {
-    const sal_Int32 nSelPos = m_pBasicsBox->GetSelectEntryPos();
+    const sal_Int32 nSelPos = m_pBasicsBox->GetSelectedEntryPos();
     DocumentEntry* pEntry = static_cast<DocumentEntry*>(m_pBasicsBox->GetEntryData( nSelPos ));
     if ( pEntry )
     {

basctl/source/dlged/managelang.cxx

@@ -167,12 +167,12 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void)
     if ( aQBox->Execute() == RET_OK )
     {
         sal_Int32 nCount = m_pLanguageLB->GetSelectEntryCount();
-        sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos();
+        sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos();
         // remove locales
         Sequence< Locale > aLocaleSeq( nCount );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            const sal_Int32 nSelPos = m_pLanguageLB->GetSelectEntryPos(i);
+            const sal_Int32 nSelPos = m_pLanguageLB->GetSelectedEntryPos(i);
             LanguageEntry* pEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nSelPos ));
             if ( pEntry )
                 aLocaleSeq[i] = pEntry->m_aLocale;
@@ -192,7 +192,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void)
 
 IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl, Button*, void)
 {
-    const sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos();
+    const sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos();
     LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos ));
     if ( pSelectEntry && !pSelectEntry->m_bIsDefault )
     {
@@ -212,7 +212,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, ListBox&, void)
     const sal_Int32 nCount = m_pLanguageLB->GetEntryCount();
     bool bEmpty = ( !nCount ||
                     m_pLanguageLB->GetEntryPos( m_sCreateLangStr ) != LISTBOX_ENTRY_NOTFOUND );
-    bool bSelect = ( m_pLanguageLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND );
+    bool bSelect = ( m_pLanguageLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND );
     bool bEnable = !bEmpty && bSelect;
 
     m_pDeletePB->Enable(bEnable);

chart2/source/controller/dialogs/res_BarGeometry.cxx

@@ -49,9 +49,9 @@ sal_Int32 BarGeometryResources::GetSelectEntryCount() const
     return m_pLB_Geometry->GetSelectEntryCount();
 }
 
-sal_Int32 BarGeometryResources::GetSelectEntryPos() const
+sal_Int32 BarGeometryResources::GetSelectedEntryPos() const
 {
-    return m_pLB_Geometry->GetSelectEntryPos();
+    return m_pLB_Geometry->GetSelectedEntryPos();
 }
 
 void BarGeometryResources::SelectEntryPos(sal_Int32 nPos)

chart2/source/controller/dialogs/res_BarGeometry.hxx

@@ -35,7 +35,7 @@ public:
     void Enable( bool bEnable );
 
     sal_Int32 GetSelectEntryCount() const;
-    sal_Int32 GetSelectEntryPos() const;
+    sal_Int32 GetSelectedEntryPos() const;
     void SelectEntryPos(sal_Int32 nPos);
 
     void SetSelectHdl( const Link<ListBox&,void>& rLink );

chart2/source/controller/dialogs/res_DataLabel.cxx

@@ -295,10 +295,10 @@ bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const
     if( m_pCBWrapText->GetState()!= TRISTATE_INDET )
         rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_WRAP_TEXT, m_pCBWrapText->IsChecked()) );
 
-    OUString aSep = our_aLBEntryMap[m_pLB_Separator->GetSelectEntryPos()];
+    OUString aSep = our_aLBEntryMap[m_pLB_Separator->GetSelectedEntryPos()];
     rOutAttrs->Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) );
 
-    std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) );
+    std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectedEntryPos()) );
     if(aIt!=m_aListBoxToPlacementMap.end())
     {
         sal_Int32 nValue = aIt->second;

chart2/source/controller/dialogs/res_ErrorBar.cxx

@@ -254,7 +254,7 @@ void ErrorBarResources::UpdateControlStates()
     // unit for metric fields
     bool bIsErrorMargin(
         ( m_pRbFunction->IsChecked()) &&
-        ( m_pLbFunction->GetSelectEntryPos() == CHART_LB_FUNCTION_ERROR_MARGIN ));
+        ( m_pLbFunction->GetSelectedEntryPos() == CHART_LB_FUNCTION_ERROR_MARGIN ));
     bool bIsPercentage( m_pRbPercent->IsChecked() || bIsErrorMargin );
     FieldUnit eFieldUnit = FUNIT_NONE;
 
@@ -308,7 +308,7 @@ void ErrorBarResources::UpdateControlStates()
     }
 
     // all functions except error margin take no arguments
-    if( m_pRbFunction->IsChecked() &&  ( m_pLbFunction->GetSelectEntryPos() != CHART_LB_FUNCTION_ERROR_MARGIN ))
+    if( m_pRbFunction->IsChecked() &&  ( m_pLbFunction->GetSelectedEntryPos() != CHART_LB_FUNCTION_ERROR_MARGIN ))
     {
         bPosEnabled = false;
         bNegEnabled = false;
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, Button*, void )
     {
         if( m_pLbFunction->GetSelectEntryCount() == 1 )
         {
-            switch( m_pLbFunction->GetSelectEntryPos())
+            switch( m_pLbFunction->GetSelectedEntryPos())
             {
                 case CHART_LB_FUNCTION_STD_ERROR:
                     m_eErrorKind = SvxChartKindError::StdError; break;

chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx

@@ -302,9 +302,9 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void)
 
         uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( m_xChartModel ) );
 
-        if( m_pLB_Scheme->GetSelectEntryPos() == POS_3DSCHEME_REALISTIC )
+        if( m_pLB_Scheme->GetSelectedEntryPos() == POS_3DSCHEME_REALISTIC )
             ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic );
-        else if( m_pLB_Scheme->GetSelectEntryPos() == POS_3DSCHEME_SIMPLE )
+        else if( m_pLB_Scheme->GetSelectedEntryPos() == POS_3DSCHEME_SIMPLE )
             ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Simple );
         else
         {

chart2/source/controller/dialogs/tp_AxisPositions.cxx

@@ -116,18 +116,18 @@ VclPtr<SfxTabPage> AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxIt
 bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
 {
     // axis line
-    sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
+    sal_Int32 nPos = m_pLB_CrossesAt->GetSelectedEntryPos();
     rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 ));
     if( nPos==2 )
     {
         double fCrossover = m_pED_CrossesAt->GetValue();
         if( m_bCrossingAxisIsCategoryAxis )
-            fCrossover = m_pED_CrossesAtCategory->GetSelectEntryPos()+1;
+            fCrossover = m_pED_CrossesAtCategory->GetSelectedEntryPos()+1;
         rOutAttrs->Put(SvxDoubleItem(fCrossover,SCHATTR_AXIS_POSITION_VALUE));
     }
 
     // labels
-    sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos();
+    sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectedEntryPos();
     if( nLabelPos != LISTBOX_ENTRY_NOTFOUND )
         rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos ));
 
@@ -147,7 +147,7 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks));
     rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks));
 
-    sal_Int32 nMarkPos = m_pLB_PlaceTicks->GetSelectEntryPos();
+    sal_Int32 nMarkPos = m_pLB_PlaceTicks->GetSelectedEntryPos();
     if( nMarkPos != LISTBOX_ENTRY_NOTFOUND )
         rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos ));
 
@@ -315,7 +315,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning
 
 IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
 {
-    sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
+    sal_Int32 nPos = m_pLB_CrossesAt->GetSelectedEntryPos();
     m_pED_CrossesAt->Show( (nPos==2) && !m_bCrossingAxisIsCategoryAxis );
     m_pED_CrossesAtCategory->Show( (nPos==2) && m_bCrossingAxisIsCategoryAxis );
 
@@ -329,12 +329,12 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
 
 IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void)
 {
-    sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos();
+    sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectedEntryPos();
 
     bool bEnableTickmarkPlacement = (nLabelPos>1);
     if( bEnableTickmarkPlacement )
     {
-        sal_Int32 nAxisPos = m_pLB_CrossesAt->GetSelectEntryPos();
+        sal_Int32 nAxisPos = m_pLB_CrossesAt->GetSelectedEntryPos();
         if( nLabelPos-2 == nAxisPos )
             bEnableTickmarkPlacement=false;
     }

chart2/source/controller/dialogs/tp_ChartType.cxx

@@ -95,7 +95,7 @@ void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter& rParameter
 void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter )
 {
     rParameter.b3DLook = m_pCB_3DLook->IsChecked();
-    const sal_Int32 nPos = m_pLB_Scheme->GetSelectEntryPos();
+    const sal_Int32 nPos = m_pLB_Scheme->GetSelectedEntryPos();
     if( nPos == POS_3DSCHEME_SIMPLE )
         rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
     else if( nPos == POS_3DSCHEME_REALISTIC )
@@ -366,16 +366,16 @@ void SplinePropertiesDialog::fillControls( const ChartTypeParameter& rParameter
     m_pMF_SplineResolution->SetValue( rParameter.nCurveResolution );
 
     //dis/enabling
-    m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS);
-    m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS);
+    m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS);
+    m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS);
 }
 void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines )
 {
     if(!bSmoothLines)
         rParameter.eCurveStyle=CurveStyle_LINES;
-    else if(m_pLB_Spline_Type->GetSelectEntryPos() == CUBIC_SPLINE_POS)
+    else if(m_pLB_Spline_Type->GetSelectedEntryPos() == CUBIC_SPLINE_POS)
         rParameter.eCurveStyle=CurveStyle_CUBIC_SPLINES;
-    else if(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS)
+    else if(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS)
         rParameter.eCurveStyle=CurveStyle_B_SPLINES;
 
     rParameter.nCurveResolution = static_cast< sal_Int32 >( m_pMF_SplineResolution->GetValue());
@@ -383,8 +383,8 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool
 }
 IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void)
 {
-    m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS);
-    m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS);
+    m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS);
+    m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS);
 }
 
 class SteppedPropertiesDialog : public ModalDialog
@@ -551,7 +551,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter )
 }
 void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter )
 {
-    switch (m_pLB_LineType->GetSelectEntryPos())
+    switch (m_pLB_LineType->GetSelectedEntryPos())
     {
         case POS_LINETYPE_SMOOTH:
             getSplinePropertiesDialog().fillParameter( rParameter, true );
@@ -573,9 +573,9 @@ IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void)
 {
 
     ChartTypeParameter aOldParameter;
-    getSplinePropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectEntryPos() == POS_LINETYPE_SMOOTH );
+    getSplinePropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectedEntryPos() == POS_LINETYPE_SMOOTH );
 
-    const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos();
+    const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectedEntryPos();
     m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH);
     if( getSplinePropertiesDialog().Execute() == RET_OK )
     {
@@ -593,9 +593,9 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void)
 {
 
     ChartTypeParameter aOldParameter;
-    getSteppedPropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectEntryPos() == POS_LINETYPE_STEPPED );
+    getSteppedPropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectedEntryPos() == POS_LINETYPE_STEPPED );
 
-    const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos();
+    const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectedEntryPos();
     m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED);
     if( getSteppedPropertiesDialog().Execute() == RET_OK )
     {
@@ -650,7 +650,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter )
 {
     rParameter.nGeometry3D = 1;
     if( m_aGeometryResources.GetSelectEntryCount() )
-        rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos();
+        rParameter.nGeometry3D = m_aGeometryResources.GetSelectedEntryPos();
 }
 
 IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void)
@@ -847,7 +847,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType()
 {
     ChartTypeDialogController* pTypeController = nullptr;
     std::vector< ChartTypeDialogController* >::size_type nM = static_cast< std::vector< ChartTypeDialogController* >::size_type >(
-        m_pMainTypeList->GetSelectEntryPos() );
+        m_pMainTypeList->GetSelectedEntryPos() );
     if( nM<m_aChartTypeDialogControllerList.size() )
         pTypeController = m_aChartTypeDialogControllerList[nM];
     return pTypeController;

chart2/source/controller/dialogs/tp_PointGeometry.cxx

@@ -62,7 +62,7 @@ bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     {
         long nSegs=32;
 
-        long nShape = m_pGeometryResources->GetSelectEntryPos();
+        long nShape = m_pGeometryResources->GetSelectedEntryPos();
         if(nShape==CHART_SHAPE3D_PYRAMID)
             nSegs=4;
 

chart2/source/controller/dialogs/tp_Scale.cxx

@@ -254,7 +254,7 @@ enum AxisTypeListBoxEntry
 
 IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void)
 {
-    const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos();
+    const sal_Int32 nPos = m_pLB_AxisType->GetSelectedEntryPos();
     if( nPos==TYPE_DATE )
         m_nAxisType = chart2::AxisType::DATE;
     else
@@ -276,7 +276,7 @@ bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
 
     rOutAttrs->Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType));
     if(m_bAllowDateAxis)
-        rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, m_pLB_AxisType->GetSelectEntryPos()==TYPE_AUTO));
+        rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, m_pLB_AxisType->GetSelectedEntryPos()==TYPE_AUTO));
 
     bool bAutoScale = false;
     if( m_nAxisType==chart2::AxisType::CATEGORY )
@@ -438,9 +438,9 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
     fOrigin = m_pFmtFldOrigin->GetValue();
     fStepMain = bDateAxis ? m_pMt_MainDateStep->GetValue() : m_pFmtFldStepMain->GetValue();
     nStepHelp = static_cast< sal_Int32 >( m_pMtStepHelp->GetValue());
-    m_nTimeResolution = m_pLB_TimeResolution->GetSelectEntryPos();
-    m_nMainTimeUnit = m_pLB_MainTimeUnit->GetSelectEntryPos();
-    m_nHelpTimeUnit = m_pLB_HelpTimeUnit->GetSelectEntryPos();
+    m_nTimeResolution = m_pLB_TimeResolution->GetSelectedEntryPos();
+    m_nMainTimeUnit = m_pLB_MainTimeUnit->GetSelectedEntryPos();
+    m_nHelpTimeUnit = m_pLB_HelpTimeUnit->GetSelectedEntryPos();
 
     if( m_nAxisType != chart2::AxisType::REALNUMBER )
         m_pCbxLogarithm->Show( false );

chart2/source/controller/main/ElementSelector.cxx

@@ -187,7 +187,7 @@ void SelectorListBox::Select()
 
     if ( !IsTravelSelect() )
     {
-        const sal_Int32 nPos = GetSelectEntryPos();
+        const sal_Int32 nPos = GetSelectedEntryPos();
         if( static_cast<size_t>(nPos) < m_aEntries.size() )
         {
             ObjectIdentifier aOID = m_aEntries[nPos].OID;

chart2/source/controller/sidebar/ChartAxisPanel.cxx

@@ -374,7 +374,7 @@ IMPL_LINK(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void)
 IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl, ListBox&, void)
 {
     OUString aCID = getCID(mxModel);
-    sal_Int32 nPos = mpLBLabelPos->GetSelectEntryPos();
+    sal_Int32 nPos = mpLBLabelPos->GetSelectedEntryPos();
 
     setLabelPosition(mxModel, aCID, nPos);
 }

chart2/source/controller/sidebar/ChartElementsPanel.cxx

@@ -579,7 +579,7 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void)
 
 IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl, ListBox&, void)
 {
-    sal_Int32 nPos = mpLBLegendPosition->GetSelectEntryPos();
+    sal_Int32 nPos = mpLBLegendPosition->GetSelectedEntryPos();
     setLegendPos(mxModel, nPos);
 }
 

chart2/source/controller/sidebar/ChartErrorBarPanel.cxx

@@ -419,7 +419,7 @@ IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void)
 IMPL_LINK_NOARG(ChartErrorBarPanel, ListBoxHdl, ListBox&, void)
 {
     OUString aCID = getCID(mxModel);
-    sal_Int32 nPos = mpLBType->GetSelectEntryPos();
+    sal_Int32 nPos = mpLBType->GetSelectedEntryPos();
 
     setTypePos(mxModel, aCID, nPos);
 }

chart2/source/controller/sidebar/ChartSeriesPanel.cxx

@@ -478,7 +478,7 @@ IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl, ListBox&, void)
 {
     OUString aCID = getCID(mxModel);
 
-    sal_Int32 nPos = mpLBLabelPlacement->GetSelectEntryPos();
+    sal_Int32 nPos = mpLBLabelPlacement->GetSelectedEntryPos();
     setDataLabelPlacement(mxModel, aCID, nPos);
 }
 

cui/source/customize/SvxMenuConfigPage.cxx

@@ -282,7 +282,7 @@ short SvxMenuConfigPage::QueryReset()
     OUString msg = CuiResId( RID_SVXSTR_CONFIRM_MENU_RESET );
 
     OUString saveInName = m_pSaveInListBox->GetEntry(
-        m_pSaveInListBox->GetSelectEntryPos() );
+        m_pSaveInListBox->GetSelectedEntryPos() );
 
     OUString label = SvxConfigPageHelper::replaceSaveInName( msg, saveInName );
 
@@ -457,7 +457,7 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, ResetMenuHdl, Button *, void )
     // So we are resetting only if it is a context menu
     if (!m_bIsMenuBar && qbox->Execute() == RET_YES)
     {
-        sal_Int32 nPos = m_pTopLevelListBox->GetSelectEntryPos();
+        sal_Int32 nPos = m_pTopLevelListBox->GetSelectedEntryPos();
         ContextMenuSaveInData* pSaveInData = static_cast< ContextMenuSaveInData* >(GetSaveInData());
 
         pSaveInData->ResetContextMenu(pMenuData);

cui/source/customize/SvxToolbarConfigPage.cxx

@@ -194,7 +194,7 @@ void SvxToolbarConfigPage::dispose()
 
 void SvxToolbarConfigPage::DeleteSelectedTopLevel()
 {
-    const sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+    const sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos();
     ToolbarSaveInData* pSaveInData = static_cast<ToolbarSaveInData*>( GetSaveInData() );
     pSaveInData->RemoveToolbar( GetTopLevelSelection() );
 
@@ -361,14 +361,14 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, AddToolbarHdl, Button *, void )
     }
 
     pNameDialog->m_pSaveInListBox->SelectEntryPos(
-        m_pSaveInListBox->GetSelectEntryPos() );
+        m_pSaveInListBox->GetSelectedEntryPos() );
 
     if ( pNameDialog->Execute() == RET_OK )
     {
         aNewName = pNameDialog->GetName();
 
         // Where to save the new toolbar? (i.e. Modulewise or documentwise)
-        sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos();
+        sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectedEntryPos();
 
         ToolbarSaveInData* pData =
             static_cast<ToolbarSaveInData*>(
@@ -678,7 +678,7 @@ IMPL_LINK( SvxToolbarConfigPage, ModifyItemHdl, MenuButton *, pButton, void )
 
 IMPL_LINK_NOARG( SvxToolbarConfigPage, ResetToolbarHdl, Button *, void )
 {
-    sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+    sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos();
 
     SvxConfigEntry* pToolbar =
         static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos ));
@@ -719,7 +719,7 @@ short SvxToolbarConfigPage::QueryReset()
     OUString msg = CuiResId( RID_SVXSTR_CONFIRM_TOOLBAR_RESET );
 
     OUString saveInName = m_pSaveInListBox->GetEntry(
-        m_pSaveInListBox->GetSelectEntryPos() );
+        m_pSaveInListBox->GetSelectedEntryPos() );
 
     OUString label = SvxConfigPageHelper::replaceSaveInName( msg, saveInName );
 

cui/source/customize/cfg.cxx

@@ -1529,14 +1529,14 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* )
 IMPL_LINK_NOARG( SvxConfigPage, SelectSaveInLocation, ListBox&, void )
 {
     pCurrentSaveInData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData(
-            m_pSaveInListBox->GetSelectEntryPos()));
+            m_pSaveInListBox->GetSelectedEntryPos()));
 
     Init();
 }
 
 void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry const * pToSelect )
 {
-    sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
+    sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos();
     m_pTopLevelListBox->Clear();
 
     if ( GetSaveInData() && GetSaveInData()->GetEntries() )

cui/source/customize/eventdlg.cxx

@@ -166,7 +166,7 @@ void SvxEventConfigPage::ImplInitDocument()
 IMPL_LINK_NOARG( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void )
 {
     bool* bApp = static_cast<bool*>(m_pSaveInListBox->GetEntryData(
-            m_pSaveInListBox->GetSelectEntryPos()));
+            m_pSaveInListBox->GetSelectedEntryPos()));
 
     mpImpl->pEventLB->SetUpdateMode( false );
     if ( *bApp )

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<sal_uLong>(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<const Subset*> (m_pSubsetLB->GetEntryData(nPos));
     if( pSubset && !isSearchMode)
     {

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)