From 5098f825931604004caf37069a3fb38359c837a4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 21 Feb 2018 20:00:21 +0100 Subject: Move include/sfx2/notebookbar/NotebookbarContextControl.hxx to include/vcl/ ...as it is included from other include/vcl/*.hxx files. (And moving it there helps the heuristic in an upcoming improvement of loplugin:dyncastvisibility.) Change-Id: I15e061fbaba8e82235afb5b312f7b38f26eec900 Reviewed-on: https://gerrit.libreoffice.org/50123 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- accessibility/inc/pch/precompiled_acc.hxx | 2 +- basctl/inc/pch/precompiled_basctl.hxx | 2 +- chart2/inc/pch/precompiled_chartcontroller.hxx | 2 +- cui/inc/pch/precompiled_cui.hxx | 2 +- desktop/inc/pch/precompiled_sofficeapp.hxx | 2 +- framework/inc/pch/precompiled_fwl.hxx | 2 +- .../sfx2/notebookbar/NotebookbarContextControl.hxx | 26 ---------------------- include/vcl/NotebookbarContextControl.hxx | 26 ++++++++++++++++++++++ include/vcl/notebookbar.hxx | 2 +- include/vcl/tabctrl.hxx | 2 +- reportdesign/inc/pch/precompiled_rptui.hxx | 2 +- sc/inc/pch/precompiled_sc.hxx | 2 +- sd/inc/pch/precompiled_sd.hxx | 2 +- sd/inc/pch/precompiled_sdui.hxx | 2 +- sfx2/inc/pch/precompiled_sfx.hxx | 2 +- sfx2/source/notebookbar/ContextVBox.cxx | 4 +++- slideshow/inc/pch/precompiled_slideshow.hxx | 2 +- solenv/clang-format/blacklist | 2 +- svtools/inc/pch/precompiled_svt.hxx | 2 +- svx/inc/pch/precompiled_svxcore.hxx | 2 +- sw/inc/pch/precompiled_swui.hxx | 2 +- sw/inc/pch/precompiled_vbaswobj.hxx | 2 +- xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 2 +- 23 files changed, 49 insertions(+), 47 deletions(-) delete mode 100644 include/sfx2/notebookbar/NotebookbarContextControl.hxx create mode 100644 include/vcl/NotebookbarContextControl.hxx diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index fde5a69bd67b..ed8944275b47 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -100,6 +100,7 @@ #include #include #include +#include #include #include #include @@ -323,7 +324,6 @@ #include #include #include -#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 97cc996fb631..0a7accdf5912 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -111,6 +111,7 @@ #include #include #include +#include #include #include #include @@ -408,7 +409,6 @@ #include #include #include -#include #include #include #include diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index 28f6d317a0ec..afce85d48159 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -105,6 +105,7 @@ #include #include #include +#include #include #include #include @@ -404,7 +405,6 @@ #include #include #include -#include #include #include #include diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index eac04f9e911f..c6ac8c055c58 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -111,6 +111,7 @@ #include #include #include +#include #include #include #include @@ -339,7 +340,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index a95c286d9505..e6713d6badfb 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -108,6 +108,7 @@ #include #include #include +#include #include #include #include @@ -242,7 +243,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx index 31da9c1207c4..b77f7bf005df 100644 --- a/framework/inc/pch/precompiled_fwl.hxx +++ b/framework/inc/pch/precompiled_fwl.hxx @@ -107,6 +107,7 @@ #include #include #include +#include #include #include #include @@ -319,7 +320,6 @@ #include #include #include -#include #include #include #include diff --git a/include/sfx2/notebookbar/NotebookbarContextControl.hxx b/include/sfx2/notebookbar/NotebookbarContextControl.hxx deleted file mode 100644 index 172b25756d8f..000000000000 --- a/include/sfx2/notebookbar/NotebookbarContextControl.hxx +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARCONTEXTCONTROL_HXX -#define INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARCONTEXTCONTROL_HXX - -#include - -class NotebookBar; - -class NotebookbarContextControl -{ -public: - virtual ~NotebookbarContextControl() {} - virtual void SetContext( vcl::EnumContext::Context eContext ) = 0; -}; - -#endif // INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARCONTEXTCONTROL_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/NotebookbarContextControl.hxx b/include/vcl/NotebookbarContextControl.hxx new file mode 100644 index 000000000000..b338d8dd3e57 --- /dev/null +++ b/include/vcl/NotebookbarContextControl.hxx @@ -0,0 +1,26 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_VCL_NOTEBOOKBARCONTEXTCONTROL_HXX +#define INCLUDED_VCL_NOTEBOOKBARCONTEXTCONTROL_HXX + +#include + +class NotebookBar; + +class NotebookbarContextControl +{ +public: + virtual ~NotebookbarContextControl() {} + virtual void SetContext( vcl::EnumContext::Context eContext ) = 0; +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx index bc3885cabd59..337b3f76ccf0 100644 --- a/include/vcl/notebookbar.hxx +++ b/include/vcl/notebookbar.hxx @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 660c89642c83..747b30160fac 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include struct ImplTabItem; struct ImplTabCtrlData; diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 650dc223a76d..3ae03c15dbb3 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -114,6 +114,7 @@ #include #include #include +#include #include #include #include @@ -405,7 +406,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index f48ef3005c05..c9295f13954f 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -116,6 +116,7 @@ #include #include #include +#include #include #include #include @@ -453,7 +454,6 @@ #include #include #include -#include #include #include #include diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 449c954630fd..72c6df6d18d3 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -88,6 +88,7 @@ #include #include #include +#include #include #include #include @@ -376,7 +377,6 @@ #include #include #include -#include #include #include #include diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 043cf3150b80..3ade8ea3b434 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -112,6 +112,7 @@ #include #include #include +#include #include #include #include @@ -408,7 +409,6 @@ #include #include #include -#include #include #include #include diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 947f3f20e6cd..fcc40e260176 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -85,6 +85,7 @@ #include #include #include +#include #include #include #include @@ -480,7 +481,6 @@ #include #include #include -#include #include #include #include diff --git a/sfx2/source/notebookbar/ContextVBox.cxx b/sfx2/source/notebookbar/ContextVBox.cxx index 62494c2e9203..acd43c8af406 100644 --- a/sfx2/source/notebookbar/ContextVBox.cxx +++ b/sfx2/source/notebookbar/ContextVBox.cxx @@ -17,11 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + +#include #include #include #include #include -#include /* * ContextVBox is a VclVBox which shows own children depending on current context. diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index a906763d239d..aa4a587c1cb9 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.hxx @@ -98,6 +98,7 @@ #include #include #include +#include #include #include #include @@ -247,7 +248,6 @@ #include #include #include -#include #include #include #include diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 2acef63815d6..198294203d73 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -6876,7 +6876,6 @@ include/sfx2/msgpool.hxx include/sfx2/navigat.hxx include/sfx2/new.hxx include/sfx2/newstyle.hxx -include/sfx2/notebookbar/NotebookbarContextControl.hxx include/sfx2/notebookbar/NotebookbarTabControl.hxx include/sfx2/notebookbar/SfxNotebookBar.hxx include/sfx2/objface.hxx @@ -7973,6 +7972,7 @@ include/vcl/IconThemeInfo.hxx include/vcl/IconThemeScanner.hxx include/vcl/IconThemeSelector.hxx include/vcl/ImageTree.hxx +include/vcl/NotebookbarContextControl.hxx include/vcl/abstdlg.hxx include/vcl/accel.hxx include/vcl/alpha.hxx diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 142bf93dd753..bf6068638065 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -98,6 +98,7 @@ #include #include #include +#include #include #include #include @@ -350,7 +351,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index b305843b2902..df9ad09c4e62 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -104,6 +104,7 @@ #include #include #include +#include #include #include #include @@ -401,7 +402,6 @@ #include #include #include -#include #include #include #include diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 4698f43d2afe..aef3030fd050 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -117,6 +117,7 @@ #include #include #include +#include #include #include #include @@ -549,7 +550,6 @@ #include #include #include -#include #include #include #include diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 6dca15aa3487..59bda3e0b690 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -118,6 +118,7 @@ #include #include #include +#include #include #include #include @@ -394,7 +395,6 @@ #include #include #include -#include #include #include #include diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index c9c58ab1d0a4..0c01d24701c7 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -106,6 +106,7 @@ #include #include #include +#include #include #include #include @@ -298,7 +299,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3