compilerplugins/clang/badstatics.cxx | 3 +-- sfx2/source/notebookbar/SfxNotebookBar.cxx | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-)
New commits: commit 207a66268ff09990a415b2828765bab79ca08a2a Author: Andras Timar <[email protected]> AuthorDate: Sat Feb 10 13:34:18 2024 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 13:34:18 2024 +0100 sfx2: fix clang plugin errors Change-Id: I595a5dd9edc37fa7b383bb02a3378b359d97524f diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index adbdf08ed3d2..1d003acdb8a6 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 diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index a5287a82a3b9..41ae9c3c2666 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -61,7 +61,7 @@ struct NotebookBarViewData }; /** Notebookbar instance manager is a singleton that is used for track the - * per-view instances of view specifc data contained in NotebookBarViewData + * per-view instances of view specific data contained in NotebookBarViewData * class. **/ class NotebookBarViewManager final @@ -81,8 +81,8 @@ public: // Singleton get method - creates an instance on first get() call static NotebookBarViewManager& get() { - static NotebookBarViewManager gManager; - return gManager; + static NotebookBarViewManager gNotebookBarManager; + return gNotebookBarManager; } NotebookBarViewData& getViewData(const SfxViewShell* pViewShell)
