8f88aff98c
In `VCLXAccessibleList::HandleChangedItemList`,
don't just clear the vector of list items, but
dispose them first.
To avoid code duplication, extract a helper method
from `VCLXAccessibleList::disposing` which already
disposes the children since
commit 51de048ae9
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Mon Sep 4 17:19:03 2023 +0200
tdf#157088 a11y: Dispose list items with list
This fixes a similar crash/assert on exit, seen after using the
Navigator in Writer (in particular the combo/listboxes in
there) with the qt6 VCL plugin and the Orca screen reader
running.
stderr showed this:
soffice.bin: .../libreoffice/comphelper/source/misc/accessibleeventnotifier.cxx:142: bool (anonymous namespace)::implLookupClient(const AccessibleEventNotifier::TClientId, ClientMap::iterator &): Assertion `rClients.end() != rPos && "AccessibleEventNotifier::implLookupClient: invalid client id " "(did you register your client?)!"' failed.
Aborted
Backtrace:
1 __pthread_kill_implementation pthread_kill.c 44 0x7f0e1a4a816c
2 __pthread_kill_internal pthread_kill.c 78 0x7f0e1a4a81cf
3 __GI_raise raise.c 26 0x7f0e1a45a472
4 __GI_abort abort.c 79 0x7f0e1a4444b2
5 __assert_fail_base assert.c 92 0x7f0e1a4443d5
6 __assert_fail assert.c 101 0x7f0e1a4533a2
7 (anonymous namespace)::implLookupClient accessibleeventnotifier.cxx 140 0x7f0e18ce59ac
8 comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing accessibleeventnotifier.cxx 185 0x7f0e18ce5e68
9 VCLXAccessibleListItem::disposing vclxaccessiblelistitem.cxx 164 0x7f0ddf7d237f
10 cppu::WeakComponentImplHelperBase::dispose implbase.cxx 104 0x7f0e1873f544
11 cppu::PartialWeakComponentImplHelper<com::sun:⭐:accessibility::XAccessible, com::sun:⭐:accessibility::XAccessibleContext, com::sun:⭐:accessibility::XAccessibleComponent, com::sun:⭐:accessibility::XAccessibleEventBroadcaster, com::sun:⭐:accessibility::XAccessibleText, com::sun:⭐:lang::XServiceInfo>::dispose compbase.hxx 90 0x7f0ddf7cb7c5
12 cppu::WeakComponentImplHelperBase::release implbase.cxx 79 0x7f0e1873f1fe
13 cppu::PartialWeakComponentImplHelper<com::sun:⭐:accessibility::XAccessible, com::sun:⭐:accessibility::XAccessibleContext, com::sun:⭐:accessibility::XAccessibleComponent, com::sun:⭐:accessibility::XAccessibleEventBroadcaster, com::sun:⭐:accessibility::XAccessibleText, com::sun:⭐:lang::XServiceInfo>::release compbase.hxx 86 0x7f0ddf7cd0c5
14 com::sun:⭐:uno::Reference<com::sun:⭐:accessibility::XAccessible>::~Reference Reference.hxx 114 0x7f0e06bbccbe
15 QtAccessibleWidget::~QtAccessibleWidget QtAccessibleWidget.hxx 39 0x7f0e06bd618d
16 QtAccessibleWidget::~QtAccessibleWidget QtAccessibleWidget.hxx 39 0x7f0e06bd6219
17 QAccessibleCache::deleteInterface qaccessiblecache.cpp 173 0x7f0e05545319
18 QAccessibleCache::~QAccessibleCache qaccessiblecache.cpp 31 0x7f0e0554492a
19 QAccessibleCache::~QAccessibleCache qaccessiblecache.cpp 32 0x7f0e055449b0
20 cleanupAccessibleCache qaccessiblecache.cpp 24 0x7f0e05544896
21 qt_call_post_routines qcoreapplication.cpp 332 0x7f0e05faf826
22 QApplication::~QApplication qapplication.cpp 665 0x7f0e0419e24a
23 QApplication::~QApplication qapplication.cpp 722 0x7f0e0419e55c
24 std::default_delete<QApplication>::operator() unique_ptr.h 99 0x7f0e06c5d63c
25 std::__uniq_ptr_impl<QApplication, std::default_delete<QApplication>>::reset unique_ptr.h 211 0x7f0e06c5df7c
26 std::unique_ptr<QApplication, std::default_delete<QApplication>>::reset unique_ptr.h 509 0x7f0e06c58bfd
27 QtInstance::~QtInstance QtInstance.cxx 305 0x7f0e06c51184
28 QtInstance::~QtInstance QtInstance.cxx 302 0x7f0e06c51279
29 DestroySalInstance salplug.cxx 368 0x7f0e114c0a18
30 DeInitVCL svmain.cxx 625 0x7f0e115c5e7d
31 ImplSVMain svmain.cxx 254 0x7f0e115c4031
32 SVMain svmain.cxx 261 0x7f0e115c5f79
33 soffice_main sofficemain.cxx 94 0x7f0e1a7a4ba3
34 sal_main main.c 51 0x559ce9c67a5d
35 main main.c 49 0x559ce9c67a37
Change-Id: Ic5121645a6920a8ac35154dda1dcfa1974ab9d4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164062
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
176 lines
7.1 KiB
C++
176 lines
7.1 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
|
|
#include <cppuhelper/implbase.hxx>
|
|
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
|
|
|
|
class VCLXAccessibleListItem;
|
|
|
|
namespace accessibility
|
|
{
|
|
class IComboListBoxHelper;
|
|
}
|
|
|
|
|
|
/** Base class for the list contained in list- and combo boxes. This class
|
|
does not support selection because lists of combo boxes give no direct
|
|
access to their underlying list implementation. Look into derived
|
|
classes for selection.
|
|
*/
|
|
class VCLXAccessibleList final
|
|
: public cppu::ImplInheritanceHelper<
|
|
VCLXAccessibleComponent,
|
|
css::accessibility::XAccessible,
|
|
css::accessibility::XAccessibleSelection>
|
|
{
|
|
public:
|
|
enum BoxType {COMBOBOX, LISTBOX};
|
|
|
|
VCLXAccessibleList (VCLXWindow* pVCLXindow, BoxType aBoxType,
|
|
const css::uno::Reference<
|
|
css::accessibility::XAccessible >& _xParent);
|
|
|
|
/** The index that is passed to this method is returned on following
|
|
calls to getAccessibleIndexInParent.
|
|
*/
|
|
void SetIndexInParent (sal_Int32 nIndex);
|
|
|
|
/** Process some of the events and delegate the rest to the base classes.
|
|
*/
|
|
virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override;
|
|
virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
|
|
|
|
/** Called on reception of selection events this method checks all known
|
|
list items for a possible change in their selection state and
|
|
updates that accordingly. No accessibility events are sent because
|
|
the XAccessibleSelection interface is not supported and the items
|
|
are transient.
|
|
@param sTextOfSelectedItem
|
|
This string contains the text of the currently selected
|
|
item. It is used to retrieve the index of that item.
|
|
*/
|
|
void UpdateSelection (std::u16string_view sTextOfSelectedItem);
|
|
|
|
// XAccessible
|
|
virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
|
|
getAccessibleContext() override;
|
|
|
|
// XAccessibleContext
|
|
virtual sal_Int64 SAL_CALL getAccessibleChildCount() override final;
|
|
css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
|
|
getAccessibleChild (sal_Int64 i) override;
|
|
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
|
|
getAccessibleParent( ) override;
|
|
|
|
/** The index returned as index in parent is always the one set with the
|
|
SetIndexInParent() method.
|
|
*/
|
|
virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
|
|
virtual sal_Int16 SAL_CALL getAccessibleRole() override;
|
|
|
|
// XServiceInfo
|
|
virtual OUString SAL_CALL getImplementationName() override;
|
|
// Return list specific services.
|
|
virtual css::uno::Sequence< OUString > SAL_CALL
|
|
getSupportedServiceNames() override;
|
|
|
|
// XAccessibleSelection
|
|
virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override;
|
|
virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override;
|
|
virtual void SAL_CALL clearAccessibleSelection( ) override;
|
|
virtual void SAL_CALL selectAllAccessibleChildren( ) override;
|
|
virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override;
|
|
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
|
|
virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
|
|
|
|
virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override;
|
|
bool IsInDropDown() const;
|
|
void HandleDropOpen();
|
|
void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList);
|
|
void UpdateSelection_Acc (std::u16string_view sTextOfSelectedItem, bool b_IsDropDownList);
|
|
void UpdateSelection_Impl_Acc (bool b_IsDropDownList);
|
|
|
|
static void NotifyListItem(css::uno::Any const & val);
|
|
::accessibility::IComboListBoxHelper* getListBoxHelper() { return m_pListBoxHelper.get(); }
|
|
private:
|
|
BoxType m_aBoxType;
|
|
std::unique_ptr<::accessibility::IComboListBoxHelper> m_pListBoxHelper;
|
|
std::vector<rtl::Reference<VCLXAccessibleListItem>> m_aAccessibleChildren;
|
|
sal_Int32 m_nVisibleLineCount;
|
|
/// Index in parent. This is settable from the outside.
|
|
sal_Int32 m_nIndexInParent;
|
|
sal_Int32 m_nLastTopEntry;
|
|
sal_Int32 m_nLastSelectedPos;
|
|
bool m_bDisableProcessEvent;
|
|
bool m_bVisible;
|
|
sal_Int32 m_nCurSelectedPos;
|
|
|
|
|
|
virtual ~VCLXAccessibleList() override = default;
|
|
|
|
sal_Int64 implGetAccessibleChildCount();
|
|
|
|
/** This function is called from the implementation helper during a
|
|
XComponent::dispose call. Free the list of items and the items themselves.
|
|
*/
|
|
virtual void SAL_CALL disposing() override;
|
|
|
|
void disposeChildren();
|
|
|
|
/** This method adds the states
|
|
AccessibleStateType::FOCUSABLE and possibly
|
|
AccessibleStateType::MULTI_SELECTABLE to the state set
|
|
of the base classes.
|
|
*/
|
|
virtual void FillAccessibleStateSet (sal_Int64& rStateSet) override;
|
|
|
|
/** Create the specified child and insert it into the list of children.
|
|
Sets the child's states.
|
|
*/
|
|
rtl::Reference<VCLXAccessibleListItem> CreateChild (sal_Int32 i);
|
|
|
|
/** Call this method when the item list has been changed, i.e. items
|
|
have been deleted or inserted.
|
|
*/
|
|
void HandleChangedItemList();
|
|
|
|
// VCLXAccessibleComponent
|
|
virtual css::awt::Rectangle implGetBounds( ) override;
|
|
|
|
/** We need to save the accessible parent to return it in getAccessibleParent(),
|
|
because this method of the base class returns the wrong parent.
|
|
*/
|
|
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
|
|
|
|
void UpdateEntryRange_Impl();
|
|
void UpdateSelection_Impl(sal_Int32 nPos = 0);
|
|
bool checkEntrySelected(sal_Int32 _nPos,
|
|
css::uno::Any& _rNewValue,
|
|
css::uno::Reference< css::accessibility::XAccessible >& _rxNewAcc);
|
|
void notifyVisibleStates(bool _bSetNew );
|
|
void UpdateVisibleLineCount();
|
|
};
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|