sw/inc/accmap.hxx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
New commits: commit 7d76bb339905f011bafe99bda958b3e63a9cffc4 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Apr 17 12:41:13 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Fri Apr 18 08:31:09 2025 +0200 sw a11y: Drop SwShapeList_Impl typedef It is only used a single time, so just specify the full type there. Also move the comment to SwAccessibleMap::mvShapes where it belongs, since it describes the semantics of that class member, not the type in more general terms. Change-Id: I131acd3d144a81d536aa736d07ceed5c1fcf3cb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184339 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index b0e1074be62e..5bc2808e8ab5 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -53,18 +53,6 @@ struct PreviewPage; namespace vcl { class Window; } namespace com::sun::star::accessibility { class XAccessible; } -// The shape list is filled if an accessible shape is destroyed. It -// simply keeps a reference to the accessible shape's XShape. These -// references are destroyed within the EndAction when firing events. -// There are two reason for this. First of all, a new accessible shape -// for the XShape might be created soon. It's then cheaper if the XShape -// still exists. The other reason are situations where an accessible shape -// is destroyed within an SwFrameFormat::SwClientNotify. In this case, destroying -// the XShape at the same time (indirectly by destroying the accessible -// shape) leads to an assert, because a client of the Modify is destroyed -// within a Modify call. -using SwShapeList_Impl = std::vector<css::uno::Reference<css::drawing::XShape>>; - enum class AccessibleStates { NONE = 0x0000, @@ -93,7 +81,19 @@ class SwAccessibleMap final : public ::accessibility::IAccessibleViewForwarder, ::osl::Mutex maEventMutex; std::unique_ptr<SwAccessibleContextMap> mpFrameMap; std::unique_ptr<SwAccessibleShapeMap_Impl> mpShapeMap; - SwShapeList_Impl mvShapes; + + // The shape list is filled if an accessible shape is destroyed. It + // simply keeps a reference to the accessible shape's XShape. These + // references are destroyed within the EndAction when firing events. + // There are two reason for this. First of all, a new accessible shape + // for the XShape might be created soon. It's then cheaper if the XShape + // still exists. The other reason are situations where an accessible shape + // is destroyed within an SwFrameFormat::SwClientNotify. In this case, destroying + // the XShape at the same time (indirectly by destroying the accessible + // shape) leads to an assert, because a client of the Modify is destroyed + // within a Modify call. + std::vector<css::uno::Reference<css::drawing::XShape>> mvShapes; + std::unique_ptr<SwAccessibleEventList_Impl> mpEvents; std::unique_ptr<SwAccessibleEventMap_Impl> mpEventMap;