diff options
| author | Aleksei Nikiforov <darktemplar@basealt.ru> | 2021-09-20 11:25:45 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-09-23 11:36:09 +0200 |
| commit | 9b4478e62c712ef0f75c4a001e260dfdd6b3ca4c (patch) | |
| tree | 908a68900e520be99ebdf6fa1e8ce05eaec36fae /include | |
| parent | 0044349b4617d90419113d0fea6be5b53c429fc4 (diff) | |
tdf#144624 Prevent infinite recursion when loading SVG icon
When Generic/X11 VCL backend plugin loads SVG icon,
it creates virtual device for rasterizing an SVG icon,
which in turn tries to load an SVG icon,
and thus infinite recursion happens.
Change-Id: I7559b6255e6718e64ef4a6e7c79d597375e5823a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122344
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/wintypes.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index fcccd9a0d0fa..1bc51788a572 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -229,6 +229,8 @@ WinBits const WB_NOINITIALSELECTION = SAL_CONST_INT64(0x001000000000); WinBits const WB_HIDESELECTION = SAL_CONST_INT64(0x002000000000); // DO NOT USE: 0x008000000000, that's WB_SYSTEMCHILDWINDOW +// tdf#144624: special bit used to skip assigning icon to virtual window +WinBits const WB_NOICON = SAL_CONST_INT64(0x200000000000); enum class WindowAlign { Left, Top, Right, Bottom }; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 519aad8bb27b..e7b3c3b08433 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -824,7 +824,7 @@ public: @see GetFocusWindow */ - static OutputDevice* GetDefaultDevice(); + static OutputDevice* GetDefaultDevice(bool bUseIcon = true); /** Get the first top-level window of the application. |