accessibility/inc/standard/vclxaccessiblelist.hxx | 5 ----- accessibility/source/standard/vclxaccessiblelist.cxx | 11 ++--------- 2 files changed, 2 insertions(+), 14 deletions(-)
New commits: commit c365ebc7ce8a9852fd33f81b20df35a841f49960 Author: Arnaud Versini <arnaud.vers...@libreoffice.org> Date: Sun May 7 23:55:53 2017 +0200 accessibility: simplify and inline VCLXAccessibleList::clearItems Change-Id: Ie32311850a0dc013e71e0456d7e6bfd8611e6e95 Reviewed-on: https://gerrit.libreoffice.org/37567 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 2399d5d69603..3d3533dcee1a 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -176,11 +176,6 @@ private: */ css::uno::Reference< css::accessibility::XAccessible > m_xParent; - - /** dispose all items aand clears the container - */ - void clearItems(); - void UpdateEntryRange_Impl(); protected: void UpdateSelection_Impl(sal_Int32 nPos = 0); diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 0da281044449..e7014650bf36 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -113,19 +113,12 @@ void SAL_CALL VCLXAccessibleList::disposing() VCLXAccessibleComponent::disposing(); // Dispose all items in the list. - clearItems(); + m_aAccessibleChildren.clear(); m_pListBoxHelper.reset(); } -void VCLXAccessibleList::clearItems() -{ - // Clear the list itself and delete all the rest. - ListItems().swap(m_aAccessibleChildren); // clear and minimize -} - - void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) { SolarMutexGuard aSolarGuard; @@ -512,7 +505,7 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 nPos) void VCLXAccessibleList::HandleChangedItemList() { - clearItems(); + m_aAccessibleChildren.clear(); NotifyAccessibleEvent ( AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any()); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits