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>
This commit is contained in:
Caolán McNamara
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 <com/sun/star/awt/XVclContainer.hpp>
|
||||
#include <com/sun/star/awt/XVclContainerPeer.hpp>
|
||||
@@ -27,9 +25,6 @@
|
||||
|
||||
#include <toolkit/awt/vclxwindow.hxx>
|
||||
|
||||
|
||||
|
||||
|
||||
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: */
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <com/sun/star/awt/tab/XTabPageContainer.hpp>
|
||||
#include <cppuhelper/implbase.hxx>
|
||||
#include <toolkit/helper/listenermultiplexer.hxx>
|
||||
#include <toolkit/awt/vclxcontainer.hxx>
|
||||
#include <awt/vclxcontainer.hxx>
|
||||
|
||||
|
||||
typedef cppu::ImplInheritanceHelper< VCLXContainer,
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include <cppuhelper/implbase2.hxx>
|
||||
|
||||
#include <toolkit/awt/vclxcontainer.hxx>
|
||||
#include <awt/vclxcontainer.hxx>
|
||||
|
||||
namespace com::sun::star::awt { class XMenuBar; }
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
#include <svl/numuno.hxx>
|
||||
#include <tools/lineend.hxx>
|
||||
|
||||
#include <awt/vclxtopwindow.hxx>
|
||||
#include <toolkit/awt/vclxwindows.hxx>
|
||||
#include <toolkit/awt/vclxtopwindow.hxx>
|
||||
|
||||
class FormatterBase;
|
||||
class TabControl;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#include <toolkit/awt/vclxcontainer.hxx>
|
||||
#include <awt/vclxcontainer.hxx>
|
||||
#include <toolkit/helper/macros.hxx>
|
||||
#include <toolkit/helper/vclunohelper.hxx>
|
||||
#include <cppuhelper/typeprovider.hxx>
|
||||
@@ -31,9 +31,6 @@
|
||||
#include <helper/scrollabledialog.hxx>
|
||||
#include <toolkit/helper/property.hxx>
|
||||
|
||||
|
||||
|
||||
|
||||
void VCLXContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
|
||||
{
|
||||
VCLXWindow::ImplGetPropertyIds( rIds );
|
||||
|
||||
@@ -76,9 +76,9 @@
|
||||
#include <awt/vclxsystemdependentwindow.hxx>
|
||||
#include <awt/vclxregion.hxx>
|
||||
#include <awt/vclxtabpagecontainer.hxx>
|
||||
#include <awt/vclxtopwindow.hxx>
|
||||
|
||||
#include <awt/animatedimagespeer.hxx>
|
||||
#include <toolkit/awt/vclxtopwindow.hxx>
|
||||
#include <toolkit/awt/vclxwindow.hxx>
|
||||
#include <toolkit/helper/vclunohelper.hxx>
|
||||
#include <toolkit/helper/property.hxx>
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <vcl/sysdata.hxx>
|
||||
#include <comphelper/sequence.hxx>
|
||||
|
||||
#include <toolkit/awt/vclxtopwindow.hxx>
|
||||
#include <awt/vclxtopwindow.hxx>
|
||||
#include <toolkit/awt/vclxmenu.hxx>
|
||||
|
||||
#include <vcl/wrkwin.hxx>
|
||||
|
||||
@@ -20,10 +20,10 @@
|
||||
#include <toolkit/helper/vclunohelper.hxx>
|
||||
#include <toolkit/awt/vclxwindow.hxx>
|
||||
#include <toolkit/awt/vclxwindows.hxx>
|
||||
#include <toolkit/awt/vclxcontainer.hxx>
|
||||
#include <toolkit/awt/vclxmenu.hxx>
|
||||
#include <toolkit/awt/vclxtopwindow.hxx>
|
||||
#include <awt/vclxcontainer.hxx>
|
||||
#include <awt/vclxgraphics.hxx>
|
||||
#include <awt/vclxtopwindow.hxx>
|
||||
#include <awt/vclxwindows.hxx>
|
||||
|
||||
#include <toolkit/dllapi.h>
|
||||
|
||||
Reference in New Issue
Block a user