diff options
| -rw-r--r-- | compilerplugins/clang/badstatics.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/a11y/atkutil.cxx | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index 4904e1a31d3e..12e6b931b3c6 100644 --- a/compilerplugins/clang/badstatics.cxx +++ b/compilerplugins/clang/badstatics.cxx @@ -148,6 +148,8 @@ public: || name == "theAddInAsyncTbl" // sc/source/core/tool/adiasync.cxx, would leak // ScAddInAsync* keys if that set is not empty at exit + || name == "g_aWindowList" + //vcl/unx/gtk/a11y/atkutil.cxx, asserted empty at exit ) // these variables appear unproblematic { return true; diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index d722936bf755..79d8013af7d4 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -44,6 +44,7 @@ #include <gtk/gtk.h> #include <config_version.h> +#include <cassert> #include <set> using namespace ::com::sun::star; @@ -483,7 +484,19 @@ static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent) /*****************************************************************************/ -static std::set< VclPtr<vcl::Window> > g_aWindowList; +namespace { + +struct WindowList { + ~WindowList() { assert(list.empty()); }; + // needs to be empty already on DeInitVCL, but at least check it's empty + // on exit + + std::set< VclPtr<vcl::Window> > list; +}; + +WindowList g_aWindowList; + +} static void handle_get_focus(::VclWindowEvent const * pEvent) { @@ -534,9 +547,9 @@ static void handle_get_focus(::VclWindowEvent const * pEvent) } else { - if( g_aWindowList.find(pWindow) == g_aWindowList.end() ) + if( g_aWindowList.list.find(pWindow) == g_aWindowList.list.end() ) { - g_aWindowList.insert(pWindow); + g_aWindowList.list.insert(pWindow); try { aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet); @@ -628,7 +641,7 @@ void WindowEventHandler(void *, VclSimpleEvent& rEvent) break; case VCLEVENT_OBJECT_DYING: - g_aWindowList.erase( static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow() ); + g_aWindowList.list.erase( static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow() ); SAL_FALLTHROUGH; case VCLEVENT_TOOLBOX_HIGHLIGHTOFF: handle_toolbox_highlightoff(static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow()); |