summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/control
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-14 16:57:06 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-21 12:45:38 +0200
commitd99b65c864cc3358238e4eac651f12a34d05e2d9 (patch)
treefcd7d6fefb9434c27533c826aabc639f68ba97ed /dbaccess/source/ui/control
parentb649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (diff)
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>
Diffstat (limited to 'dbaccess/source/ui/control')
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx10
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx2
-rw-r--r--dbaccess/source/ui/control/opendoccontrols.cxx8
3 files changed, 10 insertions, 10 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;
}