summaryrefslogtreecommitdiff
path: root/sw/source/ui/dbui/mmaddressblockpage.cxx
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-14 16:50:25 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-21 12:44:00 +0200
commitb649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (patch)
treebd6937a0ece320c9545774dd5c9a68c68d04769e /sw/source/ui/dbui/mmaddressblockpage.cxx
parent06ce312f79cb0871c0b110ba4bff16f5aaa0f538 (diff)
Rename GetSelectEntry -> GetSelectedEntry
Change-Id: Ibb7d8c59c0e61b0e87455bd78f241d8691dd9dce Reviewed-on: https://gerrit.libreoffice.org/42282 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/source/ui/dbui/mmaddressblockpage.cxx')
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 425bb4d85468..802309818f5d 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -929,9 +929,9 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
pNewLB->SelectEntry(rHeader);
//then the preview can be filled accordingly
if(xColAccess.is() && pNewLB->GetSelectEntryPos() > 0 &&
- xColAccess->hasByName(pNewLB->GetSelectEntry()))
+ xColAccess->hasByName(pNewLB->GetSelectedEntry()))
{
- uno::Any aCol = xColAccess->getByName(pNewLB->GetSelectEntry());
+ uno::Any aCol = xColAccess->getByName(pNewLB->GetSelectedEntry());
uno::Reference< XColumn > xColumn;
aCol >>= xColumn;
if(xColumn.is())
@@ -1111,7 +1111,7 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void)
IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox&, rBox, void)
{
- const OUString sColumn = rBox.GetSelectEntry();
+ const OUString sColumn = rBox.GetSelectedEntry();
uno::Reference< XColumnsSupplier > xColsSupp( m_rConfigItem->GetResultSet(), uno::UNO_QUERY);
uno::Reference <XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : nullptr;
OUString sPreview;
@@ -1230,7 +1230,7 @@ uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments()
aLBIter != m_pFieldsControl->m_aMatches.end();
++aLBIter, ++nIndex)
{
- const OUString sSelect = (*aLBIter)->GetSelectEntry();
+ const OUString sSelect = (*aLBIter)->GetSelectedEntry();
pAssignments[nIndex] = (m_sNone != sSelect) ? sSelect : OUString();
}
return aAssignments;