include/vcl/tabctrl.hxx | 2 +- sfx2/source/notebookbar/NotebookbarTabControl.cxx | 3 +-- vcl/source/control/tabctrl.cxx | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit ca914b36b36b1fcbbb720388a13abd26d06e7b4d Author: Caolán McNamara <[email protected]> AuthorDate: Wed Dec 2 20:17:36 2020 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Dec 3 09:46:19 2020 +0100 don't need to include button.hxx here Change-Id: I70ee0546c768271b9eb1d1432de2c9c642c0984a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107133 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index c63c7a0fd019..b113450fd90e 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -205,7 +205,7 @@ public: void SetIconClickHdl( Link<NotebookBar*, void> aHdl ); void SetToolBox( ToolBox* pToolBox ); ToolBox* GetToolBox() { return m_pShortcuts; } - PushButton* GetOpenMenu() { return m_pOpenMenu; } + Control* GetOpenMenu(); virtual Size calculateRequisition() const override; static sal_uInt16 GetHeaderHeight(); diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx index c503c7b52ea3..a8362087a263 100644 --- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx +++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx @@ -18,7 +18,6 @@ */ #include <vcl/builderfactory.hxx> -#include <vcl/button.hxx> #include <vcl/layout.hxx> #include <vcl/notebookbar.hxx> #include <vcl/tabpage.hxx> @@ -161,7 +160,7 @@ NotebookbarTabControl::~NotebookbarTabControl() void NotebookbarTabControl::ArrowStops( sal_uInt16 nCode ) { ToolBox* pToolBox( GetToolBox() ); - PushButton* pOpenMenu( GetOpenMenu() ); + Control* pOpenMenu( GetOpenMenu() ); if ( nCode == KEY_LEFT ) { diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 8f75270c237b..faeb70ecd4e1 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -2393,4 +2393,9 @@ Size NotebookbarTabControlBase::calculateRequisition() const return TabControl::ImplCalculateRequisition(m_nHeaderHeight); } +Control* NotebookbarTabControlBase::GetOpenMenu() +{ + return m_pOpenMenu; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
