sw/source/core/access/accmap.cxx | 21 ---------------------
1 file changed, 21 deletions(-)
New commits:
commit 664c2a113db6a9920e08c55e4ea1025e295c4c26
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 17 10:17:22 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Apr 18 08:27:21 2025 +0200
sw a11y: Drop SwAccessibleContextMap_Impl::mbLocked
It is only used in debug mode for asserts in
SwAccessibleMap::GetDocumentView_, but I don't see
how those should ever be false, as there's no
indication for this method calling itself recursively
in odd ways in between those lines where
SwAccessibleContextMap_Impl::mbLocked is set to
true and then back to false, so I personally find this
more confusing than helpful.
Change-Id: I7a16133018e5bc55ec9162a38653aea47c50c319
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184326
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 186b789ea5ba..74063f098514 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -94,14 +94,7 @@ private:
std::unordered_map <key_type, mapped_type> maMap;
public:
-#if OSL_DEBUG_LEVEL > 0
- bool mbLocked;
-#endif
-
SwAccessibleContextMap_Impl()
-#if OSL_DEBUG_LEVEL > 0
- : mbLocked( false )
-#endif
{}
iterator begin() { return maMap.begin(); }
@@ -1658,17 +1651,7 @@ rtl::Reference<SwAccessibleContext>
SwAccessibleMap::GetDocumentView_(
bool bSetVisArea = false;
if( !mpFrameMap )
- {
mpFrameMap.reset(new SwAccessibleContextMap_Impl);
-#if OSL_DEBUG_LEVEL > 0
- mpFrameMap->mbLocked = false;
-#endif
- }
-
-#if OSL_DEBUG_LEVEL > 0
- assert(!mpFrameMap->mbLocked);
- mpFrameMap->mbLocked = true;
-#endif
const SwRootFrame* pRootFrame = GetShell().GetLayout();
SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pRootFrame
);
@@ -1695,10 +1678,6 @@ rtl::Reference<SwAccessibleContext>
SwAccessibleMap::GetDocumentView_(
}
}
-#if OSL_DEBUG_LEVEL > 0
- mpFrameMap->mbLocked = false;
-#endif
-
if( bSetVisArea )
{
SwAccessibleDocumentBase *pAcc =
