From 74ee046a04d6893db5b772f8f4219f7db413fbb8 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Mon, 29 Jan 2024 16:08:48 +0900 Subject: lok: introduce NotebookBarViewManager and NotebookBarViewData MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NotebookBarViewManager is a singleton which is responsible to hold NotebookBar view specific data, which is kept in NotebookBarViewData class. The idea is to have one NotebookBarViewData class instance per one view (SfxViewShell instance). This also refactors the existing code and now moves the m_pWeldedWrapper, m_pNotebookBar and the m_pToolbarUnoDispatcher into NotebookBarViewData class. Change-Id: I32f5954fa9f1628acd9f5f9bd5760ac23ca687ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162706 Tested-by: Jenkins Reviewed-by: Szymon Kłos --- compilerplugins/clang/badstatics.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'compilerplugins/clang') diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index 328218086453..18638695bbeb 100644 --- a/compilerplugins/clang/badstatics.cxx +++ b/compilerplugins/clang/badstatics.cxx @@ -210,8 +210,7 @@ public: || name == "s_aLOKWindowsMap" // LOK only, guarded by assert, and LOK never tries to perform a VCL cleanup || name == "s_aLOKWeldBuildersMap" // LOK only, similar case as above || name == "s_aLOKPopupsMap" // LOK only, similar case as above - || name == "m_pNotebookBarWeldedWrapper" // LOK only, warning about map's key, no VCL cleanup performed - || name == "m_pNotebookBarInstance" // LOK only case, when notebookbar is closed - VclPtr instance is removed + || name == "gNotebookBarManager" // LOK only case, when notebookbar is closed - VclPtr instance is removed || name == "gStaticManager" // vcl/source/graphic/Manager.cxx - stores non-owning pointers || name == "aThreadedInterpreterPool" // ScInterpreterContext(Pool), not owning || name == "aNonThreadedInterpreterPool" // ScInterpreterContext(Pool), not owning -- cgit