summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
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 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx8
-rw-r--r--sfx2/source/dialog/mgetempl.cxx6
-rw-r--r--sfx2/source/dialog/printopt.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/doc/new.cxx8
-rw-r--r--sfx2/source/doc/saveastemplatedlg.cxx2
-rw-r--r--sfx2/source/doc/templatedlg.cxx8
7 files changed, 18 insertions, 18 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8bd88551c1e1..6063e8064b5c 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1180,7 +1180,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
case MID_RENAME :
{
- sal_Int32 nPos = GetSelectEntryPos();
+ sal_Int32 nPos = GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
ScopedVclPtrInstance< SfxAddHelpBookmarkDialog_Impl > aDlg(this, true);
@@ -1202,7 +1202,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
case MID_DELETE :
{
- sal_Int32 nPos = GetSelectEntryPos();
+ sal_Int32 nPos = GetSelectedEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
RemoveEntry( nPos );
@@ -1486,7 +1486,7 @@ void SfxHelpIndexWindow_Impl::Initialize()
}
m_pActiveLB->SetDropDownLineCount( (sal_uInt16)aFactories.size() );
- if ( m_pActiveLB->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
+ if ( m_pActiveLB->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND )
SetActiveFactory();
}
@@ -1506,7 +1506,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
*pFactory = pFactory->toAsciiLowerCase();
if ( *pFactory == pIPage->GetFactory() )
{
- if ( m_pActiveLB->GetSelectEntryPos() != i )
+ if ( m_pActiveLB->GetSelectedEntryPos() != i )
{
m_pActiveLB->SelectEntryPos(i);
aSelectFactoryLink.Call( nullptr );
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 66bb328dda24..76a0f097958b 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -87,7 +87,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx
else
m_pEditStyleBtn->Enable();
- sal_Int32 linkSelectPos = m_pBaseLb->GetSelectEntryPos();
+ sal_Int32 linkSelectPos = m_pBaseLb->GetSelectedEntryPos();
if ( linkSelectPos == 0 )
m_pEditLinkStyleBtn->Disable();
else
@@ -355,7 +355,7 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void )
IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&, void )
{
- sal_Int32 linkSelectPos = m_pBaseLb->GetSelectEntryPos();
+ sal_Int32 linkSelectPos = m_pBaseLb->GetSelectedEntryPos();
if ( linkSelectPos == 0 )
m_pEditLinkStyleBtn->Disable();
else
@@ -452,7 +452,7 @@ bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet )
*/
{
- const sal_Int32 nFilterIdx = m_pFilterLb->GetSelectEntryPos();
+ const sal_Int32 nFilterIdx = m_pFilterLb->GetSelectedEntryPos();
// Set Filter
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 00270770863b..5e6a0ece8ab7 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -259,7 +259,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt
pCurrentOptions->SetReduceBitmaps( m_pReduceBitmapsCB->IsChecked() );
pCurrentOptions->SetReducedBitmapMode( m_pReduceBitmapsOptimalRB->IsChecked() ? PrinterBitmapMode::Optimal :
( m_pReduceBitmapsNormalRB->IsChecked() ? PrinterBitmapMode::Normal : PrinterBitmapMode::Resolution ) );
- pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ std::min<sal_uInt16>( m_pReduceBitmapsResolutionLB->GetSelectEntryPos(),
+ pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ std::min<sal_uInt16>( m_pReduceBitmapsResolutionLB->GetSelectedEntryPos(),
SAL_N_ELEMENTS(aDPIArray) - 1 ) ] );
pCurrentOptions->SetReducedBitmapIncludesTransparency( m_pReduceBitmapsTransparencyCB->IsChecked() );
pCurrentOptions->SetConvertToGreyscales( m_pConvertToGreyscalesCB->IsChecked() );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 08166ceb8302..e20305027caa 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1622,7 +1622,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
// If bHierarchical, then the family can have changed
// minus one since hierarchical is inserted at the start
m_bWantHierarchical = false; // before FilterSelect
- FilterSelect(aFilterLb->GetSelectEntryPos() - 1, bHierarchical );
+ FilterSelect(aFilterLb->GetSelectedEntryPos() - 1, bHierarchical );
bHierarchical=false;
}
}
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 790a474509ce..6ca5d80bcede 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -188,7 +188,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update, Timer*, void)
if (m_pMoreBt->get_expanded() && (nFlags == SfxNewFileDialogMode::Preview))
{
- OUString aFileName = aTemplates.GetPath(m_pRegionLb->GetSelectEntryPos(), nEntry - 1);
+ OUString aFileName = aTemplates.GetPath(m_pRegionLb->GetSelectedEntryPos(), nEntry - 1);
INetURLObject aTestObj(aFileName);
if (aTestObj.GetProtocol() == INetProtocol::NotValid)
{
@@ -238,7 +238,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void )
if (xDocShell.Is() && xDocShell->GetProgress())
return;
- const sal_uInt16 nRegion = rBox.GetSelectEntryPos();
+ const sal_uInt16 nRegion = rBox.GetSelectedEntryPos();
const sal_uInt16 nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0;
m_pTemplateLb->SetUpdateMode(false);
m_pTemplateLb->Clear();
@@ -289,7 +289,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile, Button*, void)
sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
{
- sal_uInt16 nEntry = m_pTemplateLb->GetSelectEntryPos();
+ sal_uInt16 nEntry = m_pTemplateLb->GetSelectedEntryPos();
OUString aSel = m_pRegionLb->GetSelectedEntry();
sal_Int32 nc = aSel.indexOf('(');
if (nc != -1 && nc != 0)
@@ -311,7 +311,7 @@ OUString SfxNewFileDialog_Impl::GetTemplateFileName() const
{
if(!IsTemplate() || !aTemplates.GetRegionCount())
return OUString();
- return aTemplates.GetPath(m_pRegionLb->GetSelectEntryPos(),
+ return aTemplates.GetPath(m_pRegionLb->GetSelectedEntryPos(),
GetSelectedTemplatePos()-1);
}
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx
index 03d1ad6bc5b7..68d14d5a2a8a 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -106,7 +106,7 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, TemplateNameEditHdl, Edit&, void)
IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void)
{
- if(mpLBCategory->GetSelectEntryPos() == 0)
+ if(mpLBCategory->GetSelectedEntryPos() == 0)
{
msSelectedCategory = OUString();
mpOKButton->Disable();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index a65f11446ad6..2616ad998659 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -326,7 +326,7 @@ void SfxTemplateManagerDlg::setDocumentModel(const uno::Reference<frame::XModel>
FILTER_APPLICATION SfxTemplateManagerDlg::getCurrentApplicationFilter()
{
- const sal_Int16 nCurAppId = mpCBApp->GetSelectEntryPos();
+ const sal_Int16 nCurAppId = mpCBApp->GetSelectedEntryPos();
if (nCurAppId == MNI_WRITER)
return FILTER_APPLICATION::WRITER;
@@ -457,7 +457,7 @@ void SfxTemplateManagerDlg::writeSettings ()
Sequence< NamedValue > aSettings
{
{ TM_SETTING_LASTFOLDER, css::uno::makeAny(aLastFolder) },
- { TM_SETTING_LASTAPPLICATION, css::uno::makeAny(sal_uInt16(mpCBApp->GetSelectEntryPos())) }
+ { TM_SETTING_LASTAPPLICATION, css::uno::makeAny(sal_uInt16(mpCBApp->GetSelectedEntryPos())) }
};
// write
@@ -483,7 +483,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void)
{
const OUString sSelectedRegion = mpCBFolder->GetSelectedEntry();
- if(mpCBFolder->GetSelectEntryPos() == 0)
+ if(mpCBFolder->GetSelectedEntryPos() == 0)
{
mpLocalView->showAllTemplates();
mpActionMenu->HideItem(MNI_ACTION_RENAME_FOLDER);
@@ -1355,7 +1355,7 @@ IMPL_LINK_NOARG(SfxTemplateCategoryDialog, NewCategoryEditHdl, Edit&, void)
IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, ListBox&, void)
{
- if(mpLBCategory->GetSelectEntryPos() == 0)
+ if(mpLBCategory->GetSelectedEntryPos() == 0)
{
msSelectedCategory = OUString();
mpOKButton->Disable();