From 49481b842ccc35ef2000df0ee659ff17ab39edb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sun, 11 Apr 2021 19:34:11 +0100 Subject: [PATCH] vclxtopwindow.hxx and vclxcontainer.hxx can now be private headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If6d56c9f2fcaf47e1756e8645098ad86987c8b64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113958 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- include/IwyuFilter_include.yaml | 4 ---- solenv/clang-format/excludelist | 4 ++-- {include/toolkit => toolkit/inc}/awt/vclxcontainer.hxx | 10 +--------- toolkit/inc/awt/vclxtabpagecontainer.hxx | 2 +- {include/toolkit => toolkit/inc}/awt/vclxtopwindow.hxx | 2 +- toolkit/inc/awt/vclxwindows.hxx | 2 +- toolkit/source/awt/vclxcontainer.cxx | 5 +---- toolkit/source/awt/vclxtoolkit.cxx | 2 +- toolkit/source/awt/vclxtopwindow.cxx | 2 +- toolkit/source/helper/unowrapper.cxx | 4 ++-- 10 files changed, 11 insertions(+), 26 deletions(-) rename {include/toolkit => toolkit/inc}/awt/vclxcontainer.hxx (95%) rename {include/toolkit => toolkit/inc}/awt/vclxtopwindow.hxx (98%) diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 00cfb961a447..76a8bb8c19f8 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -350,10 +350,6 @@ excludelist: include/toolkit/awt/vclxaccessiblecomponent.hxx: # base class has to be a complete type - com/sun/star/lang/XServiceInfo.hpp - include/toolkit/awt/vclxtopwindow.hxx: - # base class has to be a complete type - - com/sun/star/awt/XTopWindow2.hpp - - com/sun/star/awt/XSystemDependentWindowPeer.hpp include/toolkit/awt/vclxwindow.hxx: # base class has to be a complete type - toolkit/awt/vclxdevice.hxx diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index b1944790369e..3a08ed8cf255 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -6177,11 +6177,9 @@ include/test/util/xsearchable.hxx include/test/xmldiff.hxx include/test/xmltesttools.hxx include/toolkit/awt/vclxaccessiblecomponent.hxx -include/toolkit/awt/vclxcontainer.hxx include/toolkit/awt/vclxdevice.hxx include/toolkit/awt/vclxfont.hxx include/toolkit/awt/vclxmenu.hxx -include/toolkit/awt/vclxtopwindow.hxx include/toolkit/awt/vclxwindow.hxx include/toolkit/awt/vclxwindows.hxx include/toolkit/controls/unocontrol.hxx @@ -13681,6 +13679,7 @@ testtools/source/performance/ubobject.cxx testtools/source/performance/ubtest.cxx toolkit/inc/awt/animatedimagespeer.hxx toolkit/inc/awt/vclxbitmap.hxx +toolkit/inc/awt/vclxcontainer.hxx toolkit/inc/awt/vclxgraphics.hxx toolkit/inc/awt/vclxpointer.hxx toolkit/inc/awt/vclxprinter.hxx @@ -13688,6 +13687,7 @@ toolkit/inc/awt/vclxregion.hxx toolkit/inc/awt/vclxspinbutton.hxx toolkit/inc/awt/vclxsystemdependentwindow.hxx toolkit/inc/awt/vclxtabpagecontainer.hxx +toolkit/inc/awt/vclxtopwindow.hxx toolkit/inc/awt/vclxwindows.hxx toolkit/inc/controls/accessiblecontrolcontext.hxx toolkit/inc/controls/animatedimages.hxx diff --git a/include/toolkit/awt/vclxcontainer.hxx b/toolkit/inc/awt/vclxcontainer.hxx similarity index 95% rename from include/toolkit/awt/vclxcontainer.hxx rename to toolkit/inc/awt/vclxcontainer.hxx index f73cdf2c4495..9dffa8d116f0 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/toolkit/inc/awt/vclxcontainer.hxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX - +#pragma once #include #include @@ -27,9 +25,6 @@ #include - - - class VCLXContainer : public css::awt::XVclContainer, public css::awt::XVclContainerPeer, public VCLXWindow @@ -64,7 +59,4 @@ public: virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; - -#endif // INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/awt/vclxtabpagecontainer.hxx b/toolkit/inc/awt/vclxtabpagecontainer.hxx index 54fe0e0503aa..e300e03affcb 100644 --- a/toolkit/inc/awt/vclxtabpagecontainer.hxx +++ b/toolkit/inc/awt/vclxtabpagecontainer.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include typedef cppu::ImplInheritanceHelper< VCLXContainer, diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/toolkit/inc/awt/vclxtopwindow.hxx similarity index 98% rename from include/toolkit/awt/vclxtopwindow.hxx rename to toolkit/inc/awt/vclxtopwindow.hxx index ffa56b0f842d..e75c9ffa1ea9 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/toolkit/inc/awt/vclxtopwindow.hxx @@ -26,7 +26,7 @@ #include -#include +#include namespace com::sun::star::awt { class XMenuBar; } diff --git a/toolkit/inc/awt/vclxwindows.hxx b/toolkit/inc/awt/vclxwindows.hxx index e2ac38a147c4..a8959f4ed1ff 100644 --- a/toolkit/inc/awt/vclxwindows.hxx +++ b/toolkit/inc/awt/vclxwindows.hxx @@ -36,8 +36,8 @@ #include #include +#include #include -#include class FormatterBase; class TabControl; diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 44f0844f6965..932c31b38234 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include #include @@ -31,9 +31,6 @@ #include #include - - - void VCLXContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 0c1e539f8666..e503a4585906 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -76,9 +76,9 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index a500029eed0d..3a986a0f6d9e 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 067e99b8672d..ab7d28493c62 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -20,10 +20,10 @@ #include #include #include -#include #include -#include +#include #include +#include #include #include