diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-04-11 19:34:11 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-12 09:46:46 +0200 |
commit | 49481b842ccc35ef2000df0ee659ff17ab39edb9 (patch) | |
tree | fbd9159679816f7fcbb00197899d27ecc097f8de /include | |
parent | 7a762ad0c69011b1e77098395e171393046330ed (diff) |
vclxtopwindow.hxx and vclxcontainer.hxx can now be private headers
Change-Id: If6d56c9f2fcaf47e1756e8645098ad86987c8b64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113958
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/IwyuFilter_include.yaml | 4 | ||||
-rw-r--r-- | include/toolkit/awt/vclxcontainer.hxx | 70 | ||||
-rw-r--r-- | include/toolkit/awt/vclxtopwindow.hxx | 78 |
3 files changed, 0 insertions, 152 deletions
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/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx deleted file mode 100644 index f73cdf2c4495..000000000000 --- a/include/toolkit/awt/vclxcontainer.hxx +++ /dev/null @@ -1,70 +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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX - - -#include <com/sun/star/awt/XVclContainer.hpp> -#include <com/sun/star/awt/XVclContainerPeer.hpp> -#include <cppuhelper/weak.hxx> - -#include <toolkit/awt/vclxwindow.hxx> - - - - -class VCLXContainer : public css::awt::XVclContainer, - public css::awt::XVclContainerPeer, - public VCLXWindow -{ -public: - VCLXContainer(); - virtual ~VCLXContainer() override; - - // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } - - // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - - // css::awt::XVclContainer - void SAL_CALL addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) override; - void SAL_CALL removeVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) override; - css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > SAL_CALL getWindows( ) override; - - // css::awt::XVclContainerPeer - void SAL_CALL enableDialogControl( sal_Bool bEnable ) override; - void SAL_CALL setTabOrder( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& WindowOrder, const css::uno::Sequence< css::uno::Any >& Tabs, sal_Bool GroupControl ) override; - void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Windows ) override; - - // css::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; - - static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); - 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/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx deleted file mode 100644 index ffa56b0f842d..000000000000 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ /dev/null @@ -1,78 +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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX - -#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> -#include <com/sun/star/awt/XTopWindow2.hpp> -#include <cppuhelper/weak.hxx> - -#include <cppuhelper/implbase2.hxx> - -#include <toolkit/awt/vclxcontainer.hxx> - -namespace com::sun::star::awt { class XMenuBar; } - -typedef ::cppu::ImplHelper2 < css::awt::XTopWindow2, css::awt::XSystemDependentWindowPeer - > VCLXTopWindow_XBase; - - -class VCLXTopWindow: public VCLXTopWindow_XBase, - public VCLXContainer -{ -public: - VCLXTopWindow(); - virtual ~VCLXTopWindow() override; - - // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } - - // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - - // css::awt::XSystemDependentWindowPeer - css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override; - - // css::awt::XTopWindow - void SAL_CALL addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) override; - void SAL_CALL removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) override; - void SAL_CALL toFront() override; - void SAL_CALL toBack() override; - void SAL_CALL setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& xMenu ) override; - - // XTopWindow2 - virtual sal_Bool SAL_CALL getIsMaximized() override; - virtual void SAL_CALL setIsMaximized( sal_Bool _ismaximized ) override; - virtual sal_Bool SAL_CALL getIsMinimized() override; - virtual void SAL_CALL setIsMinimized( sal_Bool _isminimized ) override; - virtual ::sal_Int32 SAL_CALL getDisplay() override; - virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) override; - - static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } -}; - - -#endif // INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |