[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/vcl vcl/inc vcl/source vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 2 11:53:25 UTC 2020
compilerplugins/clang/unusedmethods.results | 4 ----
include/vcl/NotebookBarAddonsMerger.hxx | 19 +++++++------------
include/vcl/weld.hxx | 1 -
vcl/inc/salvtables.hxx | 3 ---
vcl/source/app/salvtables.cxx | 7 -------
vcl/source/window/NotebookBarAddonsMerger.cxx | 20 +++++++++-----------
vcl/unx/gtk3/gtk3gtkinst.cxx | 6 ------
7 files changed, 16 insertions(+), 44 deletions(-)
New commits:
commit 558301f99940997526513853e3e0d11f0b63d3ac
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 1 17:24:49 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 2 13:52:51 2020 +0200
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 at redhat.com>
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 4b98a47d9293..f7c4661dfcbb 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -782,8 +782,6 @@ include/vcl/ITiledRenderable.hxx:214
enum PointerStyle vcl::ITiledRenderable::getPointer()
include/vcl/lok.hxx:22
void vcl::lok::unregisterPollCallbacks()
-include/vcl/NotebookBarAddonsMerger.hxx:55
- NotebookBarAddonsMerger::NotebookBarAddonsMerger()
include/vcl/opengl/OpenGLHelper.hxx:67
void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &)
include/vcl/opengl/OpenGLHelper.hxx:100
diff --git a/include/vcl/NotebookBarAddonsMerger.hxx b/include/vcl/NotebookBarAddonsMerger.hxx
index 20d6a7b71aef..ef0e7d677e17 100644
--- a/include/vcl/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/NotebookBarAddonsMerger.hxx
@@ -49,19 +49,14 @@ struct AddonNotebookBarItem
OUString sStyle;
};
-class NotebookBarAddonsMerger
+namespace NotebookBarAddonsMerger
{
-public:
- NotebookBarAddonsMerger();
- ~NotebookBarAddonsMerger();
- static void MergeNotebookBarAddons(vcl::Window* pParent,
- const VclBuilder::customMakeWidget& pFunction,
- const css::uno::Reference<css::frame::XFrame>& rFrame,
- const NotebookBarAddonsItem& aNotebookBarAddonsItem,
- VclBuilder::stringmap& rVec);
- static void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId,
- const OString& sItemIdName,
- NotebookBarAddonsItem& aNotebookBarAddonsItem);
+void MergeNotebookBarAddons(vcl::Window* pParent, const VclBuilder::customMakeWidget& pFunction,
+ const css::uno::Reference<css::frame::XFrame>& rFrame,
+ const NotebookBarAddonsItem& aNotebookBarAddonsItem,
+ VclBuilder::stringmap& rVec);
+void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OString& sItemIdName,
+ NotebookBarAddonsItem& aNotebookBarAddonsItem);
};
#endif
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: */
commit 9ecc4fa3eb631e3f0491b651fda0756854e98c18
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 1 17:19:07 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 2 13:52:32 2020 +0200
drop unused weld_window
Change-Id: I0c52d992aba4d466048956ea9e8c49feb56862d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101915
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 983d7002db28..4b98a47d9293 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -912,8 +912,6 @@ include/vcl/weld.hxx:2161
class rtl::OUString weld::Toolbar::get_item_label(const class rtl::OString &) const
include/vcl/weld.hxx:2171
void weld::Toolbar::append_separator(const class rtl::OUString &)
-include/vcl/weld.hxx:2214
- class std::unique_ptr<class weld::Window, struct std::default_delete<class weld::Window> > weld::Builder::weld_window(const class rtl::OString &,_Bool)
include/vcl/weldutils.hxx:304
void weld::DateFormatter::CursorChangedHdl(class weld::Entry &)
include/vcl/weldutils.hxx:304
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index c90baaa642a7..34234f05ed4e 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2200,7 +2200,6 @@ public:
virtual std::unique_ptr<Dialog> weld_dialog(const OString& id, bool bTakeOwnership = true) = 0;
virtual std::unique_ptr<Assistant> weld_assistant(const OString& id, bool bTakeOwnership = true)
= 0;
- virtual std::unique_ptr<Window> weld_window(const OString& id, bool bTakeOwnership = true) = 0;
virtual std::unique_ptr<Widget> weld_widget(const OString& id, bool bTakeOwnership = false) = 0;
virtual std::unique_ptr<Container> weld_container(const OString& id,
bool bTakeOwnership = false)
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 46bf66caf79a..5c2761448af4 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -47,9 +47,6 @@ public:
virtual std::unique_ptr<weld::Window> create_screenshot_window() override;
- virtual std::unique_ptr<weld::Window> weld_window(const OString& id,
- bool bTakeOwnership = true) override;
-
virtual std::unique_ptr<weld::Widget> weld_widget(const OString& id,
bool bTakeOwnership = false) override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4859706e0ffe..7c7bbbe25e86 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6535,13 +6535,6 @@ std::unique_ptr<weld::Window> SalInstanceBuilder::create_screenshot_window()
return std::unique_ptr<weld::Dialog>(new SalInstanceDialog(xDialog, this, false));
}
-std::unique_ptr<weld::Window> SalInstanceBuilder::weld_window(const OString& id,
- bool bTakeOwnership)
-{
- SystemWindow* pWindow = m_xBuilder->get<SystemWindow>(id);
- return pWindow ? std::make_unique<SalInstanceWindow>(pWindow, this, bTakeOwnership) : nullptr;
-}
-
std::unique_ptr<weld::Widget> SalInstanceBuilder::weld_widget(const OString& id,
bool bTakeOwnership)
{
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index a8c9dc9815fc..2ac4130e4392 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -15922,12 +15922,6 @@ public:
return std::make_unique<GtkInstanceDialog>(pDialog, this, true);
}
- virtual std::unique_ptr<weld::Window> weld_window(const OString &id, bool bTakeOwnership) override
- {
- GtkWindow* pWindow = GTK_WINDOW(gtk_builder_get_object(m_pBuilder, id.getStr()));
- return pWindow ? std::make_unique<GtkInstanceWindow>(pWindow, this, bTakeOwnership) : nullptr;
- }
-
virtual std::unique_ptr<weld::Widget> weld_widget(const OString &id, bool bTakeOwnership) override
{
GtkWidget* pWidget = GTK_WIDGET(gtk_builder_get_object(m_pBuilder, id.getStr()));
More information about the Libreoffice-commits
mailing list