summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-14 17:00:06 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-25 10:00:46 +0200
commit83de03e077d219c881626de43960ae4756284371 (patch)
tree2d582083e3c060139699b075565f55f872edb7b1 /cui
parent4d5e9db574bdb1a7517ffda01efe0746cc058d47 (diff)
Rename GetSelectEntryCount -> GetSelectedEntryCount
Change-Id: I405b347b404ed0acb3b6a0204e0b914a7698ce25 Reviewed-on: https://gerrit.libreoffice.org/42284 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/SpellDialog.cxx4
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx4
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx10
-rw-r--r--cui/source/dialogs/showcols.cxx2
-rw-r--r--cui/source/options/optchart.cxx2
-rw-r--r--cui/source/options/optjava.cxx4
-rw-r--r--cui/source/options/tsaurls.cxx2
-rw-r--r--cui/source/tabpages/autocdlg.cxx4
-rw-r--r--cui/source/tabpages/numpages.cxx12
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx10
10 files changed, 27 insertions, 27 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index c3183a8909df..42c91096d9c1 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -465,7 +465,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn, void )
//the current suggestion should be used
//if it's not the 'no suggestions' entry
if(sWrong == sCurrentErrorText &&
- m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount() > 0 &&
+ m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectedEntryCount() > 0 &&
m_sNoSuggestionsST != m_pSuggestionLB->GetSelectedEntry())
{
sCurrentErrorText = m_pSuggestionLB->GetSelectedEntry();
@@ -529,7 +529,7 @@ OUString SpellDialog::getReplacementString() const
OUString sReplacement(sOrigString);
if(m_pSuggestionLB->IsEnabled() &&
- m_pSuggestionLB->GetSelectEntryCount()>0 &&
+ m_pSuggestionLB->GetSelectedEntryCount()>0 &&
m_sNoSuggestionsST != m_pSuggestionLB->GetSelectedEntry())
sReplacement = m_pSuggestionLB->GetSelectedEntry();
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 9d025f17f7c2..2f8830e93512 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -407,14 +407,14 @@ IMPL_LINK_NOARG(FmSearchDialog, OnFocusGrabbed, Control&, void)
IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void)
{
- DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unexpected : not exactly one entry selected!");
+ DBG_ASSERT(rBox.GetSelectedEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unexpected : not exactly one entry selected!");
m_pSearchEngine->SetPosition(m_plbPosition->GetSelectedEntryPos());
}
IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void)
{
- DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unexpected : not exactly one entry select!");
+ DBG_ASSERT(rBox.GetSelectedEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unexpected : not exactly one entry select!");
m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectedEntryPos());
// calls m_pSearchEngine->InvalidatePreviousLoc too
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 945ba73c3d53..3a8c9b60d341 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -283,7 +283,7 @@ void TakeThread::execute()
{
SolarMutexGuard aGuard;
pStatusProgress = new GalleryProgress;
- nEntries = mpBrowser->bTakeAll ? mpBrowser->m_pLbxFound->GetEntryCount() : mpBrowser->m_pLbxFound->GetSelectEntryCount();
+ nEntries = mpBrowser->bTakeAll ? mpBrowser->m_pLbxFound->GetEntryCount() : mpBrowser->m_pLbxFound->GetSelectedEntryCount();
pThm->LockBroadcaster();
}
@@ -1019,7 +1019,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl, Button*, void)
void TPGalleryThemeProperties::TakeFiles()
{
- if( m_pLbxFound->GetSelectEntryCount() || ( bTakeAll && bEntriesFound ) )
+ if( m_pLbxFound->GetSelectedEntryCount() || ( bTakeAll && bEntriesFound ) )
{
VclPtrInstance<TakeProgress> pTakeProgress( this );
pTakeProgress->Update();
@@ -1084,7 +1084,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl, Button*, void)
{
aPreviewTimer.Stop();
- if( !m_pLbxFound->GetSelectEntryCount() || !bEntriesFound )
+ if( !m_pLbxFound->GetSelectedEntryCount() || !bEntriesFound )
{
SvxOpenGraphicDialog aDlg("Gallery", this);
aDlg.EnableLink(false);
@@ -1123,7 +1123,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void)
if( bEntriesFound )
{
- if( m_pLbxFound->GetSelectEntryCount() == 1 )
+ if( m_pLbxFound->GetSelectedEntryCount() == 1 )
{
m_pCbxPreview->Enable();
bPreviewPossible = true;
@@ -1149,7 +1149,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void)
{
aPreviewTimer.Stop();
- if (m_pLbxFound->GetSelectEntryCount() == 1 && bEntriesFound)
+ if (m_pLbxFound->GetSelectedEntryCount() == 1 && bEntriesFound)
ClickTakeHdl(nullptr);
}
}
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index d2c950b8f6a2..cc1078e8d7cb 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -57,7 +57,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk, Button*, void)
if (m_xColumns.is())
{
css::uno::Reference< css::beans::XPropertySet > xCol;
- for (sal_Int32 i=0; i < m_pList->GetSelectEntryCount(); ++i)
+ for (sal_Int32 i=0; i < m_pList->GetSelectedEntryCount(); ++i)
{
m_xColumns->getByIndex(sal::static_int_cast<sal_Int32>(reinterpret_cast<sal_uIntPtr>(m_pList->GetEntryData(m_pList->GetSelectedEntryPos(i))))) >>= xCol;
if (xCol.is())
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index af7ce029c4b6..7cecd8e01376 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -290,7 +290,7 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void )
{
sal_Int32 nIndex = m_pLbChartColors->GetSelectedEntryPos();
- if (m_pLbChartColors->GetSelectEntryCount() == 0)
+ if (m_pLbChartColors->GetSelectedEntryCount() == 0)
return;
if( pColorConfig )
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index b619232e1c8f..773230ad8fc9 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -912,7 +912,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void)
aDlg.SetTitle( CuiResId( RID_SVXSTR_ARCHIVE_TITLE ) );
aDlg.AddFilter( CuiResId( RID_SVXSTR_ARCHIVE_HEADLINE ), "*.jar;*.zip" );
OUString sFolder;
- if ( m_pPathList->GetSelectEntryCount() > 0 )
+ if ( m_pPathList->GetSelectedEntryCount() > 0 )
{
INetURLObject aObj( m_pPathList->GetSelectedEntry(), FSysStyle::Detect );
sFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
@@ -947,7 +947,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void)
Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);
OUString sOldFolder;
- if ( m_pPathList->GetSelectEntryCount() > 0 )
+ if ( m_pPathList->GetSelectedEntryCount() > 0 )
{
INetURLObject aObj( m_pPathList->GetSelectedEntry(), FSysStyle::Detect );
sOldFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index b53741f1691d..683151215a5f 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -51,7 +51,7 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
SAL_WARN("cui.options", "TSAURLsDialog::TSAURLsDialog(): caught exception" << e.Message);
}
- if ( m_pURLListBox->GetSelectEntryCount() == 0 )
+ if ( m_pURLListBox->GetSelectedEntryCount() == 0 )
{
m_pDeleteBtn->Disable();
}
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index ec37b08ecf0f..8477210c98a3 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2357,7 +2357,7 @@ void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& )
IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl, Button*, void)
{
sal_Int32 nSelCnt =
- (m_pAutoCompleteList) ? m_pLBEntries->GetSelectEntryCount() : 0;
+ (m_pAutoCompleteList) ? m_pLBEntries->GetSelectedEntryCount() : 0;
while( nSelCnt )
{
sal_Int32 nPos = m_pLBEntries->GetSelectedEntryPos( --nSelCnt );
@@ -2384,7 +2384,7 @@ IMPL_LINK( OfaAutoCompleteTabPage, CheckHdl, CheckBox&, rBox, void )
void OfaAutoCompleteTabPage::CopyToClipboard() const
{
- sal_Int32 nSelCnt = m_pLBEntries->GetSelectEntryCount();
+ sal_Int32 nSelCnt = m_pLBEntries->GetSelectedEntryCount();
if (m_pAutoCompleteList && nSelCnt)
{
rtl::Reference<TransferDataContainer> pCntnr = new TransferDataContainer;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0f65307f512a..89a4c14b63f4 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1709,7 +1709,7 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox&, rBox, void )
sal_uInt16 nSaveNumLvl = nActNumLvl;
nActNumLvl = 0;
if(rBox.IsEntryPosSelected( pActNum->GetLevelCount() ) &&
- (rBox.GetSelectEntryCount() == 1 || nSaveNumLvl != 0xffff))
+ (rBox.GetSelectedEntryCount() == 1 || nSaveNumLvl != 0xffff))
{
nActNumLvl = 0xFFFF;
rBox.SetUpdateMode(false);
@@ -1717,7 +1717,7 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox&, rBox, void )
rBox.SelectEntryPos( i, false );
rBox.SetUpdateMode(true);
}
- else if(rBox.GetSelectEntryCount())
+ else if(rBox.GetSelectedEntryCount())
{
sal_uInt16 nMask = 1;
for( sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++ )
@@ -2775,7 +2775,7 @@ void SvxNumPositionTabPage::InitControls()
bInInintControl = true;
const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
m_pRelativeCB->IsEnabled() && m_pRelativeCB->IsChecked();
- const bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 &&
+ const bool bSingleSelection = m_pLevelLB->GetSelectedEntryCount() == 1 &&
SAL_MAX_UINT16 != nActNumLvl;
m_pDistBorderMF->Enable( !bLabelAlignmentPosAndSpaceModeActive &&
@@ -3210,7 +3210,7 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void )
sal_uInt16 nSaveNumLvl = nActNumLvl;
nActNumLvl = 0;
if(rBox.IsEntryPosSelected( pActNum->GetLevelCount() ) &&
- (rBox.GetSelectEntryCount() == 1 || nSaveNumLvl != 0xffff))
+ (rBox.GetSelectedEntryCount() == 1 || nSaveNumLvl != 0xffff))
{
nActNumLvl = 0xFFFF;
rBox.SetUpdateMode(false);
@@ -3218,7 +3218,7 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void )
rBox.SelectEntryPos( i, false );
rBox.SetUpdateMode(true);
}
- else if(rBox.GetSelectEntryCount())
+ else if(rBox.GetSelectedEntryCount())
{
sal_uInt16 nMask = 1;
for( sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++ )
@@ -3317,7 +3317,7 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, SpinField&, rFld, void )
IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void )
{
bool bOn = static_cast<CheckBox*>(pBox)->IsChecked();
- bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl;
+ bool bSingleSelection = m_pLevelLB->GetSelectedEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl;
bool bSetValue = false;
long nValue = 0;
if(bOn || bSingleSelection)
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 08d2014f676a..9900c356ad8a 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1300,7 +1300,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
RangeModifyHdl( *m_pWidthMF );
short nRel = 0;
- if (rLB.GetSelectEntryCount())
+ if (rLB.GetSelectedEntryCount())
{
if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
@@ -1703,7 +1703,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
{
rLB.SelectEntry(sOldEntry);
- if (!rLB.GetSelectEntryCount())
+ if (!rLB.GetSelectedEntryCount())
{
for (sal_Int32 i = 0; i < rLB.GetEntryCount(); i++)
{
@@ -1788,7 +1788,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
}
}
- if (!rLB.GetSelectEntryCount())
+ if (!rLB.GetSelectedEntryCount())
rLB.SelectEntryPos(0);
}
}
@@ -1842,10 +1842,10 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
}
_rLB.SelectEntry(sSelEntry);
- if (!_rLB.GetSelectEntryCount())
+ if (!_rLB.GetSelectedEntryCount())
_rLB.SelectEntry(sOldEntry);
- if (!_rLB.GetSelectEntryCount())
+ if (!_rLB.GetSelectedEntryCount())
_rLB.SelectEntryPos(0);
PosHdl(_rLB);