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>

14 files changed, 71 insertions, 71 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 217c5cd4c2ec..bdceafff015e 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -954,7 +954,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, Button *, pButton, void )
         if(pPage1_Designs->GetSelectEntryCount() == 0)
             pPage1_Designs->SelectEntryPos(0);
 
-        const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
+        const sal_Int32 nPos = pPage1_Designs->GetSelectedEntryPos();
         m_pDesign = &m_aDesignList[nPos];
         DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)");
 
@@ -966,7 +966,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, Button *, pButton, void )
 // Clickhandler for the choice of one design
 IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
 {
-    const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
+    const sal_Int32 nPos = pPage1_Designs->GetSelectedEntryPos();
     m_pDesign = &m_aDesignList[nPos];
     DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)");
 
@@ -979,7 +979,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
 // Clickhandler for the delete of one design
 IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl, Button*, void)
 {
-    const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
+    const sal_Int32 nPos = pPage1_Designs->GetSelectedEntryPos();
 
     std::vector<SdPublishingDesign>::iterator iter = m_aDesignList.begin()+nPos;
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index e8b332424b1c..4aacf99a6bc6 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -171,7 +171,7 @@ PresetPropertyBox::~PresetPropertyBox()
 
 Any PresetPropertyBox::getValue()
 {
-    return makeAny( maPropertyValues[mpControl->GetSelectEntryPos()] );
+    return makeAny( maPropertyValues[mpControl->GetSelectedEntryPos()] );
 }
 
 Control* PresetPropertyBox::getControl()
@@ -1258,18 +1258,18 @@ void CustomAnimationEffectTabPage::dispose()
 
 void CustomAnimationEffectTabPage::updateControlStates()
 {
-    sal_Int32 nPos = mpLBAfterEffect->GetSelectEntryPos();
+    sal_Int32 nPos = mpLBAfterEffect->GetSelectedEntryPos();
     mpCLBDimColor->Enable( nPos == 1 );
     mpFTDimColor->Enable( nPos == 1 );
 
     if( mbHasText )
     {
-        nPos = mpLBTextAnim->GetSelectEntryPos();
+        nPos = mpLBTextAnim->GetSelectedEntryPos();
         mpMFTextDelay->Enable( nPos != 0 );
         mpFTTextDelay->Enable( nPos != 0 );
     }
 
-    nPos = mpLBSound->GetSelectEntryPos();
+    nPos = mpLBSound->GetSelectedEntryPos();
     mpPBSoundPreview->Enable( nPos >= 2 );
 }
 
@@ -1291,7 +1291,7 @@ void CustomAnimationEffectTabPage::implHdl(Control const * pControl )
     }
     else if( pControl == mpLBSound )
     {
-        sal_Int32 nPos = mpLBSound->GetSelectEntryPos();
+        sal_Int32 nPos = mpLBSound->GetSelectedEntryPos();
         if( nPos == (mpLBSound->GetEntryCount() - 1) )
         {
             openSoundFileDialog();
@@ -1345,7 +1345,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleDecelerate, makeAny( fTemp ) );
     }
 
-    sal_Int32 nPos = mpLBAfterEffect->GetSelectEntryPos();
+    sal_Int32 nPos = mpLBAfterEffect->GetSelectedEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         bool bAfterEffect = nPos != 0;
@@ -1381,7 +1381,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleAfterEffectOnNextEffect, makeAny( bAfterEffectOnNextEffect ) );
     }
 
-    nPos = mpLBTextAnim->GetSelectEntryPos();
+    nPos = mpLBTextAnim->GetSelectedEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         sal_Int16 nIterateType;
@@ -1414,7 +1414,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleIterateInterval, makeAny( fIterateInterval ) );
     }
 
