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>

6 files changed, 53 insertions, 53 deletions

diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 34eae4c72523..b1d22c730d59 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -99,7 +99,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*)
     Init(); // Allgemeine initialisierung
 
     m_pTypeLB->SetUpdateMode(false);
-    const sal_Int32 nOldPos = m_pTypeLB->GetSelectEntryPos();
+    const sal_Int32 nOldPos = m_pTypeLB->GetSelectedEntryPos();
     m_sOldDBName = m_pDatabaseTLB->GetDBName(m_sOldTableName, m_sOldColumnName);
 
     m_pTypeLB->Clear();
@@ -240,7 +240,7 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* )
 
         case TYP_DBSETNUMBERFLD:
             nFormat = reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
-                                m_pFormatLB->GetSelectEntryPos() ));
+                                m_pFormatLB->GetSelectedEntryPos() ));
             break;
         }
 
@@ -285,7 +285,7 @@ void SwFieldDBPage::TypeHdl( ListBox const * pBox )
     const sal_Int32 nOld = GetTypeSel();
 
     // current ListBoxPos
-    SetTypeSel(m_pTypeLB->GetSelectEntryPos());
+    SetTypeSel(m_pTypeLB->GetSelectedEntryPos());
 
     if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
     {
@@ -491,7 +491,7 @@ IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl, Edit&, void)
 
 void    SwFieldDBPage::FillUserData()
 {
-    const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
+    const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos();
     const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
         ? USHRT_MAX : (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData( nEntryPos ));
     SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel ));
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index f7b4df0f28fb..3b7b357289db 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -214,7 +214,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
 
     if (IsFieldEdit())
     {
-        nOldSel = m_pSelectionLB->GetSelectEntryPos();
+        nOldSel = m_pSelectionLB->GetSelectedEntryPos();
         nOldFormat = GetCurField()->GetFormat();
         m_pFixedCB->SaveValue();
     }
@@ -242,7 +242,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void)
 IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void)
 {
     sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData());
-    sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
+    sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos();
     sal_uInt16 nExtSubType;
     sal_uInt16 nNewType = 0;
 
@@ -332,7 +332,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void)
 
     if (IsFieldEdit())
     {
-        nPos = m_pSelectionLB->GetSelectEntryPos();
+        nPos = m_pSelectionLB->GetSelectedEntryPos();
         if (nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos));
@@ -364,7 +364,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void)
 
     m_pFormat->Enable(bEnable);
 
-    if (bEnable && m_pFormatLB->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND)
+    if (bEnable && m_pFormatLB->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND)
     {
         m_pFormatLB->SelectEntryPos(0);
     }
@@ -432,7 +432,7 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
 
     sal_uInt32 nFormat = 0;
 
-    sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
+    sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos();
 
     OUString aName;
     if (DI_CUSTOM == nSubType)
@@ -444,11 +444,11 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
     if (m_pFixedCB->IsChecked())
         nSubType |= DI_SUB_FIXED;
 
-    nPos = m_pFormatLB->GetSelectEntryPos();
+    nPos = m_pFormatLB->GetSelectedEntryPos();
     if(nPos != LISTBOX_ENTRY_NOTFOUND)
         nFormat = m_pFormatLB->GetFormat();
 
