commit d8b834a750a284ecd04cac1f4de4cb9cbf05c42c
author Szymon Kłos <szymon.klos@collabora.com> Fri Jun 02 18:31:55 2023 +0200
committer Caolán McNamara <caolan.mcnamara@collabora.com> Sat Jun 03 17:44:01 2023 +0200
tree 097c967f1881168378459b2d60c691365265361b
parent 5ad502af9cf3d49457082a12d36f8159b6c4ca11

Styles preview cache cleanup on exit

Change-Id: I28929d4137008ebcca1733837d0b2112b6859a89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152563
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152576
Tested-by: Jenkins

compilerplugins/clang/badstatics.cxx

diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx
index 7c604bc..f22daba 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -199,9 +199,8 @@ public:
                || name == "g_aWindowList"
                    //vcl/unx/gtk3/a11y/atkutil.cxx, asserted empty at exit
                || name == "gFontPreviewVirDevs"
                || (loplugin::DeclCheck(pVarDecl).Var("aPreviewCache")
                    .Class("StylesPreviewWindow_Base").GlobalNamespace()) // TODO: temp disable
                    //svtools/source/control/ctrlbox.cxx, empty at exit
                || name == "gStylePreviewCache" // svx/source/tbxctrls/StylesPreviewWindow.cxx
                || name == "aLogger" // FormulaLogger& FormulaLogger::get() in sc/source/core/tool/formulalogger.cxx
                || name == "s_aUncommittedRegistrations" // sw/source/uibase/dbui/dbmgr.cxx
                || (loplugin::DeclCheck(pVarDecl).Var("aAllListeners")

svx/source/inc/StylesPreviewWindow.hxx

diff --git a/svx/source/inc/StylesPreviewWindow.hxx b/svx/source/inc/StylesPreviewWindow.hxx
index 47e21dc..de4984e 100644
--- a/svx/source/inc/StylesPreviewWindow.hxx
+++ b/svx/source/inc/StylesPreviewWindow.hxx
@@ -127,8 +127,6 @@ private:
    void UpdateStylesList();
    void UpdateSelection();
    bool Command(const CommandEvent& rEvent);

    static std::map<OUString, VclPtr<VirtualDevice>> aPreviewCache;
};

class StylesPreviewWindow_Impl final : public InterimItemWindow, public StylesPreviewWindow_Base

svx/source/tbxctrls/StylesPreviewWindow.cxx

diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index c1e3549..a51283d 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -60,7 +60,36 @@

#include <vcl/commandevent.hxx>

std::map<OUString, VclPtr<VirtualDevice>> StylesPreviewWindow_Base::aPreviewCache;
namespace
{
class StylePreviewCache
{
    static std::map<OUString, VclPtr<VirtualDevice>> gStylePreviewCache;
    static int gStylePreviewCacheClients;

public:
    static std::map<OUString, VclPtr<VirtualDevice>>& Get() { return gStylePreviewCache; }

    static void ClearCache()
    {
        for (auto& aPreview : gStylePreviewCache)
            aPreview.second.disposeAndClear();

        gStylePreviewCache.clear();
    }

    static void RegisterClient() { gStylePreviewCacheClients++; }
    static void UnregisterClient()
    {
        gStylePreviewCacheClients--;
        if (!gStylePreviewCacheClients)
            ClearCache();
    }
};

std::map<OUString, VclPtr<VirtualDevice>> StylePreviewCache::gStylePreviewCache;
int StylePreviewCache::gStylePreviewCacheClients;
}

StyleStatusListener::StyleStatusListener(
    StylesPreviewWindow_Base* pPreviewControl,
@@ -103,8 +132,10 @@ StylePoolChangeListener::~StylePoolChangeListener()
        EndListening(*m_pStyleSheetPool);
}

void StylePoolChangeListener::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
void StylePoolChangeListener::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
    if (rHint.GetId() == SfxHintId::StyleSheetModified)
        StylePreviewCache::ClearCache();
    m_pPreviewControl->RequestStylesListUpdate();
}

@@ -378,6 +409,8 @@ StylesPreviewWindow_Base::StylesPreviewWindow_Base(
    , m_aUpdateTask(*this)
    , m_aDefaultStyles(std::move(aDefaultStyles))
{
    StylePreviewCache::RegisterClient();

    m_xStylesView->connect_selection_changed(LINK(this, StylesPreviewWindow_Base, Selected));
    m_xStylesView->connect_item_activated(LINK(this, StylesPreviewWindow_Base, DoubleClick));
    m_xStylesView->connect_command(LINK(this, StylesPreviewWindow_Base, DoCommand));
@@ -424,6 +457,8 @@ StylesPreviewWindow_Base::~StylesPreviewWindow_Base()

    m_aUpdateTask.Stop();

    StylePreviewCache::UnregisterClient();

    try
    {
        m_xStatusListener->dispose();
@@ -465,8 +500,9 @@ void StylesListUpdateTask::Invoke()
VclPtr<VirtualDevice>
StylesPreviewWindow_Base::GetCachedPreview(const std::pair<OUString, OUString>& rStyle)
{
    if (aPreviewCache.find(rStyle.second) != aPreviewCache.end())
        return aPreviewCache[rStyle.second];
    auto aFound = StylePreviewCache::Get().find(rStyle.second);
    if (aFound != StylePreviewCache::Get().end())
        return StylePreviewCache::Get()[rStyle.second];
    else
    {
        VclPtr<VirtualDevice> pImg = VclPtr<VirtualDevice>::Create();
@@ -475,7 +511,7 @@ StylesPreviewWindow_Base::GetCachedPreview(const std::pair<OUString, OUString>& 

        StyleItemController aStyleController(rStyle);
        aStyleController.Paint(*pImg);
        aPreviewCache[rStyle.second] = pImg;
        StylePreviewCache::Get()[rStyle.second] = pImg;

        return pImg;
    }