Kaydet (Commit) cec7ae9f authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Miklos Vajna

tdf#42949 Fix IWYU warnings in include/toolkit/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Icebcf1a6ab073dce935a74ce79ee0f302b62e8a8
Reviewed-on: https://gerrit.libreoffice.org/65947
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst e69c7cc4
......@@ -23,6 +23,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblestatesethelper.hxx>
......
......@@ -25,6 +25,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
......
......@@ -34,6 +34,7 @@
#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/window.hxx>
#include <canvas/canvastools.hxx>
......
......@@ -24,6 +24,7 @@
#include <svx/ShapeTypeHandler.hxx>
#include <svx/AccessibleShape.hxx>
#include <svx/AccessibleShapeInfo.hxx>
#include <vcl/window.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
......
......@@ -52,6 +52,7 @@
#include <com/sun/star/awt/VisualEffect.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
......
......@@ -28,6 +28,7 @@
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/processfactory.hxx>
......
......@@ -70,6 +70,7 @@ namespace svt
}
namespace vcl { class Window; }
namespace weld {class Window; }
class ToolBox;
namespace vcl { class Font; }
class SvNumberFormatter;
......
......@@ -123,6 +123,7 @@
#include <svtools/accessibilityoptions.hxx>
#include <svtools/apearcfg.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/window.hxx>
#include "langselect.hxx"
......
......@@ -36,6 +36,7 @@
#include <tools/diagnose_ex.h>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <algorithm>
......
......@@ -36,6 +36,7 @@
#include <com/sun/star/inspection/PropertyControlType.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/util/VetoException.hpp>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/types.hxx>
......
......@@ -48,6 +48,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <unotools/streamhelper.hxx>
#include <comphelper/guarding.hxx>
#include <comphelper/property.hxx>
......
......@@ -287,3 +287,143 @@ blacklist:
# base class has to be a complete type
- com/sun/star/accessibility/XAccessibleRelationSet.hpp
- com/sun/star/accessibility/XAccessible.hpp
include/toolkit/awt/vclxaccessiblecomponent.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
include/toolkit/awt/animatedimagespeer.hxx:
# base class has to be a complete type
- com/sun/star/awt/XAnimation.hpp
- com/sun/star/container/XContainerListener.hpp
- com/sun/star/util/XModifyListener.hpp
- toolkit/awt/vclxwindow.hxx
include/toolkit/awt/vclxpointer.hxx:
# base class has to be a complete type
- com/sun/star/awt/XPointer.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XUnoTunnel.hpp
include/toolkit/awt/vclxspinbutton.hxx:
# base class has to be a complete type
- com/sun/star/awt/XSpinValue.hpp
include/toolkit/awt/vclxprinter.hxx:
# base class has to be a complete type
- com/sun/star/awt/XPrinterPropertySet.hpp
- com/sun/star/awt/XInfoPrinter.hpp
- com/sun/star/awt/XPrinterPropertySet.hpp
- com/sun/star/awt/XPrinterServer.hpp
- 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/vclxtabpagecontainer.hxx:
# base class has to be a complete type
- com/sun/star/awt/tab/XTabPageContainer.hpp
- com/sun/star/container/XContainerListener.hpp
- toolkit/awt/vclxcontainer.hxx
include/toolkit/awt/vclxwindow.hxx:
# base class has to be a complete type
- toolkit/awt/vclxdevice.hxx
- com/sun/star/awt/XWindow2.hpp
- com/sun/star/awt/XVclWindowPeer.hpp
- com/sun/star/awt/XLayoutConstrains.hpp
- com/sun/star/awt/XView.hpp
- com/sun/star/beans/XPropertySetInfo.hpp
- com/sun/star/accessibility/XAccessible.hpp
- com/sun/star/awt/XDockableWindow.hpp
- com/sun/star/awt/XStyleSettingsSupplier.hpp
include/toolkit/awt/vclxwindows.hxx:
# base class has to be a complete type
- com/sun/star/awt/XListBox.hpp
- com/sun/star/awt/XToggleButton.hpp
- com/sun/star/awt/XComboBox.hpp
- com/sun/star/awt/XItemListListener.hpp
include/toolkit/controls/accessiblecontrolcontext.hxx:
# base class has to be a complete type
- com/sun/star/lang/XEventListener.hpp
include/toolkit/controls/animatedimages.hxx:
# base class has to be a complete type
- com/sun/star/awt/XAnimatedImages.hpp
- toolkit/controls/unocontrolmodel.hxx
include/toolkit/controls/controlmodelcontainerbase.hxx:
# base class has to be a complete type
- com/sun/star/awt/tab/XTabPageModel.hpp
- com/sun/star/awt/XTabControllerModel.hpp
- com/sun/star/beans/XPropertyChangeListener.hpp
- com/sun/star/container/XContainer.hpp
- com/sun/star/container/XNameContainer.hpp
- com/sun/star/lang/XInitialization.hpp
- com/sun/star/lang/XMultiServiceFactory.hpp
- com/sun/star/util/XChangesListener.hpp
- com/sun/star/util/XChangesNotifier.hpp
- toolkit/controls/unocontrolcontainer.hxx
include/toolkit/controls/dialogcontrol.hxx:
# base class has to be a complete type
- com/sun/star/awt/UnoControlDialog.hpp
include/toolkit/controls/eventcontainer.hxx:
# base class has to be a complete type
- com/sun/star/container/XContainer.hpp
- com/sun/star/container/XNameContainer.hpp
include/toolkit/controls/geometrycontrolmodel.hxx:
# base class has to be a complete type
- com/sun/star/script/XScriptEventsSupplier.hpp
- com/sun/star/util/XCloneable.hpp
# Needed for template classes
- toolkit/controls/geometrycontrolmodel_impl.hxx
include/toolkit/controls/roadmapcontrol.hxx:
# base class has to be a complete type
- com/sun/star/awt/XItemEventBroadcaster.hpp
- com/sun/star/awt/XItemListener.hpp
- com/sun/star/beans/XPropertyChangeListener.hpp
- com/sun/star/container/XContainerListener.hpp
include/toolkit/controls/roadmapentry.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
include/toolkit/controls/tabpagecontainer.hxx:
# base class has to be a complete type
- com/sun/star/awt/tab/XTabPageContainer.hpp
- toolkit/controls/controlmodelcontainerbase.hxx
include/toolkit/controls/tabpagemodel.hxx:
# base class has to be a complete type
- com/sun/star/awt/tab/XTabPage.hpp
- toolkit/controls/unocontrolcontainer.hxx
include/toolkit/controls/unocontrol.hxx:
# base class has to be a complete type
- com/sun/star/awt/XControl.hpp
- com/sun/star/awt/XWindow2.hpp
- com/sun/star/awt/XView.hpp
- com/sun/star/beans/XPropertiesChangeListener.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/awt/XUnitConversion.hpp
- com/sun/star/awt/XStyleSettingsSupplier.hpp
- com/sun/star/accessibility/XAccessible.hpp
- com/sun/star/util/XModeChangeBroadcaster.hpp
include/toolkit/controls/unocontrolcontainer.hxx:
# base class has to be a complete type
- com/sun/star/awt/XControlContainer.hpp
- com/sun/star/awt/XUnoControlContainer.hpp
- com/sun/star/container/XContainer.hpp
- com/sun/star/container/XIdentifierContainer.hpp
- toolkit/controls/unocontrolbase.hxx
include/toolkit/controls/unocontrolmodel.hxx:
# base class has to be a complete type
- com/sun/star/awt/XControlModel.hpp
- com/sun/star/lang/XComponent.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/beans/XPropertyState.hpp
- com/sun/star/io/XPersistObject.hpp
- com/sun/star/lang/XUnoTunnel.hpp
- com/sun/star/util/XCloneable.hpp
include/toolkit/controls/unocontrols.hxx:
# base class has to be a complete type
- com/sun/star/awt/XTextComponent.hpp
- com/sun/star/awt/XTextListener.hpp
- com/sun/star/awt/XTextLayoutConstrains.hpp
- com/sun/star/awt/XButton.hpp
- com/sun/star/awt/XToggleButton.hpp
- com/sun/star/awt/XRadioButton.hpp
- com/sun/star/awt/XCheckBox.hpp
- com/sun/star/awt/XListBox.hpp
- com/sun/star/awt/XItemList.hpp
include/toolkit/helper/macros.hxx:
# Needed for macros
- comphelper/servicehelper.hxx
......@@ -23,6 +23,7 @@
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
......
......@@ -21,6 +21,7 @@
#define INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
#include <toolkit/awt/vclxwindow.hxx>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/awt/XAnimation.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
......
......@@ -21,11 +21,6 @@
#define INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/accimplaccess.hxx>
......@@ -35,9 +30,10 @@
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
namespace vcl { class Window; }
class VCLXWindow;
class VclSimpleEvent;
class VclWindowEvent;
namespace utl {
......
......@@ -23,7 +23,6 @@
#include <com/sun/star/awt/XVclContainer.hpp>
#include <com/sun/star/awt/XVclContainerPeer.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weak.hxx>
#include <toolkit/awt/vclxwindow.hxx>
......
......@@ -30,9 +30,6 @@
#include <com/sun/star/awt/XUnitConversion.hpp>
class OutputDevice;
class VirtualDevice;
/// An UNO wrapper for the VCL OutputDevice
class TOOLKIT_DLLPUBLIC VCLXDevice :
public css::awt::XDevice,
......
......@@ -23,12 +23,15 @@
#include <memory>
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XFont2.hpp>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
#include <vcl/metric.hxx>
#include <vcl/font.hxx>
namespace com { namespace sun { namespace star { namespace awt { class XDevice; } } } }
class FontMetric;
// class VCLXFont
......
......@@ -22,7 +22,6 @@
#include <com/sun/star/awt/XGraphics2.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/weak.hxx>
......@@ -36,6 +35,7 @@
class OutputDevice;
namespace vcl { class Region; }
namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
enum class InitOutDevFlags
......
......@@ -39,7 +39,6 @@
class Menu;
class MenuBar;
class VclSimpleEvent;
class PopupMenu;
class VclMenuEvent;
......
......@@ -22,19 +22,20 @@
#include <com/sun/star/awt/XPrinterPropertySet.hpp>
#include <com/sun/star/awt/XPrinter.hpp>
#include <com/sun/star/awt/XPrinterServer.hpp>
#include <com/sun/star/awt/XInfoPrinter.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weak.hxx>
#include <toolkit/helper/mutexandbroadcasthelper.hxx>
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/jobset.hxx>
#include <vcl/oldprintadaptor.hxx>
namespace com { namespace sun { namespace star { namespace awt { class XPrinter; } } } }
namespace vcl { class OldStylePrintAdaptor; }
class Printer;
// relevant properties for the printer:
/*
......
......@@ -22,7 +22,6 @@
#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weak.hxx>
#include <toolkit/awt/vclxwindow.hxx>
......
......@@ -20,14 +20,7 @@
#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
#include <toolkit/dllapi.h>
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <toolkit/awt/vclxwindow.hxx>
#include <com/sun/star/awt/tab/XTabPageContainer.hpp>
#include <cppuhelper/implbase.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
......
......@@ -22,13 +22,14 @@
#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
#include <com/sun/star/awt/XTopWindow2.hpp>
#include <com/sun/star/awt/XMenuBar.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase1.hxx>
#include <toolkit/awt/vclxcontainer.hxx>
namespace com { namespace sun { namespace star { namespace awt { class XMenuBar; } } } }
typedef ::cppu::ImplHelper1 < css::awt::XTopWindow2
> VCLXTopWindow_XBase;
typedef ::cppu::ImplHelper1 < css::awt::XSystemDependentWindowPeer
......
......@@ -22,36 +22,30 @@
#include <toolkit/dllapi.h>
#include <toolkit/awt/vclxdevice.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
#include <vcl/window.hxx>
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/awt/XLayoutConstrains.hpp>
#include <com/sun/star/awt/XView.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/awt/XDockableWindow.hpp>
#include <com/sun/star/awt/XStyleSettingsSupplier.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <stdarg.h>
#include <memory>
#include <vector>
#include <functional>
namespace comphelper { class OInterfaceContainerHelper2; }
namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } }
class VclSimpleEvent;
class VclWindowEvent;
struct SystemParentData;
namespace toolkit
{
......
......@@ -22,49 +22,20 @@
#include <toolkit/dllapi.h>
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <com/sun/star/beans/XVetoableChangeListener.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/PropertyStateChangeEvent.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/awt/XFileDialog.hpp>
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/awt/XListBox.hpp>
#include <com/sun/star/awt/XProgressMonitor.hpp>
#include <com/sun/star/awt/TextAlign.hpp>
#include <com/sun/star/awt/XScrollBar.hpp>
#include <com/sun/star/awt/XVclContainerPeer.hpp>
#include <com/sun/star/awt/XTabControllerModel.hpp>
#include <com/sun/star/awt/XMessageBox.hpp>
#include <com/sun/star/awt/XTextEditField.hpp>
#include <com/sun/star/awt/Style.hpp>
#include <com/sun/star/awt/XTimeField.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/awt/XSpinField.hpp>
#include <com/sun/star/awt/XUnoControlContainer.hpp>
#include <com/sun/star/awt/XTextLayoutConstrains.hpp>
#include <com/sun/star/awt/XNumericField.hpp>
#include <com/sun/star/awt/XMetricField.hpp>
#include <com/sun/star/awt/XButton.hpp>
#include <com/sun/star/awt/XToggleButton.hpp>
#include <com/sun/star/awt/XPointer.hpp>
#include <com/sun/star/awt/XTextArea.hpp>
#include <com/sun/star/awt/XImageButton.hpp>
#include <com/sun/star/awt/XFixedHyperlink.hpp>
#include <com/sun/star/awt/XFixedText.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/awt/XDialog2.hpp>
#include <com/sun/star/awt/XRadioButton.hpp>
#include <com/sun/star/awt/XCurrencyField.hpp>
......@@ -73,7 +44,6 @@
#include <com/sun/star/awt/XComboBox.hpp>
#include <com/sun/star/awt/XCheckBox.hpp>
#include <com/sun/star/awt/XItemListListener.hpp>
#include <com/sun/star/awt/XImageConsumer.hpp>
#include <com/sun/star/awt/XSimpleTabController.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/Date.hpp>
......@@ -82,24 +52,13 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/awt/vclxtopwindow.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
#include <vcl/pointr.hxx>
#include <vcl/image.hxx>
#include <vcl/tabctrl.hxx>
class Button;
class CheckBox;
class RadioButton;
class ListBox;
class ScrollBar;
class Edit;
class Menu;
class ComboBox;
class FormatterBase;
class SpinField;
class ToolBox;
class VclSimpleEvent;
class VclMenuEvent;
class TabControl;
class TabPage;
// class VCLXGraphicControl
......
......@@ -24,11 +24,12 @@
#include <comphelper/accimplaccess.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <vcl/vclptr.hxx>
namespace vcl { class Window; }
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
namespace toolkit
{
......
......@@ -20,14 +20,14 @@
#ifndef INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
#define INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
#include <toolkit/controls/unocontrolbase.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
#include <com/sun/star/awt/XAnimatedImages.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase1.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace container { class XContainerListener; } } } }
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace toolkit
{
......
......@@ -28,7 +28,6 @@
#include <com/sun/star/util/XChangesListener.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/resource/XStringResourceResolver.hpp>
#include <cppuhelper/implbase8.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/weak.hxx>
......@@ -37,13 +36,13 @@
#include <toolkit/controls/unocontrolcontainer.hxx>
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/awt/tab/XTabPageModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <tools/gen.hxx>
#include <vector>
namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } }
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
// class ControlModelContainerBase
typedef UnoControlModel ControlModel_Base;
......
......@@ -22,17 +22,11 @@
#include <toolkit/controls/controlmodelcontainerbase.hxx>
#include <com/sun/star/awt/UnoControlDialog.hpp>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/awt/XDialog2.hpp>
#include <com/sun/star/awt/XSimpleTabController.hpp>
#include <com/sun/star/graphic/XGraphicObject.hpp>
#include <toolkit/helper/servicenames.hxx>
#include <toolkit/helper/macros.hxx>
#include <toolkit/controls/unocontrolcontainer.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <list>
namespace com { namespace sun { namespace star { namespace awt { class XTopWindowListener; } } } }
typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase
, css::awt::XUnoControlDialog
......
......@@ -20,7 +20,6 @@
#ifndef INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
#define INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
#include <osl/diagnose.h>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XContainer.hpp>
......
......@@ -22,9 +22,8 @@
#include <toolkit/controls/unocontrols.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
#include <com/sun/star/util/XNumberFormatter.hpp>
namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } }
namespace toolkit
......
......@@ -24,21 +24,14 @@
#include <comphelper/propagg.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <cppuhelper/weakagg.hxx>
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
#include <com/sun/star/resource/XStringResourceResolver.hpp>
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/IdPropArrayHelper.hxx>
namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } }
namespace com { namespace sun { namespace star {
namespace lang {
class XMultiServiceFactory;
}
namespace script {
class XNameContainer;
}
namespace uno {
class XComponentContext;
}
......
......@@ -23,8 +23,6 @@
#include <toolkit/controls/unocontrols.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
#include <toolkit/controls/roadmapentry.hxx>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
......
......@@ -23,15 +23,15 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/awt/XTabController.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weakagg.hxx>
#include <osl/mutex.hxx>
#include <toolkit/helper/macros.hxx>
#include <toolkit/helper/servicenames.hxx>
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
namespace com { namespace sun { namespace star { namespace awt { class XControl; } } } }
namespace com { namespace sun { namespace star { namespace awt { class XControlContainer; } } } }
class StdTabController final : public css::awt::XTabController,
public css::lang::XServiceInfo,
public css::lang::XTypeProvider,
......
......@@ -24,15 +24,10 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/io/XPersistObject.hpp>
#include <com/sun/star/awt/XTabControllerModel.hpp>
#include <com/sun/star/awt/XWindow.hpp>