From 19bc8856c4b5444f80375919c2aed00c7de53a28 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 21 Oct 2024 14:36:51 +0200 Subject: move vcl::DeleteOnDeinit to tools so we can fix a shutdown use-after-free in sot. Change-Id: I32f83bd94627d72d7bee7ea2ebd6ab77a7f78435 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175335 Tested-by: Jenkins Reviewed-by: Noel Grandin --- desktop/source/lib/lokclipboard.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop/source') diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index 74374b95d66c..99f803523d40 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -9,7 +9,7 @@ #include "lokclipboard.hxx" #include -#include +#include #include #include #include @@ -20,7 +20,7 @@ using namespace css; using namespace css::uno; /* static */ osl::Mutex LOKClipboardFactory::gMutex; -static vcl::DeleteOnDeinit>> gClipboards{}; +static tools::DeleteOnDeinit>> gClipboards{}; rtl::Reference LOKClipboardFactory::getClipboardForCurView() { -- cgit