mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thumbnailview a11y: Dispose ThumbnailViewItemAcc objects

Browse Source 
This is the ThumbnailViewItemAcc variant of

    commit b3c460980c34d2d9f91120823bb525ece7bc2fac
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Tue Feb 25 12:33:21 2025 +0100

        valueset a11y: Dispose ValueItemAcc objects

and fixes the problem/assert described in

    Change-Id: Ie4e5c300ff6bdb160e756e7173c45c0f143fac69
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Wed Feb 26 11:14:04 2025 +0100

        thumbnailview a11y: Use OAccessibleComponentHelper for ThumbnailViewItemAcc

in the same way as the above-mentioned commit
b3c460980c34d2d9f91120823bb525ece7bc2fac fixed it
for the corresponding ValueItemAcc issue mentioned in
its commit message.

Change-Id: Id2ec7a3bd6311ea63f718f5136f68f2ea94be5f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182226
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn 2025-02-26 11:25:49 +01:00
parent 1c3d0bc25f
commit 299f205898
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sfx2/thumbnailviewitem.hxx
View File

@ -110,7 +110,7 @@ public:
void setTitle (const OUString& rTitle); void setTitle (const OUString& rTitle);
rtl::Reference<ThumbnailViewItemAcc> const & GetAccessible(); rtl::Reference<ThumbnailViewItemAcc> const & GetAccessible(bool bCreate = true);
void setDrawArea (const tools::Rectangle &area); void setDrawArea (const tools::Rectangle &area);

10
sfx2/source/control/thumbnailview.cxx
View File

@ -165,12 +165,12 @@ ThumbnailView::ThumbnailView(std::unique_ptr<weld::ScrolledWindow> xWindow, std:
ThumbnailView::~ThumbnailView() ThumbnailView::~ThumbnailView()
{ {
ImplDeleteItems();
if (mxAccessible.is()) if (mxAccessible.is())
mxAccessible->dispose(); mxAccessible->dispose();
mpItemAttrs.reset(); mpItemAttrs.reset();
ImplDeleteItems();
} }
bool ThumbnailView::MouseMove(const MouseEvent& rMEvt) bool ThumbnailView::MouseMove(const MouseEvent& rMEvt)
@ -290,12 +290,14 @@ void ThumbnailView::ImplDeleteItems()
// fire accessible event??? // fire accessible event???
} }
if ( pItem->isVisible() && ImplHasAccessibleListeners() ) rtl::Reference<ThumbnailViewItemAcc> xItemAcc = pItem->GetAccessible(false);
if (xItemAcc.is())
{ {
css::uno::Any aOldAny, aNewAny; css::uno::Any aOldAny, aNewAny;
aOldAny <<= css::uno::Reference<css::accessibility::XAccessible>(pItem->GetAccessible()); aOldAny <<= css::uno::Reference<css::accessibility::XAccessible>(pItem->GetAccessible());
ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny );
xItemAcc->dispose();
} }
mItemList[i].reset(); mItemList[i].reset();

4
sfx2/source/control/thumbnailviewitem.cxx
View File

@ -111,9 +111,9 @@ void ThumbnailViewItem::setTitle (const OUString& rTitle)
maTitle = rTitle; maTitle = rTitle;
} }
const rtl::Reference< ThumbnailViewItemAcc > & ThumbnailViewItem::GetAccessible() const rtl::Reference<ThumbnailViewItemAcc>& ThumbnailViewItem::GetAccessible(bool bCreate)
{ {
if( !mxAcc.is() ) if (!mxAcc.is() && bCreate)
mxAcc = new ThumbnailViewItemAcc(this); mxAcc = new ThumbnailViewItemAcc(this);
return mxAcc; return mxAcc;