diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-10-21 14:36:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-10-22 08:01:19 +0200 |
| commit | 19bc8856c4b5444f80375919c2aed00c7de53a28 (patch) | |
| tree | 94256a4db6d6feb4f148e405f1a540c9b0db3869 /desktop | |
| parent | 76319347a83aecee7a423a614d67287182b31b00 (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/lokclipboard.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 <unordered_map> -#include <vcl/lazydelete.hxx> +#include <tools/lazydelete.hxx> #include <vcl/svapp.hxx> #include <sfx2/lokhelper.hxx> #include <sal/log.hxx> @@ -20,7 +20,7 @@ using namespace css; using namespace css::uno; /* static */ osl::Mutex LOKClipboardFactory::gMutex; -static vcl::DeleteOnDeinit<std::unordered_map<int, rtl::Reference<LOKClipboard>>> gClipboards{}; +static tools::DeleteOnDeinit<std::unordered_map<int, rtl::Reference<LOKClipboard>>> gClipboards{}; rtl::Reference<LOKClipboard> LOKClipboardFactory::getClipboardForCurView() { |