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, 38 insertions, 38 deletions

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 88c54db98731..a213d4f9289a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -579,7 +579,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void )
         // If pRequired = sal_True then the sal_Bool field must NOT contain <<none>>
         OUString sDef = BoolStringUI(::comphelper::getString(pActFieldDescr->GetControlDefault()));
 
-        if(pRequired->GetSelectEntryPos() == 0) // Yes
+        if(pRequired->GetSelectedEntryPos() == 0) // Yes
         {
             pBoolDefault->RemoveEntry(DBA_RES(STR_VALUE_NONE));
             if (sDef != aYes && sDef != aNo)
@@ -597,7 +597,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void )
     // A special treatment only for AutoIncrement
     if (&rListBox == pAutoIncrement)
     {
-        if(rListBox.GetSelectEntryPos() == 1)
+        if(rListBox.GetSelectedEntryPos() == 1)
         { // no
             DeactivateAggregate( tpAutoIncrementValue );
             if(pActFieldDescr->IsPrimaryKey())
@@ -627,7 +627,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void )
 
     if(&rListBox == m_pType)
     {
-        TOTypeInfoSP pTypeInfo = getTypeInfo(m_pType->GetSelectEntryPos());
+        TOTypeInfoSP pTypeInfo = getTypeInfo(m_pType->GetSelectedEntryPos());
         pActFieldDescr->FillFromTypeInfo(pTypeInfo,true,false); // SetType(pTypeInfo);
 
         DisplayData(pActFieldDescr);
@@ -1475,13 +1475,13 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
     else
         pFieldDescr->SetControlDefault(Any());
 
-    if((pRequired && pRequired->GetSelectEntryPos() == 0) || pFieldDescr->IsPrimaryKey() || (pBoolDefault && pBoolDefault->GetEntryCount() == 2))  // yes
+    if((pRequired && pRequired->GetSelectedEntryPos() == 0) || pFieldDescr->IsPrimaryKey() || (pBoolDefault && pBoolDefault->GetEntryCount() == 2))  // yes
         pFieldDescr->SetIsNullable( ColumnValue::NO_NULLS );
     else
         pFieldDescr->SetIsNullable( ColumnValue::NULLABLE );
 
     if ( pAutoIncrement )
-        pFieldDescr->SetAutoIncrement( pAutoIncrement->GetSelectEntryPos() == 0 );
+        pFieldDescr->SetAutoIncrement( pAutoIncrement->GetSelectedEntryPos() == 0 );
 
     if( pTextLen )
         pFieldDescr->SetPrecision( static_cast<sal_Int32>(pTextLen->GetValue()) );
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index b2948824a191..7ecf1b00dbfe 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -527,7 +527,7 @@ namespace dbaui
                 pOther = m_pRightTable;
             else
                 pOther = m_pLeftTable;
-            pOther->SelectEntryPos(1 - pOther->GetSelectEntryPos());
+            pOther->SelectEntryPos(1 - pOther->GetSelectedEntryPos());
 
             OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->begin();
             OTableWindow* pFirst = aIter->second;
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index d7d91ece60ad..4232ec2478fc 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -189,8 +189,8 @@ namespace dbaui
     OUString OpenDocumentListBox::GetSelectedDocumentURL() const
     {
         OUString sURL;
-        sal_Int32 nSelected = GetSelectEntryPos();
-        if ( LISTBOX_ENTRY_NOTFOUND != GetSelectEntryPos() )
+        sal_Int32 nSelected = GetSelectedEntryPos();
+        if ( LISTBOX_ENTRY_NOTFOUND != GetSelectedEntryPos() )
             sURL = impl_getDocumentAtIndex( nSelected ).first;
         return sURL;
     }
@@ -198,8 +198,8 @@ namespace dbaui
     OUString OpenDocumentListBox::GetSelectedDocumentFilter() const
     {
         OUString sFilter;
-        sal_Int32 nSelected = GetSelectEntryPos();
-        if ( LISTBOX_ENTRY_NOTFOUND != GetSelectEntryPos() )
+        sal_Int32 nSelected = GetSelectedEntryPos();
+        if ( LISTBOX_ENTRY_NOTFOUND != GetSelectedEntryPos() )
             sFilter = impl_getDocumentAtIndex( nSelected ).second;
         return sFilter;
     }
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 6b9a5d7371b6..c0b3364d4bea 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -316,7 +316,7 @@ namespace dbaui
         {
             if ( m_pBooleanComparisonMode->IsValueChangedFromSaved() )
             {
-                _rSet->Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectEntryPos() ) );
+                _rSet->Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectedEntryPos() ) );
                 bChangedSomething = true;
             }
         }
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index ceaee42f1f62..220687e2ff6b 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -323,7 +323,7 @@ namespace dbaui
     {
         if (!m_pSQLHistory->IsTravelSelect())
         {
-            const sal_Int32 nSelected = m_pSQLHistory->GetSelectEntryPos();
+            const sal_Int32 nSelected = m_pSQLHistory->GetSelectedEntryPos();
             if (LISTBOX_ENTRY_NOTFOUND != nSelected)
                 switchToHistory(nSelected);
         }
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index d462f16d81b1..a43364b6ad8c 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -397,10 +397,10 @@ namespace dbaui
     IMPL_LINK( OGeneralPageWizard, OnEmbeddedDBTypeSelected, ListBox&, _rBox, void )
     {
         // get the type from the entry data
-        const sal_Int32 nSelected = _rBox.GetSelectEntryPos();
+        const sal_Int32 nSelected = _rBox.GetSelectedEntryPos();
         if (static_cast<size_t>(nSelected) >= m_aEmbeddedURLPrefixes.size() )
         {
-            SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected <<  "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix");
+            SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected <<  "' from the DatasourceType selection ListBox's GetSelectedEntryPos(): no corresponding URL prefix");
             return;
         }
         const OUString sURLPrefix = m_aEmbeddedURLPrefixes[ nSelected ];
