From 01cdb8a4bf1ae74322baaa94e715e620a8e83a3c Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Thu, 17 Apr 2025 12:32:32 +0200
Subject: sw a11y: Use std::unordered map directly instead of wrapper

No longer use the SwAccessibleContextMap_Impl class
that is effectively just a wrapper around std::unordered_map,
but use std::unordered_map directly instead, and use
SwAccessibleContextMap as an alias/typedef.

Change-Id: I14a873076746c81c4fe628810654995f5d8cb9d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184332
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 sw/inc/accmap.hxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'sw/inc')

diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 5c7e5be9d241..b0e1074be62e 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -37,7 +37,6 @@ class SwFrame;
 class SwTextFrame;
 class SwPageFrame;
 class SwAccessibleContext;
-class SwAccessibleContextMap_Impl;
 class SwAccessibleEventList_Impl;
 class SwAccessibleEventMap_Impl;
 class SdrObject;
@@ -84,12 +83,15 @@ namespace o3tl
     template<> struct typed_flags<AccessibleStates> : is_typed_flags<AccessibleStates, 0x3e3> {};
 }
 
+using SwAccessibleContextMap
+    = std::unordered_map<const SwFrame*, unotools::WeakReference<SwAccessibleContext>>;
+
 class SwAccessibleMap final : public ::accessibility::IAccessibleViewForwarder,
                         public ::accessibility::IAccessibleParent
                 , public std::enable_shared_from_this<SwAccessibleMap>
 {
     ::osl::Mutex maEventMutex;
-    std::unique_ptr<SwAccessibleContextMap_Impl> mpFrameMap;
+    std::unique_ptr<SwAccessibleContextMap> mpFrameMap;
     std::unique_ptr<SwAccessibleShapeMap_Impl> mpShapeMap;
     SwShapeList_Impl mvShapes;
     std::unique_ptr<SwAccessibleEventList_Impl> mpEvents;
@@ -121,7 +123,7 @@ class SwAccessibleMap final : public ::accessibility::IAccessibleViewForwarder,
     void InvalidateShapeSelection();
 
     //mpSelectedFrameMap contains the old selected objects.
-    std::unique_ptr<SwAccessibleContextMap_Impl> mpSelectedFrameMap;
+    std::unique_ptr<SwAccessibleContextMap> mpSelectedFrameMap;
 
     OUString maDocName;
 
-- 
cgit