[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source

[Szymon Kłos (via logerrit)]

 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d83ffaafb58c36658b9d2a7e34468ff921de79c3
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Nov 14 11:38:40 2022 +0100
Commit:     Ashod Nakashian <a...@collabora.com>
CommitDate: Wed Nov 16 12:41:30 2022 +0100

    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 <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Ashod Nakashian <a...@collabora.com>

diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx 
b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 45afd93c96f3..79eeb1b3476b 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -26,6 +26,8 @@
 #include <memory>
 #include <unordered_map>
 
+#include <comphelper/lok.hxx>
+
 namespace {
 
 /** Collection of data that is stored for all active preview caches.
@@ -297,7 +299,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());
         }