-    if (!IsFieldEdit() || nOldSel != m_pSelectionLB->GetSelectEntryPos() ||
+    if (!IsFieldEdit() || nOldSel != m_pSelectionLB->GetSelectedEntryPos() ||
         nOldFormat != nFormat || m_pFixedCB->IsValueChangedFromSaved()
         || (DI_CUSTOM == nSubType && aName != m_sOldCustomFieldName ))
     {
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index e4464f302241..c8701bcb223e 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -194,7 +194,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* )
 
     if (IsFieldEdit())
     {
-        nOldSel = m_pSelectionLB->GetSelectEntryPos();
+        nOldSel = m_pSelectionLB->GetSelectedEntryPos();
         nOldFormat = GetCurField()->GetFormat();
         m_pFixedCB->SaveValue();
         m_pValueED->SaveValue();
@@ -209,7 +209,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void)
     const sal_Int32 nOld = GetTypeSel();
 
     // current ListBoxPos
-    SetTypeSel(m_pTypeLB->GetSelectEntryPos());
+    SetTypeSel(m_pTypeLB->GetSelectedEntryPos());
 
     if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
     {
@@ -361,7 +361,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void)
                 if (IsFieldEdit())
                 {
                     const sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
-                                            m_pFormatLB->GetSelectEntryPos() ));
+                                            m_pFormatLB->GetSelectedEntryPos() ));
 
                     if(SVX_NUM_CHAR_SPECIAL != nTmp)
                     {
@@ -443,7 +443,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void)
         if (IsFieldEdit())
             m_pFixedCB->Check( (GetCurField()->GetFormat() & AF_FIXED) != 0 && bFixed );
 
-        if (m_pNumFormatLB->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND)
+        if (m_pNumFormatLB->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND)
             m_pNumFormatLB->SelectEntryPos(0);
         m_pValueFT->Enable(bValue || bLevel || bOffset);
         m_pValueED->Enable(bValue);
@@ -458,7 +458,7 @@ void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId)
 
 IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void)
 {
-    sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
+    sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos();
     if(nPos == LISTBOX_ENTRY_NOTFOUND)
         nPos = 0;
 
@@ -475,7 +475,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void)
     case TYP_PREVPAGEFLD:
     case TYP_NEXTPAGEFLD:
         pTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
-                                        m_pFormatLB->GetSelectEntryPos() ))
+                                        m_pFormatLB->GetSelectedEntryPos() ))
                         ? STR_VALUE : STR_OFFSET;
         break;
 
@@ -529,7 +529,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void)
 
     if (nTypeId == USHRT_MAX)
     {
-        sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
+        sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos();
         if(nPos == LISTBOX_ENTRY_NOTFOUND)
             nPos = 0;
 
@@ -540,7 +540,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void)
     {
         // Prev/Next - PageNumFields special treatment:
         sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
-                                        m_pFormatLB->GetSelectEntryPos() ));
+                                        m_pFormatLB->GetSelectedEntryPos() ));
         const OUString sOldText( m_pValueFT->GetText() );
         const OUString sNewText( SwResId( SVX_NUM_CHAR_SPECIAL == nTmp  ? STR_VALUE
                                                          : STR_OFFSET ));
@@ -559,7 +559,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* )
 
     if (nTypeId == USHRT_MAX)
     {
-        sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
+        sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos();
         if(nPos == LISTBOX_ENTRY_NOTFOUND)
             nPos = 0;
         nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos));
@@ -571,14 +571,14 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* )
 
     if (m_pFormatLB->IsEnabled())
     {
-        sal_Int32 nPos = m_pFormatLB->GetSelectEntryPos();
+        sal_Int32 nPos = m_pFormatLB->GetSelectedEntryPos();
         if(nPos != LISTBOX_ENTRY_NOTFOUND)
             nFormat = reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(nPos));
     }
 
     if (m_pSelectionLB->IsEnabled())
     {
-        sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
+        sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos();
         if(nPos != LISTBOX_ENTRY_NOTFOUND)
             nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos));
     }
