From 83de03e077d219c881626de43960ae4756284371 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Thu, 14 Sep 2017 17:00:06 +0200 Subject: Rename GetSelectEntryCount -> GetSelectedEntryCount Change-Id: I405b347b404ed0acb3b6a0204e0b914a7698ce25 Reviewed-on: https://gerrit.libreoffice.org/42284 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt --- accessibility/inc/helper/IComboListBoxHelper.hxx | 2 +- accessibility/inc/helper/listboxhelper.hxx | 4 ++-- accessibility/source/standard/vclxaccessiblebox.cxx | 2 +- accessibility/source/standard/vclxaccessiblelist.cxx | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'accessibility') 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; } -- cgit