summaryrefslogtreecommitdiff
path: root/sw/source/ui/dbui
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 /sw/source/ui/dbui
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 'sw/source/ui/dbui')
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx12
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx12
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx6
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx2
7 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index ea59468ae7b6..f3bf43e9959c 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -782,7 +782,7 @@ IMPL_LINK_NOARG(SwFindEntryDialog, FindHdl_Impl, Button*, void)
{
sal_Int32 nColumn = -1;
if(m_pFindOnlyCB->IsChecked())
- nColumn = m_pFindOnlyLB->GetSelectEntryPos();
+ nColumn = m_pFindOnlyLB->GetSelectedEntryPos();
if(nColumn != LISTBOX_ENTRY_NOTFOUND)
m_pParent->Find(m_pFindED->GetText(), nColumn);
}
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 1e2851cc4324..613860b020e7 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -83,7 +83,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, ListBox&, v
IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, void)
{
bool bRename = pButton == m_pRenamePB;
- sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pFieldsLB->GetSelectedEntryPos();
if(nPos == LISTBOX_ENTRY_NOTFOUND)
nPos = 0;
@@ -107,7 +107,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, voi
}
else
{
- if ( m_pFieldsLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
+ if ( m_pFieldsLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND )
++nPos; // append the new entry behind the selected
//add the new column
m_pNewData->aDBColumnHeaders.insert(m_pNewData->aDBColumnHeaders.begin() + nPos, sNew);
@@ -126,8 +126,8 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, voi
IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void)
{
- sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos();
- m_pFieldsLB->RemoveEntry(m_pFieldsLB->GetSelectEntryPos());
+ sal_Int32 nPos = m_pFieldsLB->GetSelectedEntryPos();
+ m_pFieldsLB->RemoveEntry(m_pFieldsLB->GetSelectedEntryPos());
m_pFieldsLB->SelectEntryPos(nPos > m_pFieldsLB->GetEntryCount() - 1 ? nPos - 1 : nPos);
//remove the column
@@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void)
IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void)
{
sal_Int32 nPos;
- sal_Int32 nOldPos = nPos = m_pFieldsLB->GetSelectEntryPos();
+ sal_Int32 nOldPos = nPos = m_pFieldsLB->GetSelectedEntryPos();
OUString aTemp = m_pFieldsLB->GetEntry(nPos);
m_pFieldsLB->RemoveEntry( nPos );
if(pButton == m_pUpPB)
@@ -169,7 +169,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void)
void SwCustomizeAddressListDialog::UpdateButtons()
{
- sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pFieldsLB->GetSelectedEntryPos();
sal_Int32 nEntries = m_pFieldsLB->GetEntryCount();
m_pUpPB->Enable(nPos > 0 && nEntries > 0);
m_pDownPB->Enable(nPos < nEntries -1);
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index a644749f6794..fc4ad77224b0 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -508,7 +508,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void )
{
bEnableTo = false;
- sal_Int32 n, nInsPos = m_pLbTableCol->GetSelectEntryPos(),
+ sal_Int32 n, nInsPos = m_pLbTableCol->GetSelectedEntryPos(),
nCnt = m_pLbTableDbColumn->GetEntryCount();
if( LISTBOX_APPEND == nInsPos )
for( n = 0; n < nCnt; ++n )
@@ -521,10 +521,10 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void )
m_pLbTableDbColumn->SelectEntryPos( LISTBOX_APPEND );
}
else if( pButton == m_pIbDbcolOneTo &&
- LISTBOX_ENTRY_NOTFOUND != m_pLbTableDbColumn->GetSelectEntryPos() )
+ LISTBOX_ENTRY_NOTFOUND != m_pLbTableDbColumn->GetSelectedEntryPos() )
{
- sal_Int32 nInsPos = m_pLbTableCol->GetSelectEntryPos(),
- nDelPos = m_pLbTableDbColumn->GetSelectEntryPos(),
+ sal_Int32 nInsPos = m_pLbTableCol->GetSelectedEntryPos(),
+ nDelPos = m_pLbTableDbColumn->GetSelectedEntryPos(),
nTopPos = m_pLbTableDbColumn->GetTopEntry();
m_pLbTableCol->InsertEntry( m_pLbTableDbColumn->GetEntry( nDelPos ), nInsPos );
m_pLbTableDbColumn->RemoveEntry( nDelPos );
@@ -539,10 +539,10 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void )
}
else if( pButton == m_pIbDbcolOneFrom )
{
- if( LISTBOX_ENTRY_NOTFOUND != m_pLbTableCol->GetSelectEntryPos() )
+ if( LISTBOX_ENTRY_NOTFOUND != m_pLbTableCol->GetSelectedEntryPos() )
{
sal_Int32 nInsPos,
- nDelPos = m_pLbTableCol->GetSelectEntryPos(),
+ nDelPos = m_pLbTableCol->GetSelectedEntryPos(),
nTopPos = m_pLbTableCol->GetTopEntry();
// look for the right InsertPos!!
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 802309818f5d..17ee1512e736 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -928,7 +928,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
else //otherwise the current column name may match one of the db columns
pNewLB->SelectEntry(rHeader);
//then the preview can be filled accordingly
- if(xColAccess.is() && pNewLB->GetSelectEntryPos() > 0 &&
+ if(xColAccess.is() && pNewLB->GetSelectedEntryPos() > 0 &&
xColAccess->hasByName(pNewLB->GetSelectedEntry()))
{
uno::Any aCol = xColAccess->getByName(pNewLB->GetSelectedEntry());
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 5f9a4636b13a..5f11cd94177c 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -65,7 +65,7 @@ static void lcl_StoreGreetingsBox(ListBox const & rBox,
for(sal_Int32 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry)
pEntries[nEntry] = rBox.GetEntry(nEntry);
rConfig.SetGreetings(eType, aEntries);
- rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos());
+ rConfig.SetCurrentGreeting(eType, rBox.GetSelectedEntryPos());
}
static void lcl_StoreGreetingsBox(ComboBox const & rBox,
@@ -77,7 +77,7 @@ static void lcl_StoreGreetingsBox(ComboBox const & rBox,
for(sal_Int32 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry)
pEntries[nEntry] = rBox.GetEntry(nEntry);
rConfig.SetGreetings(eType, aEntries);
- rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos());
+ rConfig.SetCurrentGreeting(eType, rBox.GetSelectedEntryPos());
}
IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl, Button*, void)
@@ -501,7 +501,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl, Button*, void)
{
const SwDBData& rDBData = m_rConfigItem.GetCurrentDBData();
Sequence< OUString> aAssignment = m_rConfigItem.GetColumnAssignment( rDBData );
- sal_Int32 nPos = m_pFemaleColumnLB->GetSelectEntryPos();
+ sal_Int32 nPos = m_pFemaleColumnLB->GetSelectedEntryPos();
if(aAssignment.getLength() < MM_PART_GENDER)
aAssignment.realloc(MM_PART_GENDER);
if( nPos > 0 )
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 7c08f53d24a5..7f2085d08f3b 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -665,7 +665,7 @@ IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void)
{
sal_Int16 eType = DocumentZoomType::BY_VALUE;
short nZoom = 50;
- switch(rBox.GetSelectEntryPos())
+ switch(rBox.GetSelectedEntryPos())
{
case 0 : eType = DocumentZoomType::ENTIRE_PAGE; break;
case 1 : nZoom = 50; break;
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index d803c6a194c6..f7df31f1064e 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -762,7 +762,7 @@ IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, void)
SwView* pView = ::GetActiveView();
std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem();
assert(xConfigItem);
- if (rBox.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
+ if (rBox.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
{
const QueueInfo* pInfo = Printer::GetQueueInfo( rBox.GetSelectedEntry(), false );