summaryrefslogtreecommitdiff
path: root/sw/source/ui/index
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/index
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/index')
-rw-r--r--sw/source/ui/index/cnttab.cxx38
-rw-r--r--sw/source/ui/index/multmrk.cxx6
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx2
3 files changed, 23 insertions, 23 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 56e02a7fa898..778824461355 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1140,7 +1140,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aCurType);
rDesc.SetTitle(m_pTitleED->GetText());
- rDesc.SetFromChapter(1 == m_pAreaLB->GetSelectEntryPos());
+ rDesc.SetFromChapter(1 == m_pAreaLB->GetSelectedEntryPos());
SwTOXElement nContentOptions = SwTOXElement::NONE;
if(m_pTOXMarksCB->IsVisible() && m_pTOXMarksCB->IsChecked())
nContentOptions |= SwTOXElement::Mark;
@@ -1192,7 +1192,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
case TOX_TABLES :
rDesc.SetCreateFromObjectNames(m_pFromObjectNamesRB->IsChecked());
rDesc.SetSequenceName(m_pCaptionSequenceLB->GetSelectedEntry());
- rDesc.SetCaptionDisplay((SwCaptionDisplay)m_pDisplayTypeLB->GetSelectEntryPos());
+ rDesc.SetCaptionDisplay((SwCaptionDisplay)m_pDisplayTypeLB->GetSelectedEntryPos());
break;
case TOX_OBJECTS:
{
@@ -1211,7 +1211,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
case TOX_AUTHORITIES:
case TOX_BIBLIOGRAPHY :
{
- if(m_pBracketLB->GetSelectEntryPos())
+ if(m_pBracketLB->GetSelectedEntryPos())
rDesc.SetAuthBrackets(m_pBracketLB->GetSelectedEntry());
else
rDesc.SetAuthBrackets(aEmptyOUStr);
@@ -1460,7 +1460,7 @@ void SwTOXSelectTabPage::LanguageHdl( ListBox const * pBox )
m_pSortAlgorithmLB->SelectEntryPos( nInsPos );
}
- if( LISTBOX_ENTRY_NOTFOUND == m_pSortAlgorithmLB->GetSelectEntryPos() )
+ if( LISTBOX_ENTRY_NOTFOUND == m_pSortAlgorithmLB->GetSelectedEntryPos() )
m_pSortAlgorithmLB->SelectEntryPos( 0 );
if(pBox)
@@ -2248,7 +2248,7 @@ VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent, const Sf
IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void)
{
- if( LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectEntryPos())
+ if( LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectedEntryPos())
{
SfxStringItem aStyle(SID_STYLE_EDIT, m_pCharStyleLB->GetSelectedEntry());
SfxUInt16Item aFamily(SID_STYLE_FAMILY, (sal_uInt16)SfxStyleFamily::Char);
@@ -2264,7 +2264,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void)
bool bInsert = pButton == m_pAuthInsertPB;
if(bInsert)
{
- sal_Int32 nSelPos = m_pAuthFieldsLB->GetSelectEntryPos();
+ sal_Int32 nSelPos = m_pAuthFieldsLB->GetSelectedEntryPos();
const OUString sToInsert(m_pAuthFieldsLB->GetSelectedEntry());
SwFormToken aInsert(TOKEN_AUTHORITY);
aInsert.nAuthorityField = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pAuthFieldsLB->GetEntryData(nSelPos));
@@ -2585,7 +2585,7 @@ IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void)
IMPL_LINK(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void)
{
- sal_Int32 nPos = rBox.GetSelectEntryPos();
+ sal_Int32 nPos = rBox.GetSelectedEntryPos();
if(LISTBOX_ENTRY_NOTFOUND != nPos)
{
Control* pCtrl = m_pTokenWIN->GetActiveControl();
@@ -2611,7 +2611,7 @@ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void)
IMPL_LINK(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void)
{
- const sal_Int32 nPos = rBox.GetSelectEntryPos();
+ const sal_Int32 nPos = rBox.GetSelectedEntryPos();
if(LISTBOX_ENTRY_NOTFOUND != nPos)
{
@@ -3776,7 +3776,7 @@ VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent,
IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void)
{
- if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectEntryPos())
+ if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectedEntryPos())
{
SfxStringItem aStyle(SID_STYLE_EDIT, m_pParaLayLB->GetSelectedEntry());
SfxUInt16Item aFamily(SID_STYLE_FAMILY, (sal_uInt16)SfxStyleFamily::Para);
@@ -3790,8 +3790,8 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void)
// allocate templates
IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl, Button*, void)
{
- sal_Int32 nLevPos = m_pLevelLB->GetSelectEntryPos();
- sal_Int32 nTemplPos = m_pParaLayLB->GetSelectEntryPos();
+ sal_Int32 nLevPos = m_pLevelLB->GetSelectedEntryPos();
+ sal_Int32 nTemplPos = m_pParaLayLB->GetSelectedEntryPos();
if(nLevPos != LISTBOX_ENTRY_NOTFOUND &&
nTemplPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -3811,7 +3811,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl, Button*, void)
IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl, Button*, void)
{
- const sal_Int32 nPos = m_pLevelLB->GetSelectEntryPos();
+ const sal_Int32 nPos = m_pLevelLB->GetSelectedEntryPos();
if(nPos != LISTBOX_ENTRY_NOTFOUND)
{
const OUString aStr(m_pLevelLB->GetEntry(nPos).getToken(0, aDeliStart));
@@ -3828,22 +3828,22 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void)
const OUString aTmpName( m_pParaLayLB->GetSelectedEntry() );
SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
- if(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
- (m_pLevelLB->GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)))
+ if(m_pParaLayLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
+ (m_pLevelLB->GetSelectedEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)))
AssignHdl(m_pAssignBT);
}
// enable only when selected
IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl, ListBox&, void)
{
- m_pStdBT->Enable(m_pLevelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND);
+ m_pStdBT->Enable(m_pLevelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND);
SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
const OUString aTmpName(m_pParaLayLB->GetSelectedEntry());
- m_pAssignBT->Enable(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
- LISTBOX_ENTRY_NOTFOUND != m_pLevelLB->GetSelectEntryPos() &&
- (m_pLevelLB->GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)));
- m_pEditStyleBT->Enable(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND );
+ m_pAssignBT->Enable(m_pParaLayLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
+ LISTBOX_ENTRY_NOTFOUND != m_pLevelLB->GetSelectedEntryPos() &&
+ (m_pLevelLB->GetSelectedEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)));
+ m_pEditStyleBT->Enable(m_pParaLayLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND );
}
void SwTOXStylesTabPage::Modify()
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index 239a345c6deb..c53f6aa1702b 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -45,10 +45,10 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr)
IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, ListBox&, rBox, void )
{
- if(rBox.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
- { SwTOXMark* pMark = rMgr.GetTOXMark(rBox.GetSelectEntryPos());
+ if(rBox.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
+ { SwTOXMark* pMark = rMgr.GetTOXMark(rBox.GetSelectedEntryPos());
m_pTextFT->SetText(pMark->GetTOXType()->GetTypeName());
- nPos = rBox.GetSelectEntryPos();
+ nPos = rBox.GetSelectedEntryPos();
}
}
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 958e28055ecd..aed8a53195ec 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1593,7 +1593,7 @@ OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons
if( AUTH_FIELD_AUTHORITY_TYPE == eField )
{
OSL_ENSURE(pTypeListBox, "No ListBox");
- return OUString::number(pTypeListBox->GetSelectEntryPos());
+ return OUString::number(pTypeListBox->GetSelectedEntryPos());
}
if( AUTH_FIELD_IDENTIFIER == eField && !m_bNewEntryMode)