diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2022-11-14 11:38:40 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2022-11-19 16:31:44 +0100 |
| commit | 71c88cf9d5f5dffa86e5a111e19468a5a2a2b6c0 (patch) | |
| tree | 778a41ad06d915c7a5d321d1ae64e4f6d0bce562 /sd | |
| parent | ec6502a1f61fcbd4bf05b62f172650fe442c3a1d (diff) | |
lok: masterpage: don't remove old cache
In multi user view when switching between MasterPage and Page
mode it was failing to find cache because it was removed by other
views. We need that to allow invalidation after master page changed
something.
Change-Id: I070345b0fe6942965aece5bf729ceb37b7d99397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142697
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Ashod Nakashian <ash@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142965
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 465bb6c992b5..76fc3753fc53 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -27,6 +27,8 @@ #include <unordered_map> #include <utility> +#include <comphelper/lok.hxx> + namespace { /** Collection of data that is stored for all active preview caches. @@ -298,7 +300,8 @@ std::shared_ptr<BitmapCache> PageCacheManager::ChangeSize ( pResult = rpCache; } - else + // In multi user view this can happen - no issue (reset after switching MasterPage) + else if (!comphelper::LibreOfficeKit::isActive()) { assert(iCacheToChange != mpPageCaches->end()); } |