basctl/source/basicide/basides1.cxx | 3 +--
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 1 -
sc/source/ui/view/tabcont.cxx | 3 +--
sfx2/source/notebookbar/SfxNotebookBar.cxx | 1 -
4 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 05b24909981fc952b36fe7ac520232bd19822c8a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 29 16:54:55 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 30 09:12:00 2019 +0100
don't need to include vcl/tabctrl.hxx
Change-Id: Idb1f6700c5012303e45587db653b62a90e331c17
Reviewed-on: https://gerrit.libreoffice.org/81710
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 9c06a7c93c20..a6f74b646595 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -52,7 +52,6 @@
#include <svl/visitem.hxx>
#include <svl/whiter.hxx>
#include <vcl/xtextedt.hxx>
-#include <vcl/tabctrl.hxx>
#include <vcl/textview.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
@@ -1156,7 +1155,7 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool
bUpdateTabBar, bool bRemembe
if ( bUpdateTabBar )
{
sal_uInt16 nKey = GetWindowId( pCurWin );
- if ( pCurWin && ( pTabBar->GetPagePos( nKey ) == TAB_PAGE_NOTFOUND
) )
+ if ( pCurWin && ( pTabBar->GetPagePos( nKey ) ==
TabBar::PAGE_NOT_FOUND ) )
pTabBar->InsertPage( nKey, pCurWin->GetTitle() ); // has
just been faded in
pTabBar->SetCurPageId( nKey );
}
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index f1e5ef7f84a2..075b4df0b644 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNHELPBAR_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNHELPBAR_HXX
-#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include "IClipBoardTest.hxx"
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 11dd41de5254..53e897cc6aa7 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -23,7 +23,6 @@
#include <tools/urlobj.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/tabctrl.hxx>
#include <tabcont.hxx>
#include <tabvwsh.hxx>
#include <docsh.hxx>
@@ -199,7 +198,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
if( nMouseClickPageId != GetPageId(aPos))
nMouseClickPageId = TabBar::PAGE_NOT_FOUND;
- if ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() && nMouseClickPageId != 0 &&
nMouseClickPageId != TAB_PAGE_NOTFOUND )
+ if ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() && nMouseClickPageId != 0 &&
nMouseClickPageId != TabBar::PAGE_NOT_FOUND )
{
SfxDispatcher* pDispatcher =
pViewData->GetViewShell()->GetViewFrame()->GetDispatcher();
pDispatcher->Execute( FID_TAB_MENU_RENAME, SfxCallMode::SYNCHRON |
SfxCallMode::RECORD );
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 5b9dd2018ae7..9c7972d46783 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -15,7 +15,6 @@
#include <toolkit/awt/vclxmenu.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/syswin.hxx>
-#include <vcl/tabctrl.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/sfxsids.hrc>
#include <comphelper/processfactory.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