@@ -632,7 +632,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* )
     }
 
     if (!IsFieldEdit() ||
-        nOldSel != m_pSelectionLB->GetSelectEntryPos() ||
+        nOldSel != m_pSelectionLB->GetSelectedEntryPos() ||
         nOldFormat != nFormat ||
         m_pFixedCB->IsValueChangedFromSaved() ||
         m_pValueED->IsValueChangedFromSaved() ||
@@ -658,7 +658,7 @@ sal_uInt16 SwFieldDokPage::GetGroup()
 
 void    SwFieldDokPage::FillUserData()
 {
-    const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
+    const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos();
     const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
         ? USHRT_MAX : sal::static_int_cast< sal_uInt16 >
             (reinterpret_cast< sal_uIntPtr >(m_pTypeLB->GetEntryData( nEntryPos )));
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index fb7632e91cad..c0a08921a92e 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -225,7 +225,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
     const sal_Int32 nOld = GetTypeSel();
 
     // current ListBoxPos
-    SetTypeSel(m_pTypeLB->GetSelectEntryPos());
+    SetTypeSel(m_pTypeLB->GetSelectedEntryPos());
 
     if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
     {
@@ -446,7 +446,7 @@ void SwFieldFuncPage::ListModifyHdl(Control const * pControl)
     }
     else if(m_pListItemsLB->GetSelectEntryCount())
     {
-        sal_Int32 nSelPos = m_pListItemsLB->GetSelectEntryPos();
+        sal_Int32 nSelPos = m_pListItemsLB->GetSelectedEntryPos();
         if(pControl == m_pListRemovePB)
         {
             m_pListItemsLB->RemoveEntry(nSelPos);
@@ -491,9 +491,9 @@ IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, Edit&, void)
                 LISTBOX_ENTRY_NOTFOUND == m_pListItemsLB->GetEntryPos(m_pListItemED->GetText()));
     bool bEnableButtons = m_pListItemsLB->GetSelectEntryCount() > 0;
     m_pListRemovePB->Enable(bEnableButtons);
-    m_pListUpPB->Enable(bEnableButtons && (m_pListItemsLB->GetSelectEntryPos() > 0));
+    m_pListUpPB->Enable(bEnableButtons && (m_pListItemsLB->GetSelectedEntryPos() > 0));
     m_pListDownPB->Enable(bEnableButtons &&
-                (m_pListItemsLB->GetSelectEntryPos() < (m_pListItemsLB->GetEntryCount() - 1)));
+                (m_pListItemsLB->GetSelectedEntryPos() < (m_pListItemsLB->GetEntryCount() - 1)));
 }
 
 // renew types in SelectionBox
@@ -552,7 +552,7 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
 
     sal_uInt16 nSubType = 0;
 
-    const sal_Int32 nEntryPos = m_pFormatLB->GetSelectEntryPos();
+    const sal_Int32 nEntryPos = m_pFormatLB->GetSelectedEntryPos();
     const sal_uLong nFormat = (nEntryPos == LISTBOX_ENTRY_NOTFOUND)
         ? 0 : reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(nEntryPos));
 
@@ -622,7 +622,7 @@ sal_uInt16 SwFieldFuncPage::GetGroup()
 
 void    SwFieldFuncPage::FillUserData()
 {
-    const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
+    const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos();
     const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
         ? USHRT_MAX
         : sal::static_int_cast< sal_uInt16 >
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index fba7a511d820..4f9e85afad4f 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -305,7 +305,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void)
     const sal_Int32 nOld = GetTypeSel();
 
     // current ListBoxPos
-    SetTypeSel(m_pTypeLB->GetSelectEntryPos());
+    SetTypeSel(m_pTypeLB->GetSelectedEntryPos());
 
     if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
     {
@@ -369,7 +369,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void)
             }
 
             m_pTypeLB->SelectEntry(sName);
-            SetTypeSel(m_pTypeLB->GetSelectEntryPos());
+            SetTypeSel(m_pTypeLB->GetSelectedEntryPos());
         }
         else
         {
@@ -402,7 +402,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void)
             case TYP_GETREFFLD:
                 if (REFFLDFLAG & (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld)))
                     // the old one stays
-                    nFieldDlgFormatSel = m_pFormatLB->GetSelectEntryPos();
+                    nFieldDlgFormatSel = m_pFormatLB->GetSelectedEntryPos();
                 bName = true;
                 break;
 
@@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void)
                     const sal_uInt16 nOldId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld));
                     if( nOldId & REFFLDFLAG || nOldId == TYP_GETREFFLD )
                         // then the old one stays
-                        nFieldDlgFormatSel = m_pFormatLB->GetSelectEntryPos();
+                        nFieldDlgFormatSel = m_pFormatLB->GetSelectedEntryPos();
                 }
                 break;
         }
