[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source chart2/source cui/source dbaccess/source extensions/source formula/source fpicker/source include/sfx2 include/vcl sc/inc sc/source sd/source sfx2/source svx/source sw/source toolkit/source vcl/inc vcl/source
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Mon Sep 25 08:01:21 UTC 2017
accessibility/inc/helper/IComboListBoxHelper.hxx | 2 -
accessibility/inc/helper/listboxhelper.hxx | 4 +--
accessibility/source/standard/vclxaccessiblebox.cxx | 2 -
accessibility/source/standard/vclxaccessiblelist.cxx | 4 +--
basctl/source/basicide/basicbox.cxx | 2 -
basctl/source/dlged/managelang.cxx | 4 +--
chart2/source/controller/dialogs/res_BarGeometry.cxx | 4 +--
chart2/source/controller/dialogs/res_BarGeometry.hxx | 2 -
chart2/source/controller/dialogs/res_DataLabel.cxx | 2 -
chart2/source/controller/dialogs/res_ErrorBar.cxx | 2 -
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 2 -
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 2 -
chart2/source/controller/dialogs/tp_ChartType.cxx | 2 -
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 2 -
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 2 -
cui/source/dialogs/SpellDialog.cxx | 4 +--
cui/source/dialogs/cuifmsearch.cxx | 4 +--
cui/source/dialogs/cuigaldlg.cxx | 10 +++----
cui/source/dialogs/showcols.cxx | 2 -
cui/source/options/optchart.cxx | 2 -
cui/source/options/optjava.cxx | 4 +--
cui/source/options/tsaurls.cxx | 2 -
cui/source/tabpages/autocdlg.cxx | 4 +--
cui/source/tabpages/numpages.cxx | 12 ++++-----
cui/source/tabpages/swpossizetabpage.cxx | 10 +++----
dbaccess/source/ui/dlg/dbfindex.cxx | 4 +--
dbaccess/source/ui/dlg/dsselect.cxx | 2 -
dbaccess/source/ui/misc/WColumnSelect.cxx | 8 +++---
dbaccess/source/ui/misc/WTypeSelect.cxx | 4 +--
extensions/source/abpilot/tableselectionpage.cxx | 4 +--
extensions/source/dbpilots/commonpagesdbp.cxx | 6 ++--
extensions/source/dbpilots/gridwizard.cxx | 4 +--
extensions/source/dbpilots/groupboxwiz.cxx | 4 +--
extensions/source/dbpilots/listcombowizard.cxx | 8 +++---
extensions/source/propctrlr/listselectiondlg.cxx | 2 -
formula/source/ui/dlg/funcpage.cxx | 2 -
fpicker/source/office/RemoteFilesDialog.cxx | 2 -
include/sfx2/controlwrapper.hxx | 2 -
include/vcl/combobox.hxx | 2 -
include/vcl/lstbox.hxx | 2 -
sc/inc/scabstdlg.hxx | 2 -
sc/source/ui/attrdlg/scdlgfact.cxx | 4 +--
sc/source/ui/attrdlg/scdlgfact.hxx | 2 -
sc/source/ui/dbgui/consdlg.cxx | 4 +--
sc/source/ui/dbgui/filtdlg.cxx | 6 ++--
sc/source/ui/dbgui/pfiltdlg.cxx | 4 +--
sc/source/ui/dbgui/pvfundlg.cxx | 4 +--
sc/source/ui/dbgui/scuiasciiopt.cxx | 2 -
sc/source/ui/inc/shtabdlg.hxx | 2 -
sc/source/ui/miscdlgs/instbdlg.cxx | 6 ++--
sc/source/ui/miscdlgs/linkarea.cxx | 4 +--
sc/source/ui/miscdlgs/shtabdlg.cxx | 4 +--
sc/source/ui/navipi/scenwnd.cxx | 8 +++---
sc/source/ui/pagedlg/tptable.cxx | 2 -
sc/source/ui/view/tabvwsh3.cxx | 2 -
sc/source/ui/view/tabvwshf.cxx | 2 -
sd/source/filter/html/pubdlg.cxx | 2 -
sd/source/ui/animations/CustomAnimationPane.cxx | 4 +--
sd/source/ui/animations/SlideTransitionPane.cxx | 6 ++--
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 6 ++--
sd/source/ui/dlg/custsdlg.cxx | 2 -
sd/source/ui/dlg/headerfooterdlg.cxx | 2 -
sd/source/ui/dlg/navigatr.cxx | 2 -
sd/source/ui/dlg/tpaction.cxx | 2 -
sfx2/source/doc/new.cxx | 2 -
svx/source/dialog/frmdirlbox.cxx | 2 -
svx/source/engine3d/float3d.cxx | 4 +--
svx/source/fmcomp/gridcell.cxx | 12 ++++-----
svx/source/tbxctrls/lboxctrl.cxx | 6 ++--
sw/source/ui/envelp/mailmrge.cxx | 4 +--
sw/source/ui/fldui/flddinf.cxx | 2 -
sw/source/ui/fldui/flddok.cxx | 8 +++---
sw/source/ui/fldui/fldfunc.cxx | 6 ++--
sw/source/ui/fldui/fldref.cxx | 12 ++++-----
sw/source/ui/fldui/fldvar.cxx | 10 +++----
sw/source/ui/frmdlg/frmpage.cxx | 10 +++----
sw/source/ui/index/swuiidxmrk.cxx | 6 ++--
sw/source/ui/misc/num.cxx | 8 +++---
toolkit/source/awt/vclxwindows.cxx | 8 +++---
vcl/inc/listbox.hxx | 2 -
vcl/source/control/combobox.cxx | 6 ++--
vcl/source/control/imp_listbox.cxx | 22 ++++++++---------
vcl/source/control/listbox.cxx | 8 +++---
vcl/source/uitest/uiobject.cxx | 2 -
84 files changed, 186 insertions(+), 186 deletions(-)
New commits:
commit 83de03e077d219c881626de43960ae4756284371
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Thu Sep 14 17:00:06 2017 +0200
Rename GetSelectEntryCount -> GetSelectedEntryCount
Change-Id: I405b347b404ed0acb3b6a0204e0b914a7698ce25
Reviewed-on: https://gerrit.libreoffice.org/42284
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx
index 75bd598a85ba..c4b638b70acb 100644
--- a/accessibility/inc/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.hxx
@@ -53,7 +53,7 @@ namespace accessibility
virtual sal_Int32 GetEntryCount() const = 0;
virtual void Select() = 0;
virtual void SelectEntryPos( sal_Int32 nPos, bool bSelect = true ) = 0;
- virtual sal_Int32 GetSelectEntryCount() const = 0;
+ virtual sal_Int32 GetSelectedEntryCount() const = 0;
virtual void SetNoSelection() = 0;
virtual sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex ) const = 0;
virtual bool IsInDropDown() const = 0;
diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
index 0ef5d9f57509..ba6ad5c750ee 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -137,9 +137,9 @@ public:
m_aComboListBox.SelectEntryPos(nPos,bSelect);
}
- virtual sal_Int32 GetSelectEntryCount() const override
+ virtual sal_Int32 GetSelectedEntryCount() const override
{
- return m_aComboListBox.GetSelectEntryCount();
+ return m_aComboListBox.GetSelectedEntryCount();
}
virtual void SetNoSelection() override
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index f4586da3c1c2..9a51958a5493 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -534,7 +534,7 @@ void VCLXAccessibleBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& r
VclPtr< ListBox > pListBox = GetAs< ListBox >();
if (pListBox != nullptr && pListBox->GetEntryCount() > 0)
{
- nSelectedEntryCount = pListBox->GetSelectEntryCount();
+ nSelectedEntryCount = pListBox->GetSelectedEntryCount();
if ( nSelectedEntryCount == 0)
rStateSet.AddState(AccessibleStateType::INDETERMINATE);
}
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index cd3021437a5d..4828649ac699 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -45,7 +45,7 @@ namespace
/// @throws css::lang::IndexOutOfBoundsException
void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, bool bSelected )
{
- sal_Int32 nCount = bSelected ? _rListBox.GetSelectEntryCount()
+ sal_Int32 nCount = bSelected ? _rListBox.GetSelectedEntryCount()
: _rListBox.GetEntryCount();
if ( _nIndex < 0 || _nIndex >= nCount )
throw css::lang::IndexOutOfBoundsException();
@@ -819,7 +819,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( )
sal_Int32 nCount = 0;
if ( m_pListBoxHelper )
- nCount = m_pListBoxHelper->GetSelectEntryCount();
+ nCount = m_pListBoxHelper->GetSelectedEntryCount();
return nCount;
}
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index e0ee83e4beea..f4743270051e 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -214,7 +214,7 @@ void LibBox::FillBox()
SetUpdateMode(true);
SelectEntry( aCurText );
- if ( !GetSelectEntryCount() )
+ if ( !GetSelectedEntryCount() )
{
SelectEntryPos( GetEntryCount() );
aCurText = GetSelectedEntry();
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 2921e52f6b4c..b60ea1d7d6f2 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -166,7 +166,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void)
ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelangdialog.ui");
if ( aQBox->Execute() == RET_OK )
{
- sal_Int32 nCount = m_pLanguageLB->GetSelectEntryCount();
+ sal_Int32 nCount = m_pLanguageLB->GetSelectedEntryCount();
sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos();
// remove locales
Sequence< Locale > aLocaleSeq( nCount );
@@ -216,7 +216,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, ListBox&, void)
bool bEnable = !bEmpty && bSelect;
m_pDeletePB->Enable(bEnable);
- m_pMakeDefPB->Enable(bEnable && nCount > 1 && m_pLanguageLB->GetSelectEntryCount() == 1);
+ m_pMakeDefPB->Enable(bEnable && nCount > 1 && m_pLanguageLB->GetSelectedEntryCount() == 1);
}
// class SetDefaultLanguageDialog -----------------------------------------------
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index b870fd1471c8..3e3fd52be485 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -44,9 +44,9 @@ void BarGeometryResources::Enable( bool bEnable )
m_pLB_Geometry->Enable( bEnable );
}
-sal_Int32 BarGeometryResources::GetSelectEntryCount() const
+sal_Int32 BarGeometryResources::GetSelectedEntryCount() const
{
- return m_pLB_Geometry->GetSelectEntryCount();
+ return m_pLB_Geometry->GetSelectedEntryCount();
}
sal_Int32 BarGeometryResources::GetSelectedEntryPos() const
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index b0f4535cb9a1..1edf1a5d1472 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -34,7 +34,7 @@ public:
void Show( bool bShow );
void Enable( bool bEnable );
- sal_Int32 GetSelectEntryCount() const;
+ sal_Int32 GetSelectedEntryCount() const;
sal_Int32 GetSelectedEntryPos() const;
void SelectEntryPos(sal_Int32 nPos);
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 254eef40ee70..5bbb72604e63 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -305,7 +305,7 @@ bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const
rOutAttrs->Put( SfxInt32Item( SCHATTR_DATADESCR_PLACEMENT, nValue ) );
}
- if( m_pLB_TextDirection->GetSelectEntryCount() > 0 )
+ if( m_pLB_TextDirection->GetSelectedEntryCount() > 0 )
rOutAttrs->Put( SvxFrameDirectionItem( m_pLB_TextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR ) );
if( m_pDC_Dial->IsVisible() )
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 45783bb1db2f..fc3975a6e3e8 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -360,7 +360,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, Button*, void )
m_eErrorKind = SvxChartKindError::Range;
else if( m_pRbFunction->IsChecked())
{
- if( m_pLbFunction->GetSelectEntryCount() == 1 )
+ if( m_pLbFunction->GetSelectedEntryCount() == 1 )
{
switch( m_pLbFunction->GetSelectedEntryPos())
{
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 0527e080c184..c5cfab8e7e0e 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -148,7 +148,7 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
if( m_pCbShowDescription->GetState() != TRISTATE_INDET )
rOutAttrs->Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, m_pCbShowDescription->IsChecked() ) );
- if( m_pLbTextDirection->GetSelectEntryCount() > 0 )
+ if( m_pLbTextDirection->GetSelectedEntryCount() > 0 )
rOutAttrs->Put( SvxFrameDirectionItem( m_pLbTextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR ) );
return true;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 3027e3514fdd..3ab0932585f4 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -321,7 +321,7 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
if( m_pED_CrossesAt->GetText().isEmpty() )
m_pED_CrossesAt->SetValue(0.0);
- if( m_pED_CrossesAtCategory->GetSelectEntryCount() == 0 )
+ if( m_pED_CrossesAtCategory->GetSelectedEntryCount() == 0 )
m_pED_CrossesAtCategory->SelectEntryPos(0);
PlaceLabelsSelectHdl( *m_pLB_PlaceLabels );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index b741b0812ce8..a38fd7426d0d 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -649,7 +649,7 @@ void GeometryResourceGroup::fillControls( const ChartTypeParameter& rParameter )
void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter )
{
rParameter.nGeometry3D = 1;
- if( m_aGeometryResources.GetSelectEntryCount() )
+ if( m_aGeometryResources.GetSelectedEntryCount() )
rParameter.nGeometry3D = m_aGeometryResources.GetSelectedEntryPos();
}
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index b36163dfda7c..4e6518154a70 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -62,7 +62,7 @@ bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
m_aLegendPositionResources.writeToItemSet(*rOutAttrs);
- if( m_pLbTextDirection->GetSelectEntryCount() > 0 )
+ if( m_pLbTextDirection->GetSelectedEntryCount() > 0 )
rOutAttrs->Put( SvxFrameDirectionItem( m_pLbTextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR ) );
return true;
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 1004a9ab6dee..6d6240e89bc9 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -58,7 +58,7 @@ VclPtr<SfxTabPage> SchLayoutTabPage::Create(vcl::Window* pWindow,
bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
- if(m_pGeometryResources && m_pGeometryResources->GetSelectEntryCount())
+ if(m_pGeometryResources && m_pGeometryResources->GetSelectedEntryCount())
{
long nSegs=32;
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);
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index a3bceb671db1..9569bf31b56a 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -110,10 +110,10 @@ bool ODbaseIndexDialog::GetTable(const OUString& _rName, TableInfoList::iterator
void ODbaseIndexDialog::checkButtons()
{
- m_pAdd->Enable(0 != m_pLB_FreeIndexes->GetSelectEntryCount());
+ m_pAdd->Enable(0 != m_pLB_FreeIndexes->GetSelectedEntryCount());
m_pAddAll->Enable(0 != m_pLB_FreeIndexes->GetEntryCount());
- m_pRemove->Enable(0 != m_pLB_TableIndexes->GetSelectEntryCount());
+ m_pRemove->Enable(0 != m_pLB_TableIndexes->GetSelectedEntryCount());
m_pRemoveAll->Enable(0 != m_pLB_TableIndexes->GetEntryCount());
}
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 78bc4d23f311..3f90fd96c7b6 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -87,7 +87,7 @@ void ODatasourceSelectDialog::dispose()
IMPL_LINK( ODatasourceSelectDialog, ListDblClickHdl, ListBox&, rListBox, void )
{
- if (rListBox.GetSelectEntryCount())
+ if (rListBox.GetSelectedEntryCount())
EndDialog(RET_OK);
}
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index c474bf597b56..1f779a534894 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -225,10 +225,10 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void )
if(!bAll)
{
- for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
+ for(sal_Int32 i=0; i < pLeft->GetSelectedEntryCount(); ++i)
moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectedEntry(i),sExtraChars,nMaxNameLen,aCase);
- for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; --j)
+ for(sal_Int32 j=pLeft->GetSelectedEntryCount(); j ; --j)
pLeft->RemoveEntry(pLeft->GetSelectedEntry(j-1));
}
else
@@ -269,9 +269,9 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void )
std::vector< OUString> aRightColumns;
fillColumns(pRight,aRightColumns);
- for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
+ for(sal_Int32 i=0; i < pLeft->GetSelectedEntryCount(); ++i)
moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectedEntry(i),sExtraChars,nMaxNameLen,aCase);
- for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; )
+ for(sal_Int32 j=pLeft->GetSelectedEntryCount(); j ; )
pLeft->RemoveEntry(pLeft->GetSelectedEntry(--j));
enableButtons();
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 091753f742b5..fd0a940de182 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -286,7 +286,7 @@ IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void )
if(pField)
m_pTypeControl->DisplayData(pField);
- m_pTypeControl->Enable(m_pColumnNames->GetSelectEntryCount() == 1 );
+ m_pTypeControl->Enable(m_pColumnNames->GetSelectedEntryCount() == 1 );
}
void OWizTypeSelect::Reset()
@@ -376,7 +376,7 @@ void OWizTypeSelectList::dispose()
bool OWizTypeSelectList::IsPrimaryKeyAllowed() const
{
- const sal_Int32 nCount = GetSelectEntryCount();
+ const sal_Int32 nCount = GetSelectedEntryCount();
for( sal_Int32 j = 0; m_bPKey && j < nCount; ++j )
{
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index c8c2447a7a38..d6882a0f6644 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -82,7 +82,7 @@ namespace abp
IMPL_LINK_NOARG( TableSelectionPage, OnTableDoubleClicked, ListBox&, void )
{
- if ( 1 == m_pTableList->GetSelectEntryCount() )
+ if ( 1 == m_pTableList->GetSelectedEntryCount() )
getDialog()->travelNext();
}
@@ -108,7 +108,7 @@ namespace abp
bool TableSelectionPage::canAdvance() const
{
return AddressBookSourcePage::canAdvance()
- && ( 0 < m_pTableList->GetSelectEntryCount() );
+ && ( 0 < m_pTableList->GetSelectedEntryCount() );
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 713507e5c2f4..463af3ca142e 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -108,10 +108,10 @@ namespace dbp
if (!OControlWizardPage::canAdvance())
return false;
- if (0 == m_pDatasource->GetSelectEntryCount())
+ if (0 == m_pDatasource->GetSelectedEntryCount())
return false;
- if (0 == m_pTable->GetSelectEntryCount())
+ if (0 == m_pTable->GetSelectedEntryCount())
return false;
return true;
@@ -229,7 +229,7 @@ namespace dbp
IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox&, _rBox, void )
{
- if (_rBox.GetSelectEntryCount())
+ if (_rBox.GetSelectedEntryCount())
getDialog()->travelNext();
}
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 3d782de06dd1..87cd21f0358a 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -378,10 +378,10 @@ namespace dbp
void OGridFieldsSelection::implCheckButtons()
{
- m_pSelectOne->Enable(m_pExistFields->GetSelectEntryCount() != 0);
+ m_pSelectOne->Enable(m_pExistFields->GetSelectedEntryCount() != 0);
m_pSelectAll->Enable(m_pExistFields->GetEntryCount() != 0);
- m_pDeselectOne->Enable(m_pSelFields->GetSelectEntryCount() != 0);
+ m_pDeselectOne->Enable(m_pSelFields->GetSelectedEntryCount() != 0);
m_pDeselectAll->Enable(m_pSelFields->GetEntryCount() != 0);
getDialog()->enableButtons(WizardButtonFlags::FINISH, 0 != m_pSelFields->GetEntryCount());
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 703d48f9facc..46e2cd902240 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -258,7 +258,7 @@ namespace dbp
bool bMoveLeft = (m_pMoveLeft == _pButton);
if (bMoveLeft)
{
- while (m_pExistingRadios->GetSelectEntryCount())
+ while (m_pExistingRadios->GetSelectedEntryCount())
m_pExistingRadios->RemoveEntry(m_pExistingRadios->GetSelectedEntryPos());
}
else
@@ -298,7 +298,7 @@ namespace dbp
void ORadioSelectionPage::implCheckMoveButtons()
{
bool bHaveSome = (0 != m_pExistingRadios->GetEntryCount());
- bool bSelectedSome = (0 != m_pExistingRadios->GetSelectEntryCount());
+ bool bSelectedSome = (0 != m_pExistingRadios->GetSelectedEntryCount());
bool bUnfinishedInput = (!m_pRadioName->GetText().isEmpty());
m_pMoveLeft->Enable(bSelectedSome);
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 4b9076bbc89e..ae2426a657fe 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -294,7 +294,7 @@ namespace dbp
if (!OLCPage::canAdvance())
return false;
- return 0 != m_pSelectTable->GetSelectEntryCount();
+ return 0 != m_pSelectTable->GetSelectedEntryCount();
}
@@ -306,7 +306,7 @@ namespace dbp
IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, ListBox&, _rListBox, void )
{
- if (_rListBox.GetSelectEntryCount())
+ if (_rListBox.GetSelectedEntryCount())
getDialog()->travelNext();
}
@@ -390,13 +390,13 @@ namespace dbp
if (!OLCPage::canAdvance())
return false;
- return 0 != m_pSelectTableField->GetSelectEntryCount();
+ return 0 != m_pSelectTableField->GetSelectedEntryCount();
}
IMPL_LINK_NOARG( OContentFieldSelection, OnTableDoubleClicked, ListBox&, void )
{
- if (m_pSelectTableField->GetSelectEntryCount())
+ if (m_pSelectTableField->GetSelectedEntryCount())
getDialog()->travelNext();
}
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 2e09942d89e6..86525d5f175e 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -131,7 +131,7 @@ namespace pcr
void ListSelectionDialog::collectSelection( std::vector< sal_Int16 >& /* [out] */ _rSelection )
{
- const sal_Int32 nSelectedCount = m_pEntries->GetSelectEntryCount( );
+ const sal_Int32 nSelectedCount = m_pEntries->GetSelectedEntryCount( );
_rSelection.resize( nSelectedCount );
for ( sal_Int32 selected = 0; selected < nSelectedCount; ++selected )
_rSelection[selected] = static_cast< sal_Int16 >( m_pEntries->GetSelectedEntryPos( selected ) );
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index e7649d857d8a..3704358166d2 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -279,7 +279,7 @@ sal_Int32 FuncPage::GetFunction()
sal_Int32 FuncPage::GetFunctionEntryCount()
{
- return m_pLbFunction->GetSelectEntryCount();
+ return m_pLbFunction->GetSelectedEntryCount();
}
OUString FuncPage::GetSelFunctionName() const
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index c6fcaa0217a9..29b129f89bc0 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -634,7 +634,7 @@ void RemoteFilesDialog::EnableControls()
{
m_pServices_lb->Enable();
- if( m_pServices_lb->GetSelectEntryCount() )
+ if( m_pServices_lb->GetSelectedEntryCount() )
{
m_pAddMenu->EnableItem( "change_password", false );
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index d032bfddef0e..34740a48c02e 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -289,7 +289,7 @@ public:
SingleControlWrapper< ListBox, ValueT >( rListBox ), MapperType( WRAPPER_LISTBOX_ENTRY_NOTFOUND, pMap ) {}
virtual bool IsControlDontKnow() const SAL_OVERRIDE
- { return this->GetControl().GetSelectEntryCount() == 0; }
+ { return this->GetControl().GetSelectedEntryCount() == 0; }
virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE
{ if( bSet ) this->GetControl().SetNoSelection(); }
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index f141c8d96a28..ddfe65186a18 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -141,7 +141,7 @@ public:
sal_uInt16 GetDisplayLineCount() const;
- sal_Int32 GetSelectEntryCount() const;
+ sal_Int32 GetSelectedEntryCount() const;
sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex = 0 ) const;
OUString GetSelectedEntry() const { return GetEntry( GetSelectedEntryPos() ); }
bool IsEntryPosSelected( sal_Int32 nPos ) const;
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index fee5a295c373..8beb78c643ef 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -164,7 +164,7 @@ public:
void SelectEntry( const OUString& rStr, bool bSelect = true );
void SelectEntryPos( sal_Int32 nPos, bool bSelect = true );
- sal_Int32 GetSelectEntryCount() const;
+ sal_Int32 GetSelectedEntryCount() const;
OUString GetSelectedEntry( sal_Int32 nSelIndex = 0 ) const;
sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex = 0 ) const;
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 2527b97b8def..2adbbe7cde93 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -346,7 +346,7 @@ protected:
virtual ~AbstractScShowTabDlg() override = default;
public:
virtual void Insert( const OUString& rString, bool bSelected ) = 0;
- virtual sal_Int32 GetSelectEntryCount() const = 0;
+ virtual sal_Int32 GetSelectedEntryCount() const = 0;
virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0;
virtual OUString GetSelectedEntry(sal_Int32 nPos) const = 0;
virtual sal_Int32 GetSelectedEntryPos(sal_Int32 nPos) const = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index d3b04e6751d9..21740523d397 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -558,9 +558,9 @@ void AbstractScShowTabDlg_Impl::Insert( const OUString& rString, bool bSelected
pDlg->Insert( rString, bSelected);
}
-sal_Int32 AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
+sal_Int32 AbstractScShowTabDlg_Impl::GetSelectedEntryCount() const
{
- return pDlg->GetSelectEntryCount();
+ return pDlg->GetSelectedEntryCount();
}
void AbstractScShowTabDlg_Impl::SetDescription(
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index eec36a0c9ccb..3e29cb957a0e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -334,7 +334,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg
{
DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg)
virtual void Insert( const OUString& rString, bool bSelected ) override;
- virtual sal_Int32 GetSelectEntryCount() const override;
+ virtual sal_Int32 GetSelectedEntryCount() const override;
virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) override;
virtual OUString GetSelectedEntry(sal_Int32 nPos) const override;
virtual sal_Int32 GetSelectedEntryPos(sal_Int32 nPos) const override;
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index ffcb614d4e46..7f39b99861a3 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -472,7 +472,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, Button*, pBtn, void )
}
else if ( pBtn == pBtnRemove )
{
- while ( pLbConsAreas->GetSelectEntryCount() )
+ while ( pLbConsAreas->GetSelectedEntryCount() )
pLbConsAreas->RemoveEntry( pLbConsAreas->GetSelectedEntryPos() );
pBtnRemove->Disable();
}
@@ -482,7 +482,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void )
{
if ( &rLb == pLbConsAreas )
{
- if ( pLbConsAreas->GetSelectEntryCount() > 0 )
+ if ( pLbConsAreas->GetSelectedEntryCount() > 0 )
pBtnRemove->Enable();
else
pBtnRemove->Disable();
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 2fa9c702f16f..0e90afc54458 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -344,7 +344,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
pLbCond2->Disable();
pEdVal2->Disable();
}
- else if ( pLbConnect2->GetSelectEntryCount() == 0 )
+ else if ( pLbConnect2->GetSelectedEntryCount() == 0 )
{
pLbField2->Disable();
pLbCond2->Disable();
@@ -358,7 +358,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
pLbCond3->Disable();
pEdVal3->Disable();
}
- else if ( pLbConnect3->GetSelectEntryCount() == 0 )
+ else if ( pLbConnect3->GetSelectedEntryCount() == 0 )
{
pLbField3->Disable();
pLbCond3->Disable();
@@ -371,7 +371,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
pLbCond4->Disable();
pEdVal4->Disable();
}
- else if ( pLbConnect4->GetSelectEntryCount() == 0 )
+ else if ( pLbConnect4->GetSelectedEntryCount() == 0 )
{
pLbField4->Disable();
pLbCond4->Disable();
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 523cb31ae075..702408c86481 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -228,7 +228,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
m_pLbCond2->Disable();
m_pEdVal2->Disable();
}
- else if ( m_pLbConnect1->GetSelectEntryCount() == 0 )
+ else if ( m_pLbConnect1->GetSelectedEntryCount() == 0 )
{
m_pLbField2->Disable();
m_pLbCond2->Disable();
@@ -242,7 +242,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
m_pLbCond3->Disable();
m_pEdVal3->Disable();
}
- else if ( m_pLbConnect2->GetSelectEntryCount() == 0 )
+ else if ( m_pLbConnect2->GetSelectedEntryCount() == 0 )
{
m_pLbField3->Disable();
m_pLbCond3->Disable();
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 95060eeec84a..0529216c2834 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -172,7 +172,7 @@ void ScDPFunctionListBox::SetSelection( PivotFunc nFuncMask )
PivotFunc ScDPFunctionListBox::GetSelection() const
{
PivotFunc nFuncMask = PivotFunc::NONE;
- for( sal_Int32 nSel = 0, nCount = GetSelectEntryCount(); nSel < nCount; ++nSel )
+ for( sal_Int32 nSel = 0, nCount = GetSelectedEntryCount(); nSel < nCount; ++nSel )
nFuncMask |= spnFunctions[ GetSelectedEntryPos( nSel ) ];
return nFuncMask;
}
@@ -645,7 +645,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
// *** HIERARCHY ***
- rLabelData.mnUsedHier = m_pLbHierarchy->GetSelectEntryCount() ? m_pLbHierarchy->GetSelectedEntryPos() : 0;
+ rLabelData.mnUsedHier = m_pLbHierarchy->GetSelectedEntryCount() ? m_pLbHierarchy->GetSelectedEntryPos() : 0;
}
void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayout )
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index e263298377be..6a8d144a66b7 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -722,7 +722,7 @@ void ScImportAsciiDlg::SeparatorHdl( const Control* pCtrl )
IMPL_LINK( ScImportAsciiDlg, CharSetHdl, ListBox&, rListBox, void )
{
SvxTextEncodingBox* pCharSetBox = static_cast<SvxTextEncodingBox*>(&rListBox);
- if( (pCharSetBox == pLbCharSet) && (pCharSetBox->GetSelectEntryCount() == 1) )
+ if( (pCharSetBox == pLbCharSet) && (pCharSetBox->GetSelectedEntryCount() == 1) )
{
SetPointer( Pointer( PointerStyle::Wait ) );
rtl_TextEncoding eOldCharSet = meCharSet;
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index dde157b1610e..1d7ac26a7f7c 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -46,7 +46,7 @@ public:
/** Inserts a string into the ListBox. */
void Insert( const OUString& rString, bool bSelected );
- sal_Int32 GetSelectEntryCount() const;
+ sal_Int32 GetSelectedEntryCount() const;
OUString GetSelectedEntry(sal_Int32 nPos) const;
sal_Int32 GetSelectedEntryPos(sal_Int32 nPos) const;
};
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index ff531f6483c9..a2c46485ff38 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -210,7 +210,7 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
aStrCurSelTable = m_pEdName->GetText();
pStr = &aStrCurSelTable;
}
- else if ( nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
+ else if ( nSelTabIndex < m_pLbTables->GetSelectedEntryCount() )
{
aStrCurSelTable = m_pLbTables->GetSelectedEntry();
pStr = &aStrCurSelTable;
@@ -226,7 +226,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
{
const OUString* pStr = nullptr;
- if ( !m_pBtnNew->IsChecked() && nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
+ if ( !m_pBtnNew->IsChecked() && nSelTabIndex < m_pLbTables->GetSelectedEntryCount() )
{
aStrCurSelTable = m_pLbTables->GetSelectedEntry( nSelTabIndex );
pStr = &aStrCurSelTable;
@@ -285,7 +285,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl, ListBox&, void)
void ScInsertTableDlg::DoEnable_Impl()
{
- if ( m_pBtnNew->IsChecked() || ( pDocShTables && m_pLbTables->GetSelectEntryCount() ) )
+ if ( m_pBtnNew->IsChecked() || ( pDocShTables && m_pLbTables->GetSelectedEntryCount() ) )
m_pBtnOk->Enable();
else
m_pBtnOk->Disable();
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index b7c8fee457e3..eb5efd1e5e7b 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -273,7 +273,7 @@ void ScLinkedAreaDlg::UpdateSourceRanges()
void ScLinkedAreaDlg::UpdateEnable()
{
- bool bEnable = ( pSourceShell && m_pLbRanges->GetSelectEntryCount() );
+ bool bEnable = ( pSourceShell && m_pLbRanges->GetSelectedEntryCount() );
m_pBtnOk->Enable( bEnable );
bool bReload = m_pBtnReload->IsChecked();
@@ -314,7 +314,7 @@ OUString ScLinkedAreaDlg::GetOptions()
OUString ScLinkedAreaDlg::GetSource()
{
OUStringBuffer aBuf;
- const sal_Int32 nCount = m_pLbRanges->GetSelectEntryCount();
+ const sal_Int32 nCount = m_pLbRanges->GetSelectedEntryCount();
for (sal_Int32 i=0; i<nCount; ++i)
{
if (i > 0)
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index c6f1949069a9..03e27fdf2cea 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -66,9 +66,9 @@ void ScShowTabDlg::Insert( const OUString& rString, bool bSelected )
m_pLb->SelectEntryPos( m_pLb->GetEntryCount() - 1 );
}
-sal_Int32 ScShowTabDlg::GetSelectEntryCount() const
+sal_Int32 ScShowTabDlg::GetSelectedEntryCount() const
{
- return m_pLb->GetSelectEntryCount();
+ return m_pLb->GetSelectedEntryCount();
}
OUString ScShowTabDlg::GetSelectedEntry(sal_Int32 nPos) const
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 7fcc391f7516..d1e5fead4224 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -126,7 +126,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
break;
}
}
- else if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND && GetSelectEntryCount() )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND && GetSelectedEntryCount() )
{
const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
if ( pCEvt && pCEvt->GetCommand() == CommandEventId::ContextMenu )
@@ -170,19 +170,19 @@ void ScScenarioListBox::ExecuteScenarioSlot( sal_uInt16 nSlotId )
void ScScenarioListBox::SelectScenario()
{
- if( GetSelectEntryCount() > 0 )
+ if( GetSelectedEntryCount() > 0 )
ExecuteScenarioSlot( SID_SELECT_SCENARIO );
}
void ScScenarioListBox::EditScenario()
{
- if( GetSelectEntryCount() > 0 )
+ if( GetSelectedEntryCount() > 0 )
ExecuteScenarioSlot( SID_EDIT_SCENARIO );
}
void ScScenarioListBox::DeleteScenario()
{
- if( GetSelectEntryCount() > 0 )
+ if( GetSelectedEntryCount() > 0 )
if( ScopedVclPtrInstance<QueryBox>( nullptr, MessBoxStyle::YesNo | MessBoxStyle::DefaultYes, ScGlobal::GetRscString( STR_QUERY_DELSCENARIO ) )->Execute() == RET_YES )
ExecuteScenarioSlot( SID_DELETE_SCENARIO );
}
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index b596d2d4368f..cf3170a22258 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -224,7 +224,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
m_pEdScalePageNum->SetValue( (nPages > 0) ? nPages : 1 );
}
- if( m_pLbScaleMode->GetSelectEntryCount() == 0 )
+ if( m_pLbScaleMode->GetSelectedEntryCount() == 0 )
{
// fall back to 100%
OSL_FAIL( "ScTablePage::Reset - missing scaling item" );
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 1787232f057f..0b9e416f65e3 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -868,7 +868,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if( pDlg->Execute() == RET_OK )
{
- const sal_Int32 nSelCount = pDlg->GetSelectEntryCount();
+ const sal_Int32 nSelCount = pDlg->GetSelectedEntryCount();
for( sal_Int32 nSelIx = 0; nSelIx < nSelCount; ++nSelIx )
aIndexList.insert( aIndexList.begin()+nSelIx, pDlg->GetSelectedEntryPos( nSelIx ) );
pDlg.disposeAndClear();
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 676ce2c76f53..4f49a250769a 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -151,7 +151,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if ( pDlg->Execute() == RET_OK )
{
- const sal_Int32 nCount = pDlg->GetSelectEntryCount();
+ const sal_Int32 nCount = pDlg->GetSelectedEntryCount();
for (sal_Int32 nPos=0; nPos<nCount; ++nPos)
{
aName = pDlg->GetSelectedEntry(nPos);
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index bdceafff015e..843b94c9ec7b 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -951,7 +951,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, Button *, pButton, void )
pPage1_Designs->Enable();
pPage1_DelDesign->Enable();
- if(pPage1_Designs->GetSelectEntryCount() == 0)
+ if(pPage1_Designs->GetSelectedEntryCount() == 0)
pPage1_Designs->SelectEntryPos(0);
const sal_Int32 nPos = pPage1_Designs->GetSelectedEntryPos();
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 84044c0f1642..8a05b20669ae 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1907,7 +1907,7 @@ void CustomAnimationPane::remove( CustomAnimationEffectPtr const & pEffect )
void CustomAnimationPane::onChangeStart()
{
- if( mpLBStart->GetSelectEntryCount() == 1 )
+ if( mpLBStart->GetSelectedEntryCount() == 1 )
{
sal_Int16 nNodeType;
switch( mpLBStart->GetSelectedEntryPos() )
@@ -1993,7 +1993,7 @@ PathKind CustomAnimationPane::getCreatePathKind() const
{
PathKind eKind = PathKind::NONE;
- if( ( mpLBAnimation->GetSelectEntryCount() == 1 ) &&
+ if( ( mpLBAnimation->GetSelectedEntryCount() == 1 ) &&
( mpLBCategory->GetSelectedEntryPos() == mnMotionPathPos ) )
{
const sal_Int32 nPos = mpLBAnimation->GetSelectedEntryPos();
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 41262c6118e6..f3005661456d 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -301,7 +301,7 @@ OUString lcl_getSoundFileURL(
const ::std::vector< OUString > & rSoundList,
const ListBox* rListBox )
{
- if( rListBox->GetSelectEntryCount() > 0 )
+ if( rListBox->GetSelectedEntryCount() > 0 )
{
sal_Int32 nPos = rListBox->GetSelectedEntryPos();
// the first three entries are no actual sounds
@@ -875,7 +875,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
if( mpLB_SOUND->IsEnabled())
{
maCurrentSoundFile.clear();
- if( mpLB_SOUND->GetSelectEntryCount() > 0 )
+ if( mpLB_SOUND->GetSelectedEntryCount() > 0 )
{
sal_Int32 nPos = mpLB_SOUND->GetSelectedEntryPos();
aResult.mbStopSound = nPos == 1;
@@ -1117,7 +1117,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, DurationLoseFocusHdl, Control&, void)
IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected, ListBox&, void)
{
- if( mpLB_SOUND->GetSelectEntryCount() )
+ if( mpLB_SOUND->GetSelectedEntryCount() )
{
sal_Int32 nPos = mpLB_SOUND->GetSelectedEntryPos();
if( nPos == 2 )
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 878384019d89..1c2b5f0c370c 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -804,10 +804,10 @@ Reference< graphic::XGraphic> SdPhotoAlbumDialog::createXGraphicFromUrl(const OU
void SdPhotoAlbumDialog::EnableDisableButtons()
{
- pRemoveBtn->Enable(pImagesLst->GetSelectEntryCount() > 0);
- pUpBtn->Enable(pImagesLst->GetSelectEntryCount() > 0 &&
+ pRemoveBtn->Enable(pImagesLst->GetSelectedEntryCount() > 0);
+ pUpBtn->Enable(pImagesLst->GetSelectedEntryCount() > 0 &&
pImagesLst->GetSelectedEntryPos() != 0);
- pDownBtn->Enable(pImagesLst->GetSelectEntryCount() > 0 &&
+ pDownBtn->Enable(pImagesLst->GetSelectedEntryCount() > 0 &&
pImagesLst->GetSelectedEntryPos() < pImagesLst->GetEntryCount()-1);
}
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 55d7bd97c0cb..68c8a4e3fbac 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -403,7 +403,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void const * p)
{
if( p == m_pBtnAdd )
{
- sal_Int32 nCount = m_pLbPages->GetSelectEntryCount();
+ sal_Int32 nCount = m_pLbPages->GetSelectedEntryCount();
if( nCount > 0 )
{
sal_uLong nPosCP = TREELIST_APPEND;
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index fb2a12e2d0a9..755f4726f34c 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -545,7 +545,7 @@ void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOn
rSettings.mbHeaderVisible = mpCBHeader->IsChecked();
rSettings.maHeaderText = mpTBHeader->GetText();
- if( mpCBDateTimeFormat->GetSelectEntryCount() == 1 )
+ if( mpCBDateTimeFormat->GetSelectedEntryCount() == 1 )
{
sal_Int32 nPos = mpCBDateTimeFormat->GetSelectedEntryPos();
rSettings.meDateFormat = nDateTimeFormats[nPos].meDateFormat;
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index e8ad17bac65c..a52613601898 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -188,7 +188,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
maLbDocs->SelectEntry( aDocShName );
// commented in order to fix 30246
-// if( maLbDocs->GetSelectEntryCount() == 0 )
+// if( maLbDocs->GetSelectedEntryCount() == 0 )
{
RefreshDocumentLB();
maLbDocs->SelectEntry( aDocShName );
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 88450b79c0ce..8ba6dc43b64f 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -277,7 +277,7 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs )
bool bModified = false;
presentation::ClickAction eCA = presentation::ClickAction_NONE;
- if( m_pLbAction->GetSelectEntryCount() )
+ if( m_pLbAction->GetSelectedEntryCount() )
eCA = GetActualClickAction();
if( m_pLbAction->IsValueChangedFromSaved() )
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 6ca5d80bcede..0696c9aaaab6 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -296,7 +296,7 @@ sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
aSel = aSel.replaceAt(nc-1, 1, "");
if ( aSel.compareToIgnoreAsciiCase(SfxResId(STR_STANDARD)) != 0 )
nEntry++;
- if (!m_pTemplateLb->GetSelectEntryCount())
+ if (!m_pTemplateLb->GetSelectedEntryCount())
nEntry = 0;
return nEntry;
}
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 048a56918b56..fbf33c03a7de 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -86,7 +86,7 @@ FrameDirListBoxWrapper::FrameDirListBoxWrapper( FrameDirListBox& rListBox ) :
bool FrameDirListBoxWrapper::IsControlDontKnow() const
{
- return GetControl().GetSelectEntryCount() == 0;
+ return GetControl().GetSelectedEntryCount() == 0;
}
void FrameDirListBoxWrapper::SetControlDontKnow( bool bSet )
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d71513effeee..8841ad2ac0b1 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -835,7 +835,7 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs )
}
else
{
- if( m_pLbShademode->GetSelectEntryCount() != 0 )
+ if( m_pLbShademode->GetSelectedEntryCount() != 0 )
{
m_pLbShademode->SetNoSelection();
bUpdate = true;
@@ -1796,7 +1796,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Representation
// Shade mode
- if( m_pLbShademode->GetSelectEntryCount() )
+ if( m_pLbShademode->GetSelectedEntryCount() )
{
nValue = m_pLbShademode->GetSelectedEntryPos();
rAttrs.Put(Svx3DShadeModeItem(nValue));
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index c6d3a39e181c..3977228feb65 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2638,7 +2638,7 @@ bool DbListBox::commitControl()
{
Any aVal;
Sequence<sal_Int16> aSelectSeq;
- if (static_cast<ListBox*>(m_pWindow.get())->GetSelectEntryCount())
+ if (static_cast<ListBox*>(m_pWindow.get())->GetSelectedEntryCount())
{
aSelectSeq.realloc(1);
*aSelectSeq.getArray() = (sal_Int16)static_cast<ListBox*>(m_pWindow.get())->GetSelectedEntryPos();
@@ -2850,7 +2850,7 @@ bool DbFilterField::commitControl()
return true;
case css::form::FormComponentType::LISTBOX:
aText.clear();
- if (static_cast<ListBox*>(m_pWindow.get())->GetSelectEntryCount())
+ if (static_cast<ListBox*>(m_pWindow.get())->GetSelectedEntryCount())
{
sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow.get())->GetSelectedEntryPos();
if ( ( nPos >= 0 ) && ( nPos < m_aValueList.getLength() ) )
@@ -4154,7 +4154,7 @@ Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos()
if (m_pBox)
{
UpdateFromColumn();
- const sal_Int32 nSelEntries = m_pBox->GetSelectEntryCount();
+ const sal_Int32 nSelEntries = m_pBox->GetSelectedEntryCount();
aSeq = Sequence<sal_Int16>( nSelEntries );
for ( sal_Int32 n = 0; n < nSelEntries; ++n )
aSeq.getArray()[n] = m_pBox->GetSelectedEntryPos( n );
@@ -4187,7 +4187,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems()
if (m_pBox)
{
UpdateFromColumn();
- const sal_Int32 nSelEntries = m_pBox->GetSelectEntryCount();
+ const sal_Int32 nSelEntries = m_pBox->GetSelectedEntryCount();
aSeq = css::uno::Sequence<OUString>( nSelEntries );
for ( sal_Int32 n = 0; n < nSelEntries; ++n )
aSeq.getArray()[n] = m_pBox->GetSelectedEntry( n );
@@ -4289,7 +4289,7 @@ void FmXListBoxCell::onWindowEvent( const VclEventId _nEventId, const vcl::Windo
aEvent.Highlighted = 0;
// with multiple selection 0xFFFF, otherwise the ID
- aEvent.Selected = (m_pBox->GetSelectEntryCount() == 1 )
+ aEvent.Selected = (m_pBox->GetSelectedEntryCount() == 1 )
? m_pBox->GetSelectedEntryPos() : 0xFFFF;
m_aItemListeners.notifyEach( &awt::XItemListener::itemStateChanged, aEvent );
@@ -4489,7 +4489,7 @@ void FmXComboBoxCell::onWindowEvent( const VclEventId _nEventId, const vcl::Wind
aEvent.Highlighted = 0;
// with multiple selection 0xFFFF, otherwise the ID
- aEvent.Selected = ( m_pComboBox->GetSelectEntryCount() == 1 )
+ aEvent.Selected = ( m_pComboBox->GetSelectedEntryCount() == 1 )
? m_pComboBox->GetSelectedEntryPos()
: 0xFFFF;
m_aItemListeners.notifyEach( &awt::XItemListener::itemStateChanged, aEvent );
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 04e8da774545..f8f87bdd279b 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -126,7 +126,7 @@ IMPL_LINK_NOARG(SvxUndoRedoControl, PopupModeEndHdl, FloatingWindow*, void)
if( pPopupWin && FloatWinPopupFlags::NONE == pPopupWin->GetPopupModeFlags() &&
pPopupWin->IsUserSelected() )
{
- const sal_Int32 nCount = pPopupWin->GetListBox().GetSelectEntryCount();
+ const sal_Int32 nCount = pPopupWin->GetListBox().GetSelectedEntryCount();
INetURLObject aObj( m_aCommandURL );
@@ -162,7 +162,7 @@ IMPL_LINK_NOARG(SvxUndoRedoControl, SelectHdl, ListBox&, void)
ListBox &rListBox = pPopupWin->GetListBox();
if (rListBox.IsTravelSelect())
- Impl_SetInfo( rListBox.GetSelectEntryCount() );
+ Impl_SetInfo( rListBox.GetSelectedEntryCount() );
else
{
pPopupWin->SetUserSelected( true );
@@ -244,7 +244,7 @@ VclPtr<SfxPopupWindow> SvxUndoRedoControl::CreatePopupWindow()
rListBox.SelectEntryPos( 0 );
aActionStr = SvxResId(SID_UNDO == GetSlotId() ?
RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS);
- Impl_SetInfo( rListBox.GetSelectEntryCount() );
+ Impl_SetInfo( rListBox.GetSelectedEntryCount() );
// move focus in floating window without
// closing it (GrabFocus() would close it!)
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index e7398689f06d..6425a1b96ac8 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -304,9 +304,9 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
} else
m_pColumnLB->SelectEntry(pModOpt->GetNameFromColumn());
- if (m_pAddressFieldLB->GetSelectEntryCount() == 0)
+ if (m_pAddressFieldLB->GetSelectedEntryCount() == 0)
m_pAddressFieldLB->SelectEntryPos(0);
- if (m_pColumnLB->GetSelectEntryCount() == 0)
+ if (m_pColumnLB->GetSelectedEntryCount() == 0)
m_pColumnLB->SelectEntryPos(0);
const bool bEnable = m_aSelection.getLength() != 0;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 3b7b357289db..60dae5d14698 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -412,7 +412,7 @@ sal_Int32 SwFieldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
if (nSize)
{
- if (!m_pSelectionLB->GetSelectEntryCount())
+ if (!m_pSelectionLB->GetSelectedEntryCount())
m_pSelectionLB->SelectEntryPos(nSelPos == USHRT_MAX ? 0 : nSelPos);
bEnable = true;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index c8701bcb223e..09e57675ee5c 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void)
bool bEnable = nCount != 0;
- if (bEnable && !m_pSelectionLB->GetSelectEntryCount())
+ if (bEnable && !m_pSelectionLB->GetSelectedEntryCount())
m_pSelectionLB->SelectEntryPos(0);
m_pSelection->Enable( bEnable );
@@ -507,13 +507,13 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
m_pFormatLB->SelectEntryPos( nPos );
}
- if( nSize && !m_pFormatLB->GetSelectEntryCount() )
+ if( nSize && !m_pFormatLB->GetSelectedEntryCount() )
{
m_pFormatLB->SelectEntry( SwResId(FMT_NUM_PAGEDESC) );
- if( !m_pFormatLB->GetSelectEntryCount() )
+ if( !m_pFormatLB->GetSelectedEntryCount() )
{
m_pFormatLB->SelectEntry( SwResId(FMT_NUM_ARABIC) );
- if( !m_pFormatLB->GetSelectEntryCount() )
+ if( !m_pFormatLB->GetSelectedEntryCount() )
m_pFormatLB->SelectEntryPos( 0 );
}
}
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index c0a08921a92e..8b0396cad75b 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -256,7 +256,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
if (IsFieldEdit() && nTypeId == TYP_JUMPEDITFLD)
m_pFormatLB->SelectEntry(SwResId(FMT_MARK_ARY[GetCurField()->GetFormat()]));
- if (!m_pFormatLB->GetSelectEntryCount())
+ if (!m_pFormatLB->GetSelectedEntryCount())
m_pFormatLB->SelectEntryPos(0);
}
@@ -444,7 +444,7 @@ void SwFieldFuncPage::ListModifyHdl(Control const * pControl)
m_pListItemsLB->InsertEntry(sEntry);
m_pListItemsLB->SelectEntry(sEntry);
}
- else if(m_pListItemsLB->GetSelectEntryCount())
+ else if(m_pListItemsLB->GetSelectedEntryCount())
{
sal_Int32 nSelPos = m_pListItemsLB->GetSelectedEntryPos();
if(pControl == m_pListRemovePB)
@@ -489,7 +489,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, Edit&, void)
//enable "Add" button when text is in the Edit that's not already member of the box
m_pListAddPB->Enable(!m_pListItemED->GetText().isEmpty() &&
LISTBOX_ENTRY_NOTFOUND == m_pListItemsLB->GetEntryPos(m_pListItemED->GetText()));
- bool bEnableButtons = m_pListItemsLB->GetSelectEntryCount() > 0;
+ bool bEnableButtons = m_pListItemsLB->GetSelectedEntryCount() > 0;
m_pListRemovePB->Enable(bEnableButtons);
m_pListUpPB->Enable(bEnableButtons && (m_pListItemsLB->GetSelectedEntryPos() > 0));
m_pListDownPB->Enable(bEnableButtons &&
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 4f9e85afad4f..e510898deae2 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -453,7 +453,7 @@ void SwFieldRefPage::SubTypeHdl()
switch(nTypeId)
{
case TYP_GETREFFLD:
- if (!IsFieldEdit() || m_pSelectionLB->GetSelectEntryCount())
+ if (!IsFieldEdit() || m_pSelectionLB->GetSelectedEntryCount())
{
m_pNameED->SetText(m_pSelectionLB->GetSelectedEntry());
ModifyHdl(*m_pNameED);
@@ -485,7 +485,7 @@ void SwFieldRefPage::SubTypeHdl()
break;
default:
- if (!IsFieldEdit() || m_pSelectionLB->GetSelectEntryCount())
+ if (!IsFieldEdit() || m_pSelectionLB->GetSelectedEntryCount())
m_pNameED->SetText(m_pSelectionLB->GetSelectedEntry());
break;
}
@@ -721,11 +721,11 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString)
if ( bEnable )
{
m_pSelectionLB->SelectEntry(sOldSel);
- if (!m_pSelectionLB->GetSelectEntryCount() && !IsFieldEdit())
+ if (!m_pSelectionLB->GetSelectedEntryCount() && !IsFieldEdit())
m_pSelectionLB->SelectEntryPos(0);
}
- if (IsFieldEdit() && !m_pSelectionLB->GetSelectEntryCount()) // in case the reference was already deleted...
+ if (IsFieldEdit() && !m_pSelectionLB->GetSelectedEntryCount()) // in case the reference was already deleted...
m_pNameED->SetText(sOldSel);
}
}
@@ -843,10 +843,10 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
else
m_pFormatLB->SelectEntry(SwResId(FMT_REF_ARY[GetCurField()->GetFormat()]));
- if (!m_pFormatLB->GetSelectEntryCount())
+ if (!m_pFormatLB->GetSelectedEntryCount())
{
m_pFormatLB->SelectEntryPos(nFieldDlgFormatSel);
- if (!m_pFormatLB->GetSelectEntryCount())
+ if (!m_pFormatLB->GetSelectedEntryCount())
m_pFormatLB->SelectEntryPos(0);
}
}
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index e0d41c8eda0c..0c590cfc0f05 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -687,7 +687,7 @@ void SwFieldVarPage::UpdateSubType()
if (bEnable)
{
m_pSelectionLB->SelectEntry(sOldSel);
- if (!m_pSelectionLB->GetSelectEntryCount())
+ if (!m_pSelectionLB->GetSelectedEntryCount())
{
m_pSelectionLB->SelectEntryPos(0);
pLB = m_pSelectionLB; // newly initialise all controls
@@ -811,17 +811,17 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
m_pFormatLB->SelectEntryPos( nPos );
}
- if (nSize && (!IsFieldEdit() || !m_pFormatLB->GetSelectEntryCount()))
+ if (nSize && (!IsFieldEdit() || !m_pFormatLB->GetSelectedEntryCount()))
{
m_pFormatLB->SelectEntry(sOldSel);
- if (!m_pFormatLB->GetSelectEntryCount())
+ if (!m_pFormatLB->GetSelectedEntryCount())
{
m_pFormatLB->SelectEntry(SwResId(FMT_NUM_PAGEDESC));
- if (!m_pFormatLB->GetSelectEntryCount())
+ if (!m_pFormatLB->GetSelectedEntryCount())
{
m_pFormatLB->SelectEntry(SwResId(FMT_NUM_ARABIC));
- if (!m_pFormatLB->GetSelectEntryCount())
+ if (!m_pFormatLB->GetSelectedEntryCount())
m_pFormatLB->SelectEntryPos(0);
}
}
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6447156f4689..b587d1ea3882 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1442,10 +1442,10 @@ sal_Int32 SwFramePage::FillPosLB(const FrameMap* _pMap,
}
_rLB.SelectEntry(sSelEntry);
- if (!_rLB.GetSelectEntryCount())
+ if (!_rLB.GetSelectedEntryCount())
_rLB.SelectEntry(sOldEntry);
- if (!_rLB.GetSelectEntryCount())
+ if (!_rLB.GetSelectedEntryCount())
_rLB.SelectEntryPos(0);
PosHdl(_rLB);
@@ -1506,7 +1506,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
{
_rLB.SelectEntry(sOldEntry);
- if (!_rLB.GetSelectEntryCount())
+ if (!_rLB.GetSelectedEntryCount())
{
for (sal_Int32 i = 0; i < _rLB.GetEntryCount(); i++)
{
@@ -1614,7 +1614,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
}
}
- if (!_rLB.GetSelectEntryCount())
+ if (!_rLB.GetSelectedEntryCount())
_rLB.SelectEntryPos(0);
}
}
@@ -1975,7 +1975,7 @@ IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void )
RangeModifyHdl();
sal_Int16 nRel = 0;
- if (rLB.GetSelectEntryCount())
+ if (rLB.GetSelectedEntryCount())
{
if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index aed8a53195ec..01ea94b7caca 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -176,7 +176,7 @@ void SwIndexMarkPane::InitControls()
const SwTOXType* pType = pTOXMgr->GetTOXType(TOX_CONTENT);
OSL_ENSURE(pType, "No directory type !!");
OUString sTmpTypeSelection;
- if(m_pTypeDCB->GetSelectEntryCount())
+ if(m_pTypeDCB->GetSelectedEntryCount())
sTmpTypeSelection = m_pTypeDCB->GetSelectedEntry();
m_pTypeDCB->Clear();
m_pTypeDCB->InsertEntry(pType->GetTypeName());
@@ -1646,13 +1646,13 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit&, rEdit, void)
{
bool bEnable = aShortNameCheckLink.Call(&rEdit);
m_bNameAllowed |= bEnable;
- m_pOKBT->Enable(pTypeListBox->GetSelectEntryCount() && bEnable);
+ m_pOKBT->Enable(pTypeListBox->GetSelectedEntryCount() && bEnable);
}
}
IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox&, rBox, void)
{
- m_pOKBT->Enable(m_bNameAllowed && rBox.GetSelectEntryCount());
+ m_pOKBT->Enable(m_bNameAllowed && rBox.GetSelectedEntryCount());
};
SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings,
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 940ad4cde4e9..979eff2f3433 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -199,7 +199,7 @@ void SwNumPositionTabPage::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 &&
USHRT_MAX != nActNumLvl;
m_pDistBorderMF->Enable( !bLabelAlignmentPosAndSpaceModeActive &&
@@ -616,7 +616,7 @@ IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox&, rBox, void )
sal_uInt16 nSaveNumLvl = nActNumLvl;
nActNumLvl = 0;
if(rBox.IsEntryPosSelected( MAXLEVEL ) &&
- (rBox.GetSelectEntryCount() == 1 || nSaveNumLvl != 0xffff))
+ (rBox.GetSelectedEntryCount() == 1 || nSaveNumLvl != 0xffff))
{
nActNumLvl = 0xFFFF;
rBox.SetUpdateMode(false);
@@ -624,7 +624,7 @@ IMPL_LINK( SwNumPositionTabPage, LevelHdl, 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 < MAXLEVEL; i++ )
@@ -722,7 +722,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, SpinField&, rSpin, void )
IMPL_LINK( SwNumPositionTabPage, RelativeHdl, Button *, pBox, void )
{
bool bOn = static_cast<CheckBox*>(pBox)->IsChecked();
- bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
+ bool bSingleSelection = m_pLevelLB->GetSelectedEntryCount() == 1 && USHRT_MAX != nActNumLvl;
bool bSetValue = false;
long nValue = 0;
if(bOn || bSingleSelection)
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 1d7186ce3486..4a6be791223d 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1634,7 +1634,7 @@ css::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos()
VclPtr< ListBox > pBox = GetAs< ListBox >();
if ( pBox )
{
- const sal_Int32 nSelEntries = pBox->GetSelectEntryCount();
+ const sal_Int32 nSelEntries = pBox->GetSelectedEntryCount();
aSeq = css::uno::Sequence<sal_Int16>( nSelEntries );
for ( sal_Int32 n = 0; n < nSelEntries; ++n )
aSeq.getArray()[n] = pBox->GetSelectedEntryPos( n );
@@ -1661,7 +1661,7 @@ css::uno::Sequence< OUString> VCLXListBox::getSelectedItems()
VclPtr< ListBox > pBox = GetAs< ListBox >();
if ( pBox )
{
- const sal_Int32 nSelEntries = pBox->GetSelectEntryCount();
+ const sal_Int32 nSelEntries = pBox->GetSelectedEntryCount();
aSeq = css::uno::Sequence< OUString>( nSelEntries );
for ( sal_Int32 n = 0; n < nSelEntries; ++n )
aSeq.getArray()[n] = pBox->GetSelectedEntry( n );
@@ -1893,7 +1893,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const css::uno::Any
else
pListBox->SetNoSelection();
- if ( !pListBox->GetSelectEntryCount() )
+ if ( !pListBox->GetSelectedEntryCount() )
pListBox->SetTopEntry( 0 );
}
}
@@ -2027,7 +2027,7 @@ void VCLXListBox::ImplCallItemListeners()
aEvent.Highlighted = 0;
// Set to 0xFFFF on multiple selection, selected entry ID otherwise
- aEvent.Selected = (pListBox->GetSelectEntryCount() == 1 ) ? pListBox->GetSelectedEntryPos() : 0xFFFF;
+ aEvent.Selected = (pListBox->GetSelectedEntryCount() == 1 ) ? pListBox->GetSelectedEntryPos() : 0xFFFF;
maItemListeners.itemStateChanged( aEvent );
}
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index e7699b736064..402275af73a0 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -129,7 +129,7 @@ public:
void SelectEntry( sal_Int32 nPos, bool bSelect );
- sal_Int32 GetSelectEntryCount() const;
+ sal_Int32 GetSelectedEntryCount() const;
OUString GetSelectedEntry( sal_Int32 nIndex ) const;
sal_Int32 GetSelectedEntryPos( sal_Int32 nIndex ) const;
bool IsEntryPosSelected( sal_Int32 nIndex ) const;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 54fb097c4c6c..2b2668d3de7c 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -381,7 +381,7 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void)
// attach missing entries
::std::set< sal_Int32 > aSelInText;
lcl_GetSelectedEntries( aSelInText, aText, m_cMultiSep, m_pImplLB->GetEntryList() );
- sal_Int32 nSelectedEntries = m_pImplLB->GetEntryList()->GetSelectEntryCount();
+ sal_Int32 nSelectedEntries = m_pImplLB->GetEntryList()->GetSelectedEntryCount();
for ( sal_Int32 n = 0; n < nSelectedEntries; n++ )
{
sal_Int32 nP = m_pImplLB->GetEntryList()->GetSelectedEntryPos( n );
@@ -1342,9 +1342,9 @@ const Wallpaper& ComboBox::GetDisplayBackground() const
return rBack;
}
-sal_Int32 ComboBox::GetSelectEntryCount() const
+sal_Int32 ComboBox::GetSelectedEntryCount() const
{
- return m_pImpl->m_pImplLB->GetEntryList()->GetSelectEntryCount();
+ return m_pImpl->m_pImplLB->GetEntryList()->GetSelectedEntryCount();
}
sal_Int32 ComboBox::GetSelectedEntryPos( sal_Int32 nIndex ) const
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 90b1c6bd9043..2244f8397ac7 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -379,7 +379,7 @@ ListBoxEntryFlags ImplEntryList::GetEntryFlags( sal_Int32 nPos ) const
return pImplEntry ? pImplEntry->mnFlags : ListBoxEntryFlags::NONE;
}
-sal_Int32 ImplEntryList::GetSelectEntryCount() const
+sal_Int32 ImplEntryList::GetSelectedEntryCount() const
{
sal_Int32 nSelCount = 0;
for ( sal_Int32 n = GetEntryCount(); n; )
@@ -836,7 +836,7 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt )
sal_Int32 nSelect = GetEntryPosForPoint( rMEvt.GetPosPixel() );
if( nSelect != LISTBOX_ENTRY_NOTFOUND )
{
- if ( !mbMulti && GetEntryList()->GetSelectEntryCount() )
+ if ( !mbMulti && GetEntryList()->GetSelectedEntryCount() )
mnTrackingSaveSelection = GetEntryList()->GetSelectedEntryPos( 0 );
else
mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND;
@@ -901,7 +901,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt )
// Select only visible Entries with MouseMove, otherwise Tracking...
if ( IsVisible( nSelect ) &&
mpEntryList->IsEntrySelectable( nSelect ) &&
- ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectEntryCount() || ( nSelect != GetEntryList()->GetSelectedEntryPos( 0 ) ) ) )
+ ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectedEntryCount() || ( nSelect != GetEntryList()->GetSelectedEntryPos( 0 ) ) ) )
{
mbTrackingSelect = true;
if ( SelectEntries( nSelect, LET_TRACKING ) )
@@ -928,7 +928,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt )
// with the mouse button pressed...
if ( rMEvt.IsLeft() && !rMEvt.IsSynthetic() )
{
- if ( !mbMulti && GetEntryList()->GetSelectEntryCount() )
+ if ( !mbMulti && GetEntryList()->GetSelectedEntryCount() )
mnTrackingSaveSelection = GetEntryList()->GetSelectedEntryPos( 0 );
else
mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND;
@@ -944,7 +944,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt )
void ImplListBoxWindow::DeselectAll()
{
- while ( GetEntryList()->GetSelectEntryCount() )
+ while ( GetEntryList()->GetSelectedEntryCount() )
{
sal_Int32 nS = GetEntryList()->GetSelectedEntryPos( 0 );
SelectEntry( nS, false );
@@ -1074,9 +1074,9 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo
bFocusChanged = true;
sal_Int32 nAnchor = mpEntryList->GetSelectionAnchor();
- if( ( nAnchor == LISTBOX_ENTRY_NOTFOUND ) && ( mpEntryList->GetSelectEntryCount() || mbStackMode ) )
+ if( ( nAnchor == LISTBOX_ENTRY_NOTFOUND ) && ( mpEntryList->GetSelectedEntryCount() || mbStackMode ) )
{
- nAnchor = mbStackMode ? 0 : mpEntryList->GetSelectedEntryPos( mpEntryList->GetSelectEntryCount() - 1 );
+ nAnchor = mbStackMode ? 0 : mpEntryList->GetSelectedEntryPos( mpEntryList->GetSelectedEntryCount() - 1 );
}
if( nAnchor != LISTBOX_ENTRY_NOTFOUND )
{
@@ -1244,7 +1244,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
if ( bInside )
{
- if ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectEntryCount() )
+ if ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectedEntryCount() )
{
mbTrackingSelect = true;
if ( SelectEntries( nSelect, LET_TRACKING, bShift, bCtrl ) )
@@ -1262,7 +1262,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
}
else
{
- if ( !mbMulti && GetEntryList()->GetSelectEntryCount() )
+ if ( !mbMulti && GetEntryList()->GetSelectedEntryCount() )
{
mbTrackingSelect = true;
SelectEntry( GetEntryList()->GetSelectedEntryPos( 0 ), false );
@@ -2260,7 +2260,7 @@ void ImplListBox::ImplCheckScrollBars()
mbVScroll = true;
// check of the scrolled-out region
- if( GetEntryList()->GetSelectEntryCount() == 1 &&
+ if( GetEntryList()->GetSelectedEntryCount() == 1 &&
GetEntryList()->GetSelectedEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND )
ShowProminentEntry( GetEntryList()->GetSelectedEntryPos( 0 ) );
else
@@ -2297,7 +2297,7 @@ void ImplListBox::ImplCheckScrollBars()
mbVScroll = true;
// check of the scrolled-out region
- if( GetEntryList()->GetSelectEntryCount() == 1 &&
+ if( GetEntryList()->GetSelectedEntryCount() == 1 &&
GetEntryList()->GetSelectedEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND )
ShowProminentEntry( GetEntryList()->GetSelectedEntryPos( 0 ) );
else
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 1a36cc9e6879..bc953fbe3274 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1021,11 +1021,11 @@ OUString ListBox::GetSelectedEntry(sal_Int32 nIndex) const
return GetEntry( GetSelectedEntryPos( nIndex ) );
}
-sal_Int32 ListBox::GetSelectEntryCount() const
+sal_Int32 ListBox::GetSelectedEntryCount() const
{
if (!mpImplLB)
return 0;
- return mpImplLB->GetEntryList()->GetSelectEntryCount();
+ return mpImplLB->GetEntryList()->GetSelectedEntryCount();
}
sal_Int32 ListBox::GetSelectedEntryPos( sal_Int32 nIndex ) const
@@ -1065,9 +1065,9 @@ void ListBox::SelectEntryPos( sal_Int32 nPos, bool bSelect )
if ( 0 <= nPos && nPos < mpImplLB->GetEntryList()->GetEntryCount() )
{
- sal_Int32 oldSelectCount = GetSelectEntryCount(), newSelectCount = 0, nCurrentPos = mpImplLB->GetCurrentPos();
+ sal_Int32 oldSelectCount = GetSelectedEntryCount(), newSelectCount = 0, nCurrentPos = mpImplLB->GetCurrentPos();
mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect );
- newSelectCount = GetSelectEntryCount();
+ newSelectCount = GetSelectedEntryCount();
if (oldSelectCount == 0 && newSelectCount > 0)
CallEventListeners(VclEventId::ListboxStateUpdate);
//Only when bSelect == true, send both Selection & Focus events
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 40b1f0bb9246..7b09da585859 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -825,7 +825,7 @@ StringMap ListBoxUIObject::get_state()
aMap["ReadOnly"] = OUString::boolean(mxListBox->IsReadOnly());
aMap["MultiSelect"] = OUString::boolean(mxListBox->IsMultiSelectionEnabled());
aMap["EntryCount"] = OUString::number(mxListBox->GetEntryCount());
- aMap["SelectEntryCount"] = OUString::number(mxListBox->GetSelectEntryCount());
+ aMap["SelectEntryCount"] = OUString::number(mxListBox->GetSelectedEntryCount());
aMap["SelectEntryPos"] = OUString::number(mxListBox->GetSelectedEntryPos());
aMap["SelectEntryText"] = mxListBox->GetSelectedEntry();
More information about the Libreoffice-commits
mailing list