-    nPos = mpLBSound->GetSelectEntryPos();
+    nPos = mpLBSound->GetSelectedEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         Any aNewSoundURL, aOldSoundURL( makeAny( (sal_Int32) 0 ) );
@@ -1532,7 +1532,7 @@ void CustomAnimationEffectTabPage::openSoundFileDialog()
 
 void CustomAnimationEffectTabPage::onSoundPreview()
 {
-    const sal_Int32 nPos = mpLBSound->GetSelectEntryPos();
+    const sal_Int32 nPos = mpLBSound->GetSelectedEntryPos();
 
     if( nPos >= 2 ) try
     {
@@ -1797,7 +1797,7 @@ void CustomAnimationDurationTabPage::implHdl( Control const * pControl )
 
 void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
 {
-    sal_Int32 nPos = mpLBStart->GetSelectEntryPos();
+    sal_Int32 nPos = mpLBStart->GetSelectedEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         sal_Int16 nStart;
@@ -1829,7 +1829,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleBegin, makeAny( fBegin ) );
     }
 
-    nPos = mpCBRepeat->GetSelectEntryPos();
+    nPos = mpCBRepeat->GetSelectedEntryPos();
     if( (nPos != LISTBOX_ENTRY_NOTFOUND) || (!mpCBRepeat->GetText().isEmpty()) )
     {
         Any aRepeatCount;
@@ -1916,7 +1916,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
 
     if( mpRBInteractive->IsChecked() )
     {
-        nPos = mpLBTrigger->GetSelectEntryPos();
+        nPos = mpLBTrigger->GetSelectedEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             sal_Int32 nShape = (sal_Int32)reinterpret_cast<sal_IntPtr>(mpLBTrigger->GetEntryData( nPos ));
@@ -2065,7 +2065,7 @@ void CustomAnimationTextAnimTabPage::dispose()
 
 void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
 {
-    sal_Int32 nPos = maLBGroupText->GetSelectEntryPos();
+    sal_Int32 nPos = maLBGroupText->GetSelectedEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         sal_Int32 nTextGrouping = nPos - 1;
@@ -2119,7 +2119,7 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
 
 void CustomAnimationTextAnimTabPage::updateControlStates()
 {
-    sal_Int32 nPos = maLBGroupText->GetSelectEntryPos();
+    sal_Int32 nPos = maLBGroupText->GetSelectedEntryPos();
 
     maCBXGroupAuto->Enable( nPos > 1 );
     maMFGroupAuto->Enable( nPos > 1 );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index b0f8e63faed7..84044c0f1642 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1910,7 +1910,7 @@ void CustomAnimationPane::onChangeStart()
     if( mpLBStart->GetSelectEntryCount() == 1 )
     {
         sal_Int16 nNodeType;
-        switch( mpLBStart->GetSelectEntryPos() )
+        switch( mpLBStart->GetSelectedEntryPos() )
         {
         case 0: nNodeType = EffectNodeType::ON_CLICK; break;
         case 1: nNodeType = EffectNodeType::WITH_PREVIOUS; break;
@@ -1994,9 +1994,9 @@ PathKind CustomAnimationPane::getCreatePathKind() const
     PathKind eKind = PathKind::NONE;
 
     if( ( mpLBAnimation->GetSelectEntryCount() == 1 ) &&
-        ( mpLBCategory->GetSelectEntryPos() == mnMotionPathPos ) )
+        ( mpLBCategory->GetSelectedEntryPos() == mnMotionPathPos ) )
     {
-        const sal_Int32 nPos = mpLBAnimation->GetSelectEntryPos();
+        const sal_Int32 nPos = mpLBAnimation->GetSelectedEntryPos();
         if( nPos == mnCurvePathPos )
         {
             eKind = PathKind::CURVE;
@@ -2190,7 +2190,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, DurationModifiedHdl, Edit&, void)
 sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText )
 {
     PresetCategoryList rCategoryList;
-    sal_uInt16 nPosition = mpLBCategory->GetSelectEntryPos();
+    sal_uInt16 nPosition = mpLBCategory->GetSelectedEntryPos();
     const CustomAnimationPresets& rPresets (getPresets());
     switch(nPosition)
     {
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 2d9c135fbf6f..41262c6118e6 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -303,7 +303,7 @@ OUString lcl_getSoundFileURL(
 {
     if( rListBox->GetSelectEntryCount() > 0 )
     {
-        sal_Int32 nPos = rListBox->GetSelectEntryPos();
+        sal_Int32 nPos = rListBox->GetSelectedEntryPos();
         // the first three entries are no actual sounds
         if( nPos >= 3 )
         {
@@ -700,7 +700,7 @@ void SlideTransitionPane::updateControlState()
     mpLB_VARIANT->Enable( mbHasSelection && mpLB_VARIANT->GetEntryCount() > 0 );
     mpCBX_duration->Enable( mbHasSelection );
     mpLB_SOUND->Enable( mbHasSelection );
-    mpCB_LOOP_SOUND->Enable( mbHasSelection && (mpLB_SOUND->GetSelectEntryPos() > 2));
+    mpCB_LOOP_SOUND->Enable( mbHasSelection && (mpLB_SOUND->GetSelectedEntryPos() > 2));
     mpRB_ADVANCE_ON_MOUSE->Enable( mbHasSelection );
     mpRB_ADVANCE_AUTO->Enable( mbHasSelection );
     mpMF_ADVANCE_AUTO_AFTER->Enable( mbHasSelection && mpRB_ADVANCE_AUTO->IsChecked());
@@ -728,7 +728,7 @@ void SlideTransitionPane::openSoundFileDialog()
     SdOpenSoundFileDialog aFileDialog(this);
 
     OUString aFile;
-    DBG_ASSERT( mpLB_SOUND->GetSelectEntryPos() == 2,
+    DBG_ASSERT( mpLB_SOUND->GetSelectedEntryPos() == 2,
                 "Dialog should only open when \"Other sound\" is selected" );
     aFile = SvtPathOptions().GetWorkPath();
 
@@ -805,7 +805,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
         auto aSelected = rPresetList.begin();
         std::advance( aSelected, mpVS_TRANSITION_ICONS->GetSelectItemId() - 1);
 
-        if( mpLB_VARIANT->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
+        if( mpLB_VARIANT->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND )
         {
             // Transition with just one effect.
             aResult = impl::TransitionEffect( **aSelected );
@@ -819,7 +819,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
             {
                 if( aIter->getSetId() == (*aSelected)->getSetId() )
                 {
-                    if( mpLB_VARIANT->GetSelectEntryPos() == nVariant)
+                    if( mpLB_VARIANT->GetSelectedEntryPos() == nVariant)
                     {
                         aResult = impl::TransitionEffect( *aIter );
                         aResult.setAllAmbiguous();
@@ -877,7 +877,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
         maCurrentSoundFile.clear();
         if( mpLB_SOUND->GetSelectEntryCount() > 0 )
         {
-            sal_Int32 nPos = mpLB_SOUND->GetSelectEntryPos();
+            sal_Int32 nPos = mpLB_SOUND->GetSelectedEntryPos();
             aResult.mbStopSound = nPos == 1;
             aResult.mbSoundOn = nPos > 1;
             if( aResult.mbStopSound )
@@ -1119,7 +1119,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected, ListBox&, void)
 {
     if( mpLB_SOUND->GetSelectEntryCount() )
     {
-        sal_Int32 nPos = mpLB_SOUND->GetSelectEntryPos();
+        sal_Int32 nPos = mpLB_SOUND->GetSelectedEntryPos();
         if( nPos == 2 )
         {
             // other sound...
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 29ba1d004a84..878384019d89 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -128,7 +128,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
         const AutoLayout aAutoLayout(bCreateCaptions ? AUTOLAYOUT_TITLE_ONLY : AUTOLAYOUT_NONE);
 
         // get the option
-        const sal_Int32 nOpt = pInsTypeCombo->GetSelectEntryPos();
+        const sal_Int32 nOpt = pInsTypeCombo->GetSelectedEntryPos();
         if ( nOpt == ONE_IMAGE )
         {
             OUString sUrl;
@@ -540,10 +540,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void)
 
 IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl, Button*, void)
 {
-    if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND
-        && pImagesLst->GetSelectEntryPos() != 0)
+    if (pImagesLst->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND
+        && pImagesLst->GetSelectedEntryPos() != 0)
     {
-        const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos();
+        const sal_Int32 nActPos = pImagesLst->GetSelectedEntryPos();
         OUString sActEntry( pImagesLst->GetEntry(nActPos) );
         // actual data
         OUString* pActData = static_cast<OUString*>(pImagesLst->GetEntryData(nActPos));
@@ -571,7 +571,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl, Button*, void)
 
 IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void)
 {
-    const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos();
+    const sal_Int32 nActPos = pImagesLst->GetSelectedEntryPos();
     if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
     {
         OUString sActEntry( pImagesLst->GetSelectedEntry() );
@@ -599,7 +599,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void)
 
 IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl, Button*, void)
 {
-    pImagesLst->RemoveEntry( pImagesLst->GetSelectEntryPos() );
+    pImagesLst->RemoveEntry( pImagesLst->GetSelectedEntryPos() );
     pImg->SetImage(Image());
 
     EnableDisableButtons();
@@ -666,7 +666,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, TypeSelectHdl, ListBox&, void)
 {
     // Enable "Fill Slide" only for one image
     // If we want to have it for other images too, we need to implement the actual cropping.
-    bool const bEnable = pInsTypeCombo->GetSelectEntryPos() == ONE_IMAGE;
+    bool const bEnable = pInsTypeCombo->GetSelectedEntryPos() == ONE_IMAGE;
     pASRCheckCrop->Enable(bEnable);
     if (!bEnable)
         pASRCheckCrop->Check(false);
@@ -806,9 +806,9 @@ void SdPhotoAlbumDialog::EnableDisableButtons()
 {
     pRemoveBtn->Enable(pImagesLst->GetSelectEntryCount() > 0);
     pUpBtn->Enable(pImagesLst->GetSelectEntryCount() > 0 &&
-                   pImagesLst->GetSelectEntryPos() != 0);
+                   pImagesLst->GetSelectedEntryPos() != 0);
     pDownBtn->Enable(pImagesLst->GetSelectEntryCount() > 0 &&
-                     pImagesLst->GetSelectEntryPos() < pImagesLst->GetEntryCount()-1);
+                     pImagesLst->GetSelectedEntryPos() < pImagesLst->GetEntryCount()-1);
 }
 
 } // end of namespace sd
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index eaf00a4d3551..853f7720f5bd 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -894,7 +894,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
     const Point         aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) );
     const OutputDevice* pDefDev = Application::GetDefaultDevice();
     const size_t nCount = m_FrameList.size();
-    BitmapAdjustment    eBA = (BitmapAdjustment) m_pLbAdjustment->GetSelectEntryPos();
+    BitmapAdjustment    eBA = (BitmapAdjustment) m_pLbAdjustment->GetSelectedEntryPos();
 
     // find biggest bitmap
     for (size_t i = 0; i < nCount; ++i)
@@ -981,7 +981,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
             // find LoopCount (number of passes)
             AnimationBitmap aAnimBmp;
             sal_uInt32 nLoopCount = 0;
-            sal_Int32 nPos = m_pLbLoopCount->GetSelectEntryPos();
+            sal_Int32 nPos = m_pLbLoopCount->GetSelectedEntryPos();
 
             if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbLoopCount->GetEntryCount() - 1 ) // endless
                 nLoopCount = m_pLbLoopCount->GetSelectedEntry().toUInt32();
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 69cfb59a782b..55d7bd97c0cb 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -104,7 +104,7 @@ void SdCustomShowDlg::dispose()
 
 void SdCustomShowDlg::CheckState()
 {
-    sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos();
+    sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos();
 
     bool bEnable = nPos != LISTBOX_ENTRY_NOTFOUND;
     m_pBtnEdit->Enable( bEnable );
@@ -155,7 +155,7 @@ void SdCustomShowDlg::SelectHdl(void const *p)
     // edit CustomShow
     else if( p == m_pBtnEdit )
     {
-        sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos();
+        sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             DBG_ASSERT( pCustomShowList, "pCustomShowList does not exist" );
@@ -180,7 +180,7 @@ void SdCustomShowDlg::SelectHdl(void const *p)
     // delete CustomShow
     else if( p == m_pBtnRemove )
     {
-        sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos();
+        sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             delete (*pCustomShowList)[nPos];
@@ -193,7 +193,7 @@ void SdCustomShowDlg::SelectHdl(void const *p)
     // copy CustomShow
     else if( p == m_pBtnCopy )
     {
-        sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos();
+        sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             SdCustomShow* pShow = new SdCustomShow( *(*pCustomShowList)[nPos] );
@@ -251,7 +251,7 @@ void SdCustomShowDlg::SelectHdl(void const *p)
     }
     else if( p == m_pLbCustomShows )
     {
-        sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos();
+        sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
             pCustomShowList->Seek( nPos );
 
@@ -372,8 +372,8 @@ void SdDefineCustomShowDlg::dispose()
 // CheckState
 void SdDefineCustomShowDlg::CheckState()
 {
-    bool bPages = m_pLbPages->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND;
-    //sal_Bool bCSPages = aLbCustomPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND;
+    bool bPages = m_pLbPages->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND;
+    //sal_Bool bCSPages = aLbCustomPages.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND;
     bool bCSPages = m_pLbCustomPages->FirstSelected() != nullptr;
     bool bCount = m_pLbCustomPages->GetEntryCount() > 0;
 
@@ -419,7 +419,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void const * p)
 
                 m_pLbCustomPages->Select( pEntry );
                 SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) m_pLbPages->
-                                    GetSelectEntryPos( i ), PageKind::Standard );
+                                    GetSelectedEntryPos( i ), PageKind::Standard );
                 pEntry->SetUserData( pPage );
 
                 if( nPosCP != TREELIST_APPEND )
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 726a852f1305..362c2f3123f6 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -91,7 +91,7 @@ SvxFieldData* SdModifyFieldDlg::GetField()
             else
                 eType = SvxDateType::Var;
 
-            eFormat = (SvxDateFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 );
+            eFormat = (SvxDateFormat) ( m_pLbFormat->GetSelectedEntryPos() + 2 );
 
             pNewField = new SvxDateField( *pDateField );
             static_cast<SvxDateField*>( pNewField )->SetType( eType );
@@ -108,7 +108,7 @@ SvxFieldData* SdModifyFieldDlg::GetField()
             else
                 eType = SvxTimeType::Var;
 
-            eFormat = (SvxTimeFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 );
+            eFormat = (SvxTimeFormat) ( m_pLbFormat->GetSelectedEntryPos() + 2 );
 
             pNewField = new SvxExtTimeField( *pTimeField );
             static_cast<SvxExtTimeField*>( pNewField )->SetType( eType );
@@ -125,7 +125,7 @@ SvxFieldData* SdModifyFieldDlg::GetField()
             else
                 eType = SvxFileType::Var;
 
-            eFormat = (SvxFileFormat) ( m_pLbFormat->GetSelectEntryPos() );
+            eFormat = (SvxFileFormat) ( m_pLbFormat->GetSelectedEntryPos() );
 
             ::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell* >(SfxObjectShell::Current() );
 
@@ -153,7 +153,7 @@ SvxFieldData* SdModifyFieldDlg::GetField()
             else
                 eType = SvxAuthorType::Var;
 
-            eFormat = (SvxAuthorFormat) ( m_pLbFormat->GetSelectEntryPos() );
+            eFormat = (SvxAuthorFormat) ( m_pLbFormat->GetSelectedEntryPos() );
 
             // Get current state of address, not the old one
             SvtUserOptions aUserOptions;
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index f8954dc56cd4..8d03a31403d9 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -71,7 +71,7 @@ GlueEscDirLB::~GlueEscDirLB()
  */
 void GlueEscDirLB::Select()
 {
-    sal_Int32 nPos = GetSelectEntryPos();
+    sal_Int32 nPos = GetSelectedEntryPos();
     SfxUInt16Item aItem( SID_GLUE_ESCDIR, static_cast<sal_uInt16>(aEscDirArray[ nPos ]) );
 
     if ( m_xFrame.is() )
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index e3f405695030..e8ad17bac65c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -308,7 +308,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
 
 IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
 {
-    if( !mbDocImported || maLbDocs->GetSelectEntryPos() != 0 )
+    if( !mbDocImported || maLbDocs->GetSelectedEntryPos() != 0 )
     {
         NavDocInfo* pInfo = GetDocInfo();
 
@@ -346,7 +346,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
 IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, ListBox&, void)
 {
     OUString aStrLb = maLbDocs->GetSelectedEntry();
-    long   nPos = maLbDocs->GetSelectEntryPos();
+    long   nPos = maLbDocs->GetSelectedEntryPos();
     bool   bFound = false;
     ::sd::DrawDocShell* pDocShell = nullptr;
     NavDocInfo* pInfo = GetDocInfo();
@@ -555,7 +555,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
     }
     else
     {
-        nPos = maLbDocs->GetSelectEntryPos();
+        nPos = maLbDocs->GetSelectedEntryPos();
         if( nPos == LISTBOX_ENTRY_NOTFOUND )
             nPos = 0;
 
@@ -644,7 +644,7 @@ OUString SdNavigatorWin::GetDragTypeSdBmpId(NavigatorDragType eDT)
 
 NavDocInfo* SdNavigatorWin::GetDocInfo()
 {
-    sal_uInt32 nPos = maLbDocs->GetSelectEntryPos();
+    sal_uInt32 nPos = maLbDocs->GetSelectedEntryPos();
 
     if( mbDocImported )
     {
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index d6087bfacdf6..497d1492edb6 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -306,11 +306,11 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
     rAttr.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause->GetTime().GetMSFromTime() / 1000 ) );
     rAttr.Put( SfxBoolItem ( ATTR_PRESENT_SHOW_PAUSELOGO, aCbxAutoLogo->IsChecked() ) );
 
-    sal_Int32 nPos = maLBMonitor->GetSelectEntryPos();
+    sal_Int32 nPos = maLBMonitor->GetSelectedEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
         rAttr.Put( SfxInt32Item ( ATTR_PRESENT_DISPLAY, (sal_Int32)reinterpret_cast<sal_IntPtr>(maLBMonitor->GetEntryData(nPos))) );
 
-    nPos = aLbCustomshow->GetSelectEntryPos();
+    nPos = aLbCustomshow->GetSelectedEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
         pCustomShowList->Seek( nPos );
 }
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 55afea747209..88450b79c0ce 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -704,7 +704,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void)
 presentation::ClickAction SdTPAction::GetActualClickAction()
 {
     presentation::ClickAction eCA = presentation::ClickAction_NONE;
-    sal_Int32 nPos = m_pLbAction->GetSelectEntryPos();
+    sal_Int32 nPos = m_pLbAction->GetSelectedEntryPos();
 
     if (nPos != LISTBOX_ENTRY_NOTFOUND && static_cast<size_t>(nPos) < maCurrentActions.size())
         eCA = maCurrentActions[ nPos ];
@@ -793,7 +793,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination )
             break;
         case presentation::ClickAction_VERB:
             {
-                const sal_Int32 nPos = m_pLbOLEAction->GetSelectEntryPos();
+                const sal_Int32 nPos = m_pLbOLEAction->GetSelectedEntryPos();
                 if( static_cast<size_t>(nPos) < aVerbVector.size() )
                     aStr = OUString::number( aVerbVector[ nPos ] );
                 return aStr;
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 2bcaa84bb585..f2e4615fdacb 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -414,7 +414,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs )
     }
 
     // metric
-    const sal_Int32 nMPos = m_pLbMetric->GetSelectEntryPos();
+    const sal_Int32 nMPos = m_pLbMetric->GetSelectedEntryPos();
     if ( m_pLbMetric->IsValueChangedFromSaved() )
     {
         sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pLbMetric->GetEntryData( nMPos ));
@@ -530,7 +530,7 @@ VclPtr<SfxTabPage> SdTpOptionsMisc::Create( vcl::Window* pWindow,
 
 IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void)
 {
-    sal_Int32 nPos = m_pLbMetric->GetSelectEntryPos();
+    sal_Int32 nPos = m_pLbMetric->GetSelectedEntryPos();
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 8a521fcb0577..82e0fc8e7bb6 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -289,7 +289,7 @@ void SlideBackground::HandleContextChange(
 
 void SlideBackground::Update()
 {
-    const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectEntryPos();
+    const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectedEntryPos();
 
     SfxObjectShell* pSh = SfxObjectShell::Current();
     if (!pSh)
@@ -759,7 +759,7 @@ void SlideBackground::NotifyItemUpdate(
             if (pSizeItem)
             {
                 Size aPaperSize = pSizeItem->GetSize();
-                if(mpPaperOrientation->GetSelectEntryPos() == 0)
+                if(mpPaperOrientation->GetSelectedEntryPos() == 0)
                    Swap(aPaperSize);
 
                 Paper ePaper = SvxPaperInfo::GetSvxPaper(aPaperSize, meUnit, true);
@@ -877,7 +877,7 @@ void SlideBackground::SetMetricFieldMaxValues( const Size& rPageSize )
 
 IMPL_LINK_NOARG(SlideBackground, FillStyleModifyHdl, ListBox&, void)
 {
-    const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectEntryPos();
+    const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectedEntryPos();
     Update();
 
     switch (nPos)
@@ -929,10 +929,10 @@ IMPL_LINK_NOARG(SlideBackground, PaperSizeModifyHdl, ListBox&, void)
     Paper ePaper =  mpPaperSizeBox->GetSelection();
     Size  aSize(SvxPaperInfo::GetPaperSize(ePaper, meUnit));
 
-    if(mpPaperOrientation->GetSelectEntryPos() == 0)
+    if(mpPaperOrientation->GetSelectedEntryPos() == 0)
         Swap(aSize);
 
-    mpPageItem->SetLandscape(mpPaperOrientation->GetSelectEntryPos() == 0);
+    mpPageItem->SetLandscape(mpPaperOrientation->GetSelectedEntryPos() == 0);
     SvxSizeItem aSizeItem(SID_ATTR_PAGE_SIZE, aSize);
     // Page/slide properties dialog (FuPage::ExecuteDialog and ::ApplyItemSet) misuses
     // SID_ATTR_PAGE_EXT1 to distinguish between Impress and Draw, as for whether to fit
@@ -944,7 +944,7 @@ IMPL_LINK_NOARG(SlideBackground, PaperSizeModifyHdl, ListBox&, void)
 
 IMPL_LINK_NOARG(SlideBackground, FillColorHdl, SvxColorListBox&, void)
 {
-    const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectEntryPos();
+    const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectedEntryPos();
     switch(eXFS)
     {
         case drawing::FillStyle_SOLID:
@@ -972,7 +972,7 @@ IMPL_LINK_NOARG(SlideBackground, FillColorHdl, SvxColorListBox&, void)
 
 IMPL_LINK_NOARG(SlideBackground, FillBackgroundHdl, ListBox&, void)
 {
-    const eFillStyle nFillPos = (eFillStyle)mpFillStyle->GetSelectEntryPos();
+    const eFillStyle nFillPos = (eFillStyle)mpFillStyle->GetSelectedEntryPos();
     SfxObjectShell* pSh = SfxObjectShell::Current();
     switch(nFillPos)
     {
@@ -980,7 +980,7 @@ IMPL_LINK_NOARG(SlideBackground, FillBackgroundHdl, ListBox&, void)
         case HATCH:
         {
             const SvxHatchListItem aHatchListItem(*static_cast<const SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST)));
-            sal_uInt16 nPos = mpFillAttr->GetSelectEntryPos();
+            sal_uInt16 nPos = mpFillAttr->GetSelectedEntryPos();
             XHatch aHatch = aHatchListItem.GetHatchList()->GetHatch(nPos)->GetHatch();
             const OUString aHatchName = aHatchListItem.GetHatchList()->GetHatch(nPos)->GetName();
 
@@ -992,7 +992,7 @@ IMPL_LINK_NOARG(SlideBackground, FillBackgroundHdl, ListBox&, void)
         case BITMAP:
         case PATTERN:
         {
-            sal_Int16 nPos = mpFillAttr->GetSelectEntryPos();
+            sal_Int16 nPos = mpFillAttr->GetSelectedEntryPos();
             GraphicObject aBitmap;
             OUString aName;
             if( nFillPos == BITMAP )