@@ -504,7 +504,7 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString)
     // #i83479#
     if ( m_pSelectionLB->IsVisible() )
     {
-        const sal_Int32 nSelectionSel = m_pSelectionLB->GetSelectEntryPos();
+        const sal_Int32 nSelectionSel = m_pSelectionLB->GetSelectedEntryPos();
         if (nSelectionSel != LISTBOX_ENTRY_NOTFOUND)
         {
             sOldSel = m_pSelectionLB->GetEntry(nSelectionSel);
@@ -773,7 +773,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 {
     OUString sOldSel;
 
-    sal_Int32 nFormatSel = m_pFormatLB->GetSelectEntryPos();
+    sal_Int32 nFormatSel = m_pFormatLB->GetSelectedEntryPos();
     if (nFormatSel != LISTBOX_ENTRY_NOTFOUND)
         sOldSel = m_pFormatLB->GetEntry(nFormatSel);
 
@@ -879,7 +879,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
     sal_uInt16 nSubType = 0;
-    const sal_Int32 nEntryPos = m_pFormatLB->GetSelectEntryPos();
+    const sal_Int32 nEntryPos = m_pFormatLB->GetSelectedEntryPos();
     const sal_uLong nFormat = (nEntryPos == LISTBOX_ENTRY_NOTFOUND)
         ? 0 : reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(nEntryPos));
 
@@ -1067,12 +1067,12 @@ sal_uInt16 SwFieldRefPage::GetGroup()
 
 void    SwFieldRefPage::FillUserData()
 {
-    const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
+    const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos();
     const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
         ? USHRT_MAX
         : sal::static_int_cast< sal_uInt16 >
             (reinterpret_cast< sal_uIntPtr >(m_pTypeLB->GetEntryData( nEntryPos )));
-    const sal_Int32 nFormatEntryPos = m_pFormatLB->GetSelectEntryPos();
+    const sal_Int32 nFormatEntryPos = m_pFormatLB->GetSelectedEntryPos();
     const sal_uInt32 nFormatSel = LISTBOX_ENTRY_NOTFOUND == nFormatEntryPos ? USHRT_MAX : nFormatEntryPos;
     SetUserData( USER_DATA_VERSION ";" +
         OUString::number( nTypeSel ) + ";" +
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index e7899ba4caa8..e0d41c8eda0c 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -213,7 +213,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, ListBox&, void)
     const sal_Int32 nOld = GetTypeSel();
 
     // current ListBoxPos
-    SetTypeSel(m_pTypeLB->GetSelectEntryPos());
+    SetTypeSel(m_pTypeLB->GetSelectedEntryPos());
 
     if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
     {
@@ -245,7 +245,7 @@ IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void )
 void SwFieldVarPage::SubTypeHdl(ListBox const * pBox)
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
-    sal_Int32 nSelPos = m_pSelectionLB->GetSelectEntryPos();
+    sal_Int32 nSelPos = m_pSelectionLB->GetSelectedEntryPos();
     size_t nSelData = SIZE_MAX;
 
     if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
@@ -574,7 +574,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox)
         {
             case TYP_FORMELFLD:
                 {
-                    nSelPos = m_pSelectionLB->GetSelectEntryPos();
+                    nSelPos = m_pSelectionLB->GetSelectedEntryPos();
 
                     if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
                     {
@@ -595,7 +595,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox)
 // renew types in SelectionBox
 void SwFieldVarPage::UpdateSubType()
 {
-    SetSelectionSel(m_pSelectionLB->GetSelectEntryPos());
+    SetSelectionSel(m_pSelectionLB->GetSelectedEntryPos());
 
     OUString sOldSel;
     if (GetSelectionSel() != LISTBOX_ENTRY_NOTFOUND)
@@ -703,13 +703,13 @@ void SwFieldVarPage::UpdateSubType()
 void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 {
     OUString sOldSel;
-    const sal_Int32 nFormatSel = m_pFormatLB->GetSelectEntryPos();
+    const sal_Int32 nFormatSel = m_pFormatLB->GetSelectedEntryPos();
     if (nFormatSel != LISTBOX_ENTRY_NOTFOUND)
         sOldSel = m_pFormatLB->GetEntry(nFormatSel);
 
     OUString sOldNumSel;
     sal_uLong nOldNumFormat = 0;
-    sal_Int32 nNumFormatSel = m_pNumFormatLB->GetSelectEntryPos();
+    sal_Int32 nNumFormatSel = m_pNumFormatLB->GetSelectedEntryPos();
     if (nNumFormatSel != LISTBOX_ENTRY_NOTFOUND)
     {
         sOldNumSel = m_pNumFormatLB->GetEntry(nNumFormatSel);
@@ -994,7 +994,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
         OUString sName(m_pNameED->GetText()), sValue(m_pValueED->GetText());
         SwFieldType* pType = nullptr;
         SwFieldIds nId = SwFieldIds::Database;
-        sal_Int32 nNumFormatPos = m_pNumFormatLB->GetSelectEntryPos();
+        sal_Int32 nNumFormatPos = m_pNumFormatLB->GetSelectedEntryPos();
 
         switch (nTypeId)
         {
@@ -1004,7 +1004,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
         }
         pType = GetFieldMgr().GetFieldType(nId, sName);
 
-        sal_uLong nFormat = m_pFormatLB->GetSelectEntryPos();
+        sal_uLong nFormat = m_pFormatLB->GetSelectedEntryPos();
         if (nFormat != LISTBOX_ENTRY_NOTFOUND)
             nFormat = reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData((sal_Int32)nFormat));
 
@@ -1098,7 +1098,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
 
 IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl, ListBox&, void)
 {
-    bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0;
+    bool bEnable = m_pChapterLevelLB->GetSelectedEntryPos() != 0;
 
     m_pSeparatorED->Enable(bEnable);
     m_pSeparatorFT->Enable(bEnable);
@@ -1108,7 +1108,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl, ListBox&, void)
 IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl, Edit&, void)
 {
     bool bEnable = !m_pSeparatorED->GetText().isEmpty() ||
-                    m_pChapterLevelLB->GetSelectEntryPos() == 0;
+                    m_pChapterLevelLB->GetSelectedEntryPos() == 0;
     EnableInsert(bEnable);
 }
 
@@ -1119,7 +1119,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
     OUString aVal(m_pValueED->GetText());
     OUString aName(m_pNameED->GetText());
 
-    const sal_Int32 nSubPos = m_pSelectionLB->GetSelectEntryPos();
+    const sal_Int32 nSubPos = m_pSelectionLB->GetSelectedEntryPos();
     sal_uInt16 nSubType = (nSubPos == LISTBOX_ENTRY_NOTFOUND) ? 0 :
         (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nSubPos));
 
@@ -1127,7 +1127,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
 
     if (!m_pNumFormatLB->IsVisible())
     {
-        sal_Int32 nFormatPos = m_pFormatLB->GetSelectEntryPos();
+        sal_Int32 nFormatPos = m_pFormatLB->GetSelectedEntryPos();
 
         if(nFormatPos == LISTBOX_ENTRY_NOTFOUND)
             nFormat = 0;
@@ -1203,7 +1203,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
         }
         case TYP_SEQFLD:
         {
-            nSubType = static_cast< sal_uInt16 >(m_pChapterLevelLB->GetSelectEntryPos());
+            nSubType = static_cast< sal_uInt16 >(m_pChapterLevelLB->GetSelectedEntryPos());
             if (nSubType == 0)
                 nSubType = 0x7f;
             else
@@ -1300,7 +1300,7 @@ void SwFieldVarPage::FillUserData()
 {
     OUString sData(USER_DATA_VERSION);
     sData += ";";
-    sal_Int32 nTypeSel = m_pTypeLB->GetSelectEntryPos();
+    sal_Int32 nTypeSel = m_pTypeLB->GetSelectedEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
         nTypeSel = USHRT_MAX;
     else