diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2024-01-29 16:08:48 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-02-09 22:03:38 +0100 |
| commit | ac7503e601968d87e90f0c323e1494ec6b680427 (patch) | |
| tree | c8819d873609a06d975272b4feee6611aa22c982 /include | |
| parent | 75512125fc2269253505741acb76ad29df970af6 (diff) | |
lok: introduce NotebookBarViewManager and NotebookBarViewData
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/+/162680
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit da8ebd2c348affbd7fa4975910296f32d3c9d1b0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163173
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/notebookbar/SfxNotebookBar.hxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx index cd94ddad7b1e..47bd9cc79901 100644 --- a/include/sfx2/notebookbar/SfxNotebookBar.hxx +++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx @@ -16,7 +16,6 @@ #include <vcl/WeldedTabbedNotebookbar.hxx> #include <vcl/EnumContext.hxx> -#include <map> #include <memory> #include <string_view> @@ -33,8 +32,7 @@ class SfxBindings; class SfxViewFrame; class SfxViewShell; class SystemWindow; -class ToolbarUnoDispatcher; -class WeldedTabbedNotebookbar; +class ViewInstanceManager; namespace sfx2 { @@ -75,11 +73,6 @@ public: private: static bool m_bLock; static bool m_bHide; - static std::unique_ptr<ToolbarUnoDispatcher> m_xCalcToolboxDispatcher; - - static std::map<const SfxViewShell*, std::shared_ptr<WeldedTabbedNotebookbar>> - m_pNotebookBarWeldedWrapper; - static std::map<const SfxViewShell*, VclPtr<NotebookBar>> m_pNotebookBarInstance; static void ResetActiveToolbarModeToDefault(vcl::EnumContext::Application eApp); static void RemoveCurrentLOKWrapper(); |