@@ -415,10 +415,10 @@ namespace dbaui
     IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox&, _rBox, void )
     {
         // get the type from the entry data
-        const sal_Int32 nSelected = _rBox.GetSelectEntryPos();
+        const sal_Int32 nSelected = _rBox.GetSelectedEntryPos();
         if (static_cast<size_t>(nSelected) >= m_aURLPrefixes.size() )
         {
-            SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected <<  "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix");
+            SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected <<  "' from the DatasourceType selection ListBox's GetSelectedEntryPos(): no corresponding URL prefix");
             return;
         }
         const OUString sURLPrefix = m_aURLPrefixes[ nSelected ];
@@ -461,7 +461,7 @@ namespace dbaui
     {
         bool bChangedSomething = false;
 
-        const sal_Int32 nEntry = m_pDatasourceType->GetSelectEntryPos();
+        const sal_Int32 nEntry = m_pDatasourceType->GetSelectedEntryPos();
         OUString sURLPrefix = m_aURLPrefixes[ nEntry ];
 
         if ( m_pDatasourceType->IsValueChangedFromSaved() )
@@ -654,7 +654,7 @@ namespace dbaui
 
         if ( bCommitTypeSelection )
         {
-            const sal_Int32 nEntry = m_pDatasourceType->GetSelectEntryPos();
+            const sal_Int32 nEntry = m_pDatasourceType->GetSelectedEntryPos();
             OUString sURLPrefix = m_aURLPrefixes[nEntry];
 
             if  (  m_pDatasourceType->IsValueChangedFromSaved()
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 68eebc4c7c51..c3952074dada 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -338,7 +338,7 @@ namespace dbaui
             {
                 OSL_ENSURE(!isNewField(), "IndexFieldsControl::SaveModified: why the hell ...!!!");
                 // selected entry
-                sal_Int32 nPos = m_pSortingCell->GetSelectEntryPos();
+                sal_Int32 nPos = m_pSortingCell->GetSelectedEntryPos();
                 OSL_ENSURE(LISTBOX_ENTRY_NOTFOUND != nPos, "IndexFieldsControl::SaveModified: how did you get this selection??");
                 // adjust the sort flag in the index field description
                 OIndexField& rCurrentField = m_aFields[GetCurRow()];
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 74fa78bacecb..a5504650193f 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -263,7 +263,7 @@ namespace dbaui
         {
             if (sal_Int32 nCount = m_pAllParams->GetEntryCount())
             {
-                sal_Int32 nCurrent = m_pAllParams->GetSelectEntryPos();
+                sal_Int32 nCurrent = m_pAllParams->GetSelectedEntryPos();
                 OSL_ENSURE(static_cast<size_t>(nCount) == m_aVisitedParams.size(), "OParameterDialog::OnButtonClicked : inconsistent lists !");
 
                 // search the next entry in list we haven't visited yet
@@ -311,7 +311,7 @@ namespace dbaui
         }
 
         // initialize the controls with the new values
-        sal_Int32 nSelected = m_pAllParams->GetSelectEntryPos();
+        sal_Int32 nSelected = m_pAllParams->GetSelectedEntryPos();
         OSL_ENSURE(nSelected != LISTBOX_ENTRY_NOTFOUND, "OParameterDialog::OnEntrySelected : no current entry !");
 
         m_pParam->SetText(::comphelper::getString(m_aFinalValues[nSelected].Value));
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 498fcd80667c..3584c88ebfeb 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -214,7 +214,7 @@ void DlgFilterCrit::dispose()
 }
 
 #define LbText(x)       ((x).GetSelectedEntry())
-#define LbPos(x)        ((x).GetSelectEntryPos())
+#define LbPos(x)        ((x).GetSelectedEntryPos())
 
 sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const
 {
@@ -735,7 +735,7 @@ void DlgFilterCrit::BuildWherePart()
         if ( getCondition(*m_pLB_WHEREFIELD2,*m_pLB_WHERECOMP2,*m_pET_WHEREVALUE2,aValue) )
             _rValues = aHaving;
         PropertyValue* pPos = nullptr;
-        if ( m_pLB_WHERECOND2->GetSelectEntryPos() )
+        if ( m_pLB_WHERECOND2->GetSelectedEntryPos() )
         {
             sal_Int32 nPos = _rValues.getLength();
             _rValues.realloc( nPos + 1);
@@ -759,7 +759,7 @@ void DlgFilterCrit::BuildWherePart()
         if ( getCondition(*m_pLB_WHEREFIELD3,*m_pLB_WHERECOMP3,*m_pET_WHEREVALUE3,aValue) )
             _rValues = aHaving;
         PropertyValue* pPos = nullptr;
-        if ( m_pLB_WHERECOND3->GetSelectEntryPos() )
+        if ( m_pLB_WHERECOND3->GetSelectedEntryPos() )
         {
             sal_Int32 nPos = _rValues.getLength();
             _rValues.realloc( nPos + 1);
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 5e96fe2b3854..4119cf0c1da9 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -184,7 +184,7 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow()
 void DlgOrderCrit::EnableLines()
 {
 
-    if ( m_pLB_ORDERFIELD1->GetSelectEntryPos() == 0 )
+    if ( m_pLB_ORDERFIELD1->GetSelectedEntryPos() == 0 )
     {
         m_pLB_ORDERFIELD2->Disable();
         m_pLB_ORDERVALUE2->Disable();
@@ -198,7 +198,7 @@ void DlgOrderCrit::EnableLines()
         m_pLB_ORDERVALUE2->Enable();
     }
 
-    if ( m_pLB_ORDERFIELD2->GetSelectEntryPos() == 0 )
+    if ( m_pLB_ORDERFIELD2->GetSelectedEntryPos() == 0 )
     {
         m_pLB_ORDERFIELD3->Disable();
         m_pLB_ORDERVALUE3->Disable();
@@ -223,14 +223,14 @@ OUString DlgOrderCrit::GetOrderList( ) const
     OUString sOrder;
     for( sal_uInt16 i=0 ; i<DOG_ROWS; i++ )
     {
-        if(m_aColumnList[i]->GetSelectEntryPos() != 0)
+        if(m_aColumnList[i]->GetSelectedEntryPos() != 0)
         {
             if(!sOrder.isEmpty())
                 sOrder += ",";
 
             OUString sName = m_aColumnList[i]->GetSelectedEntry();
             sOrder += ::dbtools::quoteName(sQuote,sName);
-            if(m_aValueList[i]->GetSelectEntryPos())
+            if(m_aValueList[i]->GetSelectedEntryPos())
                 sOrder += " DESC ";
             else
                 sOrder += " ASC ";
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 2a15f19e4fb6..091753f742b5 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -380,7 +380,7 @@ bool OWizTypeSelectList::IsPrimaryKeyAllowed() const
 
     for( sal_Int32 j = 0; m_bPKey && j < nCount; ++j )
     {
-        OFieldDescription* pField = static_cast<OFieldDescription*>(GetEntryData(GetSelectEntryPos(j)));
+        OFieldDescription* pField = static_cast<OFieldDescription*>(GetEntryData(GetSelectedEntryPos(j)));
         if(!pField || pField->getTypeInfo()->nSearchType == ColumnSearch::NONE)
             return false;
     }
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 0d5dd0d05c47..63138efeb749 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -982,7 +982,7 @@ bool OSelectionBrowseBox::SaveModified()
             {
                 OUString aAliasName = m_pTableCell->GetSelectedEntry();
                 strOldCellContents = pEntry->GetAlias();
-                if ( m_pTableCell->GetSelectEntryPos() != 0 )
+                if ( m_pTableCell->GetSelectedEntryPos() != 0 )
                 {
                     pEntry->SetAlias(aAliasName);
                     // we have to set the table name as well as the table window
@@ -1011,7 +1011,7 @@ bool OSelectionBrowseBox::SaveModified()
             case BROW_ORDER_ROW:
             {
                 strOldCellContents = OUString::number((sal_uInt16)pEntry->GetOrderDir());
-                sal_Int32 nIdx = m_pOrderCell->GetSelectEntryPos();
+                sal_Int32 nIdx = m_pOrderCell->GetSelectedEntryPos();
                 if (nIdx == LISTBOX_ENTRY_NOTFOUND)
                     nIdx = 0;
                 pEntry->SetOrderDir(EOrderDir(nIdx));
@@ -1032,7 +1032,7 @@ bool OSelectionBrowseBox::SaveModified()
             case BROW_FUNCTION_ROW:
                 {
                     strOldCellContents = pEntry->GetFunction();
-                    sal_Int32 nPos = m_pFunctionCell->GetSelectEntryPos();
+                    sal_Int32 nPos = m_pFunctionCell->GetSelectedEntryPos();
                     // these functions are only available in CORE
                     OUString sFunctionName        = m_pFunctionCell->GetEntry(nPos);
                     OUString sGroupFunctionName   = m_aFunctionStrings.getToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1, ';');
@@ -1866,7 +1866,7 @@ void OSelectionBrowseBox::CellModified()
             {
                 OTableFieldDescRef  pEntry = getEntry(GetColumnPos(GetCurColumnId()) - 1);
 
-                sal_Int32 nIdx = m_pOrderCell->GetSelectEntryPos();
+                sal_Int32 nIdx = m_pOrderCell->GetSelectedEntryPos();
                 if(!m_bOrderByUnRelated && nIdx > 0 &&
                     nIdx != LISTBOX_ENTRY_NOTFOUND  &&
                     !pEntry->IsEmpty()              &&
@@ -2233,7 +2233,7 @@ OUString OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 n
             return pEntry->IsVisible() ? OUStringLiteral("1") : OUStringLiteral("0");
         case BROW_ORDER_ROW:
         {
-            sal_Int32 nIdx = m_pOrderCell->GetSelectEntryPos();
+            sal_Int32 nIdx = m_pOrderCell->GetSelectedEntryPos();
             if (nIdx == LISTBOX_ENTRY_NOTFOUND)
                 nIdx = 0;
             return OUString::number(nIdx);
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 9880cfa59349..d9b3bd1d040f 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -155,7 +155,7 @@ void DlgQryJoin::dispose()
 
 IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void )
 {
-    if (m_pLB_JoinType->GetSelectEntryPos() == m_pLB_JoinType->GetSavedValue() )
+    if (m_pLB_JoinType->GetSelectedEntryPos() == m_pLB_JoinType->GetSavedValue() )
         return;
 
     m_pLB_JoinType->SaveValue();
@@ -167,7 +167,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void )
     OUString sSecondWinName   = m_pConnData->getReferencedTable()->GetWinName();
     const EJoinType eOldJoinType = eJoinType;
     const char* pResId = nullptr;
-    const sal_Int32 nPos = m_pLB_JoinType->GetSelectEntryPos();
+    const sal_Int32 nPos = m_pLB_JoinType->GetSelectedEntryPos();
     const sal_IntPtr nJoinType = reinterpret_cast<sal_IntPtr>(m_pLB_JoinType->GetEntryData(nPos));
     bool bAddHint = true;
     switch ( nJoinType )
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 144a980a72a3..d3e3d29715b4 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -689,7 +689,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
 
 void OTableEditorCtrl::resetType()
 {
-    sal_Int32 nPos = pTypeCell->GetSelectEntryPos();
+    sal_Int32 nPos = pTypeCell->GetSelectedEntryPos();
     if(nPos != LISTBOX_ENTRY_NOTFOUND)
         SwitchType( GetView()->getController().getTypeInfo(nPos) );
     else
@@ -1574,7 +1574,7 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType )
     pRow->SetFieldType( _pType, true );
     if ( _pType.get() )
     {
-        const sal_Int32 nCurrentlySelected = pTypeCell->GetSelectEntryPos();
+        const sal_Int32 nCurrentlySelected = pTypeCell->GetSelectedEntryPos();
 
         if  (   ( LISTBOX_ENTRY_NOTFOUND == nCurrentlySelected )
             ||  ( GetView()->getController().getTypeInfo( nCurrentlySelected ) != _pType )