summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-09-01 17:24:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-09-02 13:52:51 +0200
commit558301f99940997526513853e3e0d11f0b63d3ac (patch)
treefe05cf5d60baba8d16d9524969f26a57afadfaac /vcl/source/window
parent9ecc4fa3eb631e3f0491b651fda0756854e98c18 (diff)
MergeNotebookBarMenuAddons has only static methods
Change-Id: I962003d4753b726184d87916ba012b3808424653 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101916 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/NotebookBarAddonsMerger.cxx20
1 files changed, 9 insertions, 11 deletions
diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx
index 7ab27c038f13..1d8d5a7e7aec 100644
--- a/vcl/source/window/NotebookBarAddonsMerger.cxx
+++ b/vcl/source/window/NotebookBarAddonsMerger.cxx
@@ -103,14 +103,12 @@ static void CreateNotebookBarToolBox(vcl::Window* pNotebookbarToolBox,
pToolbox->Show();
}
-NotebookBarAddonsMerger::NotebookBarAddonsMerger() {}
-
-NotebookBarAddonsMerger::~NotebookBarAddonsMerger() {}
-
-void NotebookBarAddonsMerger::MergeNotebookBarAddons(
- vcl::Window* pParent, const VclBuilder::customMakeWidget& pFunction,
- const css::uno::Reference<css::frame::XFrame>& m_xFrame,
- const NotebookBarAddonsItem& aNotebookBarAddonsItem, VclBuilder::stringmap& rMap)
+namespace NotebookBarAddonsMerger
+{
+void MergeNotebookBarAddons(vcl::Window* pParent, const VclBuilder::customMakeWidget& pFunction,
+ const css::uno::Reference<css::frame::XFrame>& m_xFrame,
+ const NotebookBarAddonsItem& aNotebookBarAddonsItem,
+ VclBuilder::stringmap& rMap)
{
std::vector<Image> aImageVec = aNotebookBarAddonsItem.aImageValues;
unsigned long nIter = 0;
@@ -145,9 +143,8 @@ void NotebookBarAddonsMerger::MergeNotebookBarAddons(
}
}
-void NotebookBarAddonsMerger::MergeNotebookBarMenuAddons(
- Menu* pPopupMenu, sal_Int16 nItemId, const OString& sItemIdName,
- NotebookBarAddonsItem& aNotebookBarAddonsItem)
+void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OString& sItemIdName,
+ NotebookBarAddonsItem& aNotebookBarAddonsItem)
{
std::vector<Image> aImageVec = aNotebookBarAddonsItem.aImageValues;
unsigned long nIter = 0;
@@ -182,5 +179,6 @@ void NotebookBarAddonsMerger::MergeNotebookBarMenuAddons(
}
}
}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */