summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx8
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx12
-rw-r--r--dbaccess/source/ui/control/charsetlistbox.cxx2
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dsselect.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dsselect.hxx2
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx4
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx12
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx2
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx8
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx2
13 files changed, 32 insertions, 32 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 4308f7f780a2..88c54db98731 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -457,7 +457,7 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r
case FIELD_PROPERTY_BOOL_DEFAULT:
if (pBoolDefault)
{
- OUString sOld = pBoolDefault->GetSelectEntry();
+ OUString sOld = pBoolDefault->GetSelectedEntry();
pBoolDefault->SelectEntry(rText);
if (sOld != rText)
LINK(this, OFieldDescControl, ChangeHdl).Call(*pBoolDefault);
@@ -489,7 +489,7 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r
case FIELD_PROPERTY_AUTOINC:
if (pAutoIncrement)
{
- OUString sOld = pAutoIncrement->GetSelectEntry();
+ OUString sOld = pAutoIncrement->GetSelectedEntry();
pAutoIncrement->SelectEntry(rText);
if (sOld != rText)
LINK(this, OFieldDescControl, ChangeHdl).Call(*pAutoIncrement);
@@ -1302,7 +1302,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
else
pBoolDefault->SelectEntry(sDef);
- pFieldDescr->SetControlDefault(makeAny(BoolStringPersistent(pBoolDefault->GetSelectEntry())));
+ pFieldDescr->SetControlDefault(makeAny(BoolStringPersistent(pBoolDefault->GetSelectedEntry())));
}
else if(pBoolDefault->GetEntryCount() < 3)
{
@@ -1467,7 +1467,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
}
else if (pBoolDefault)
{
- sDefault = BoolStringPersistent(pBoolDefault->GetSelectEntry());
+ sDefault = BoolStringPersistent(pBoolDefault->GetSelectedEntry());
}
if ( !sDefault.isEmpty() )
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 57a5e79f4064..b2948824a191 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -224,7 +224,7 @@ namespace dbaui
long nRow = GetCurRow();
if ( nRow != BROWSER_ENDOFSELECTION )
{
- OUString sFieldName(m_pListCell->GetSelectEntry());
+ OUString sFieldName(m_pListCell->GetSelectedEntry());
OConnectionLineDataVec& rLines = m_pConnData->GetConnLineDataList();
if ( rLines.size() <= static_cast<OConnectionLineDataVec::size_type>(nRow) )
{
@@ -313,7 +313,7 @@ namespace dbaui
fillListBox(xDef);
OUString sName = GetCellText( nRow, nColumnId );
m_pListCell->SelectEntry( sName );
- if ( m_pListCell->GetSelectEntry() != sName )
+ if ( m_pListCell->GetSelectedEntry() != sName )
{
m_pListCell->InsertEntry( sName );
m_pListCell->SelectEntry( sName );
@@ -515,7 +515,7 @@ namespace dbaui
IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void )
{
- OUString strSelected(rListBox.GetSelectEntry());
+ OUString strSelected(rListBox.GetSelectedEntry());
OTableWindow* pLeft = nullptr;
OTableWindow* pRight = nullptr;
@@ -534,7 +534,7 @@ namespace dbaui
++aIter;
OTableWindow* pSecond = aIter->second;
- if ( m_pLeftTable->GetSelectEntry() == pFirst->GetName() )
+ if ( m_pLeftTable->GetSelectedEntry() == pFirst->GetName() )
{
pLeft = pFirst;
pRight = pSecond;
@@ -564,7 +564,7 @@ namespace dbaui
pLeft = pLoop;
- OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pRightTable->GetSelectEntry());
+ OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pRightTable->GetSelectedEntry());
OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name");
if ( aIter != m_pTableMap->end() )
pRight = aIter->second;
@@ -580,7 +580,7 @@ namespace dbaui
m_strCurrentRight = strSelected;
pRight = pLoop;
- OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pLeftTable->GetSelectEntry());
+ OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pLeftTable->GetSelectedEntry());
OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name");
if ( aIter != m_pTableMap->end() )
pLeft = aIter->second;
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index c4fffa78dd01..f5c1f7f7855a 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -75,7 +75,7 @@ namespace dbaui
bool bChangedSomething = false;
if ( IsValueChangedFromSaved() )
{
- OCharsetDisplay::const_iterator aFind = m_aCharSets.findDisplayName( GetSelectEntry() );
+ OCharsetDisplay::const_iterator aFind = m_aCharSets.findDisplayName( GetSelectedEntry() );
OSL_ENSURE( aFind != m_aCharSets.end(), "CharSetListBox::StoreSelectedCharSet: could not translate the selected character set!" );
if ( aFind != m_aCharSets.end() )
{
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 7d9bb184e5dc..a266c6db50be 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -285,7 +285,7 @@ IMPL_LINK_NOARG( OUserAdmin, ListDblClickHdl, ListBox&, void )
OUString OUserAdmin::GetUser()
{
- return m_pUSER->GetSelectEntry();
+ return m_pUSER->GetSelectedEntry();
}
void OUserAdmin::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/)
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 4c05e8664599..a3bceb671db1 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -193,7 +193,7 @@ IMPL_LINK_NOARG( ODbaseIndexDialog, OKClickHdl, Button*, void )
IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void )
{
- OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry();
+ OUString aSelection = m_pLB_FreeIndexes->GetSelectedEntry();
OUString aTableName = m_pCB_Tables->GetText();
OTableIndex aIndex = RemoveFreeIndex( aSelection, true );
InsertTableIndex( aTableName, aIndex );
@@ -203,7 +203,7 @@ IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void )
IMPL_LINK_NOARG( ODbaseIndexDialog, RemoveClickHdl, Button*, void )
{
- OUString aSelection = m_pLB_TableIndexes->GetSelectEntry();
+ OUString aSelection = m_pLB_TableIndexes->GetSelectedEntry();
OUString aTableName = m_pCB_Tables->GetText();
OTableIndex aIndex = RemoveTableIndex( aTableName, aSelection );
InsertFreeIndex( aIndex );
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 4e84f26691df..78bc4d23f311 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -141,7 +141,7 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources)
{
OUString sSelected;
if (m_pDatasource->GetEntryCount())
- sSelected = m_pDatasource->GetSelectEntry();
+ sSelected = m_pDatasource->GetSelectedEntry();
m_pDatasource->Clear();
// fill the list
for ( StringBag::const_iterator aDS = _rDatasources.begin();
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index a2ad2b40c2d5..edac249d7ad1 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -55,7 +55,7 @@ public:
virtual ~ODatasourceSelectDialog() override;
virtual void dispose() override;
OUString GetSelected() const {
- return m_pDatasource->GetSelectEntry();
+ return m_pDatasource->GetSelectedEntry();
}
void Select( const OUString& _rEntry ) {
m_pDatasource->SelectEntry(_rEntry);
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 7545c7e62392..68eebc4c7c51 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -292,7 +292,7 @@ namespace dbaui
{
case COLUMN_ID_FIELDNAME:
{
- OUString sFieldSelected = m_pFieldNameCell->GetSelectEntry();
+ OUString sFieldSelected = m_pFieldNameCell->GetSelectedEntry();
bool bEmptySelected = sFieldSelected.isEmpty();
if (isNewField())
{
@@ -384,7 +384,7 @@ namespace dbaui
{ // a field has been selected
if (GetCurRow() >= GetRowCount() - 2)
{ // and we're in one of the last two rows
- OUString sSelectedEntry = m_pFieldNameCell->GetSelectEntry();
+ OUString sSelectedEntry = m_pFieldNameCell->GetSelectedEntry();
sal_Int32 nCurrentRow = GetCurRow();
sal_Int32 rowCount = GetRowCount();
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 445cf70886fc..498fcd80667c 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -213,7 +213,7 @@ void DlgFilterCrit::dispose()
ModalDialog::dispose();
}
-#define LbText(x) ((x).GetSelectEntry())
+#define LbText(x) ((x).GetSelectedEntry())
#define LbPos(x) ((x).GetSelectEntryPos())
sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const
@@ -316,7 +316,7 @@ bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co
try
{
OUString sTableName;
- _rFilter.Name = _rField.GetSelectEntry();
+ _rFilter.Name = _rField.GetSelectedEntry();
Reference< XPropertySet > xColumn = getQueryColumn(_rFilter.Name);
if ( xColumn.is() )
{
@@ -361,7 +361,7 @@ bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co
{
}
- _rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectEntry() );
+ _rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectedEntry() );
if ( SQLFilterOperator::SQLNULL != _rFilter.Handle && _rFilter.Handle != SQLFilterOperator::NOT_SQLNULL )
{
OUString sPredicateValue;
@@ -436,15 +436,15 @@ Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueI
OUString sField;
if ( &_rValueInput == m_pET_WHEREVALUE1 )
{
- sField = m_pLB_WHEREFIELD1->GetSelectEntry();
+ sField = m_pLB_WHEREFIELD1->GetSelectedEntry();
}
else if ( &_rValueInput == m_pET_WHEREVALUE2 )
{
- sField = m_pLB_WHEREFIELD2->GetSelectEntry();
+ sField = m_pLB_WHEREFIELD2->GetSelectedEntry();
}
else if ( &_rValueInput == m_pET_WHEREVALUE3 )
{
- sField = m_pLB_WHEREFIELD3->GetSelectEntry();
+ sField = m_pLB_WHEREFIELD3->GetSelectedEntry();
}
else {
OSL_FAIL( "DlgFilterCrit::getMatchingColumn: invalid event source!" );
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 83f2d84fb7dc..5e96fe2b3854 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -228,7 +228,7 @@ OUString DlgOrderCrit::GetOrderList( ) const
if(!sOrder.isEmpty())
sOrder += ",";
- OUString sName = m_aColumnList[i]->GetSelectEntry();
+ OUString sName = m_aColumnList[i]->GetSelectedEntry();
sOrder += ::dbtools::quoteName(sQuote,sName);
if(m_aValueList[i]->GetSelectEntryPos())
sOrder += " DESC ";
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 84e5d30dc434..c474bf597b56 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -226,10 +226,10 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void )
if(!bAll)
{
for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
- moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase);
+ moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectedEntry(i),sExtraChars,nMaxNameLen,aCase);
for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; --j)
- pLeft->RemoveEntry(pLeft->GetSelectEntry(j-1));
+ pLeft->RemoveEntry(pLeft->GetSelectedEntry(j-1));
}
else
{
@@ -270,9 +270,9 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void )
fillColumns(pRight,aRightColumns);
for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
- moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase);
+ moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectedEntry(i),sExtraChars,nMaxNameLen,aCase);
for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; )
- pLeft->RemoveEntry(pLeft->GetSelectEntry(--j));
+ pLeft->RemoveEntry(pLeft->GetSelectedEntry(--j));
enableButtons();
}
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index d8b3cc499afe..2a15f19e4fb6 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -280,7 +280,7 @@ OUString OWizTypeSelect::GetTitle() const
IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void )
{
- OUString aColumnName( m_pColumnNames->GetSelectEntry() );
+ OUString aColumnName( m_pColumnNames->GetSelectedEntry() );
OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
if(pField)
@@ -325,7 +325,7 @@ void OWizTypeSelect::ActivatePage( )
bool OWizTypeSelect::LeavePage()
{
- OUString aColumnName( m_pColumnNames->GetSelectEntry() );
+ OUString aColumnName( m_pColumnNames->GetSelectedEntry() );
bool bDuplicateName = false;
OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 9ca82f428876..0d5dd0d05c47 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -980,7 +980,7 @@ bool OSelectionBrowseBox::SaveModified()
case BROW_TABLE_ROW:
{
- OUString aAliasName = m_pTableCell->GetSelectEntry();
+ OUString aAliasName = m_pTableCell->GetSelectedEntry();
strOldCellContents = pEntry->GetAlias();
if ( m_pTableCell->GetSelectEntryPos() != 0 )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 15:33:04 +0000