mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't need to include button.hxx here

Browse Source 
Change-Id: I70ee0546c768271b9eb1d1432de2c9c642c0984a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107133
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-12-02 20:17:36 +00:00
parent 0865857e74
commit ca914b36b3
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/vcl/tabctrl.hxx
View File

@@ -205,7 +205,7 @@ public:
void SetIconClickHdl( Link<NotebookBar*, void> aHdl ); void SetIconClickHdl( Link<NotebookBar*, void> aHdl );
void SetToolBox( ToolBox* pToolBox ); void SetToolBox( ToolBox* pToolBox );
ToolBox* GetToolBox() { return m_pShortcuts; } ToolBox* GetToolBox() { return m_pShortcuts; }
PushButton* GetOpenMenu() { return m_pOpenMenu; } Control* GetOpenMenu();
virtual Size calculateRequisition() const override; virtual Size calculateRequisition() const override;
static sal_uInt16 GetHeaderHeight(); static sal_uInt16 GetHeaderHeight();

3
sfx2/source/notebookbar/NotebookbarTabControl.cxx
View File

@@ -18,7 +18,6 @@
*/ */
#include <vcl/builderfactory.hxx> #include <vcl/builderfactory.hxx>
#include <vcl/button.hxx>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
#include <vcl/notebookbar.hxx> #include <vcl/notebookbar.hxx>
#include <vcl/tabpage.hxx> #include <vcl/tabpage.hxx>
@@ -161,7 +160,7 @@ NotebookbarTabControl::~NotebookbarTabControl()
void NotebookbarTabControl::ArrowStops( sal_uInt16 nCode ) void NotebookbarTabControl::ArrowStops( sal_uInt16 nCode )
{ {
ToolBox* pToolBox( GetToolBox() ); ToolBox* pToolBox( GetToolBox() );
PushButton* pOpenMenu( GetOpenMenu() ); Control* pOpenMenu( GetOpenMenu() );
if ( nCode == KEY_LEFT ) if ( nCode == KEY_LEFT )
{ {

5
vcl/source/control/tabctrl.cxx
View File

@@ -2393,4 +2393,9 @@ Size NotebookbarTabControlBase::calculateRequisition() const
return TabControl::ImplCalculateRequisition(m_nHeaderHeight); return TabControl::ImplCalculateRequisition(m_nHeaderHeight);
} }
Control* NotebookbarTabControlBase::GetOpenMenu()
{
return m_pOpenMenu;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */