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 /vcl/source/window | |
| 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 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/split.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index d25e2b677e36..adb82ad575c3 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -27,7 +27,7 @@ #include <vcl/lineinfo.hxx> #include <vcl/settings.hxx> #include <vcl/ptrstyle.hxx> -#include <vcl/lazydelete.hxx> +#include <tools/lazydelete.hxx> #include <window.h> @@ -35,12 +35,12 @@ namespace { Wallpaper& ImplBlackWall() { - static vcl::DeleteOnDeinit< Wallpaper > SINGLETON(COL_BLACK); + static tools::DeleteOnDeinit< Wallpaper > SINGLETON(COL_BLACK); return *SINGLETON.get(); } Wallpaper& ImplWhiteWall() { - static vcl::DeleteOnDeinit< Wallpaper > SINGLETON(COL_LIGHTGRAY); + static tools::DeleteOnDeinit< Wallpaper > SINGLETON(COL_LIGHTGRAY); return *SINGLETON.get(); } } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 10db9fd7a3d2..8cde4c668112 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -38,7 +38,7 @@ #include <vcl/toolkit/button.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/toolkit/unowrap.hxx> -#include <vcl/lazydelete.hxx> +#include <tools/lazydelete.hxx> #include <vcl/virdev.hxx> #include <vcl/settings.hxx> #include <vcl/sysdata.hxx> @@ -3747,7 +3747,7 @@ Reference< css::rendering::XCanvas > WindowOutputDevice::ImplGetCanvas( bool bSp // Create canvas instance with window handle - static vcl::DeleteUnoReferenceOnDeinit<XMultiComponentFactory> xStaticCanvasFactory( + static tools::DeleteUnoReferenceOnDeinit<XMultiComponentFactory> xStaticCanvasFactory( css::rendering::CanvasFactory::create( xContext ) ); Reference<XMultiComponentFactory> xCanvasFactory(xStaticCanvasFactory.get()); Reference< css::rendering::XCanvas > xCanvas; |