diff options
Diffstat (limited to 'toolkit/source')
48 files changed, 15 insertions, 182 deletions
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 0813a5fb10c7..93eff62f1fe5 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -20,8 +20,6 @@ #include <sal/config.h> #include <vcl/svapp.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 89dded29bb9d..136832dce5bf 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -24,8 +24,8 @@ #include <com/sun/star/lang/DisposedException.hpp> -#include <cppuhelper/interfacecontainer.hxx> #include <comphelper/interfacecontainer2.hxx> +#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <vcl/event.hxx> #include <vcl/window.hxx> diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index d821a4c44f80..347f2f87c0e6 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#include <com/sun/star/accessibility/XAccessibleEventListener.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index b04bc46aa8aa..4155027dbc77 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -19,10 +19,8 @@ #include <toolkit/awt/vclxbitmap.hxx> #include <toolkit/helper/macros.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <tools/stream.hxx> -#include <rtl/uuid.h> #include <vcl/dibtools.hxx> #include <vcl/BitmapTools.hxx> diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index a61b58b7c8b4..4aeaf48791ed 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -23,7 +23,6 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <rtl/uuid.h> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index afa2e3483717..2cd53e927b54 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -27,18 +27,14 @@ #include <toolkit/awt/vclxbitmap.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/macros.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <rtl/uuid.h> - #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> #include <vcl/print.hxx> #include <vcl/virdev.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/font.hxx> #include <vcl/metric.hxx> // class VCLXDevice diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 2ef43db70a15..057a3c610c8b 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -18,15 +18,11 @@ */ #include <memory> -#include <string.h> #include <toolkit/awt/vclxfont.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/macros.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <rtl/uuid.h> -#include <rtl/ustring.h> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index f8cd331f668f..c5a27d244538 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -21,12 +21,9 @@ #include <memory> #include <toolkit/awt/vclxgraphics.hxx> #include <toolkit/awt/vclxdevice.hxx> -#include <toolkit/awt/vclxfont.hxx> #include <toolkit/helper/macros.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <rtl/uuid.h> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 52ee47d42ac2..b970df47c2e0 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -26,14 +26,12 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> -#include <rtl/uuid.h> #include <osl/mutex.hxx> #include <tools/debug.hxx> #include <vcl/graph.hxx> #include <vcl/menu.hxx> #include <vcl/keycod.hxx> #include <vcl/image.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index bcc9c2d20a9c..e18925f7013d 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -19,10 +19,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <toolkit/awt/vclxprinter.hxx> -#include <toolkit/helper/macros.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <rtl/uuid.h> #include <vcl/print.hxx> diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 18ef02fb48de..fa24e203d0a8 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -21,10 +21,7 @@ #include <toolkit/helper/macros.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <rtl/uuid.h> -#include <vcl/svapp.hxx> // class VCLXRegion diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 25ff686c5466..81e6e9b51232 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -25,9 +25,7 @@ #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <vcl/svapp.hxx> -#include <toolkit/helper/property.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <cppuhelper/typeprovider.hxx> #include <helper/tkresmgr.hxx> diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 7bd8d963ca9e..0e5d471095f7 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <stdio.h> #ifdef _WIN32 #include <prewin.h> #include <postwin.h> @@ -44,22 +43,17 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/XToolkitExperimental.hpp> #include <com/sun/star/awt/XToolkitRobot.hpp> -#include <com/sun/star/awt/XMessageBoxFactory.hpp> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <osl/conditn.hxx> #include <osl/module.h> #include <osl/thread.hxx> #include <osl/mutex.hxx> -#include <rtl/uuid.h> #include <rtl/process.h> #include <sal/log.hxx> #include <tools/link.hxx> -#include <tools/fract.hxx> #include <tools/wintypes.hxx> #ifdef MACOSX @@ -82,11 +76,8 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> -#include <toolkit/helper/macros.hxx> #include <toolkit/helper/convert.hxx> -#include <vcl/unohelp.hxx> #include <vcl/button.hxx> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 9eb5ea5f7853..f612851a8236 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -29,14 +29,11 @@ #include <postmac.h> #endif -#include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> -#include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> #include <toolkit/awt/vclxtopwindow.hxx> #include <toolkit/awt/vclxmenu.hxx> -#include <toolkit/helper/macros.hxx> #include <vcl/wrkwin.hxx> #include <vcl/syswin.hxx> diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 38a30298a656..7e9478ed3121 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -22,13 +22,9 @@ #include <memory> #include <com/sun/star/awt/WindowEvent.hpp> #include <com/sun/star/awt/KeyEvent.hpp> -#include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/MouseEvent.hpp> -#include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/MouseWheelBehavior.hpp> -#include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/Style.hpp> -#include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/awt/DockingEvent.hpp> #include <com/sun/star/awt/EndDockingEvent.hpp> #include <com/sun/star/awt/EndPopupModeEvent.hpp> @@ -39,13 +35,9 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/awt/vclxpointer.hxx> #include <toolkit/awt/vclxwindows.hxx> -#include <toolkit/helper/macros.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/property.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <rtl/uuid.h> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -56,10 +48,9 @@ #include <vcl/dockwin.hxx> #include <vcl/pdfextoutdevdata.hxx> #include <vcl/tabpage.hxx> -#include <vcl/button.hxx> +#include <vcl/ctrl.hxx> #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> -#include <comphelper/asyncnotification.hxx> #include <comphelper/flagguard.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/profilezone.hxx> diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 46825604bd2d..5d327f6b13d3 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -18,7 +18,7 @@ */ #include <toolkit/awt/vclxwindows.hxx> -#include <helper/scrollabledialog.hxx> +#include <toolkit/helper/accessiblefactory.hxx> #include <com/sun/star/awt/ScrollBarOrientation.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> @@ -30,14 +30,12 @@ #include <cppuhelper/queryinterface.hxx> #include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <com/sun/star/awt/ImageScaleMode.hpp> #include <com/sun/star/awt/XItemList.hpp> #include <com/sun/star/awt/TextAlign.hpp> -#include <comphelper/interfacecontainer2.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <sal/log.hxx> @@ -51,7 +49,6 @@ #include <vcl/longcurr.hxx> #include <vcl/imgctrl.hxx> #include <vcl/dialog.hxx> -#include <vcl/msgbox.hxx> #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> #include <vcl/tabpage.hxx> @@ -59,7 +56,6 @@ #include <vcl/settings.hxx> #include <tools/diagnose_ex.h> -#include <helper/accessibilityclient.hxx> #include <helper/imagealign.hxx> #include <helper/msgbox.hxx> #include <helper/tkresmgr.hxx> diff --git a/toolkit/source/awt/vclxwindows_internal.hxx b/toolkit/source/awt/vclxwindows_internal.hxx index 91b6fae9e228..9f4243e07ae9 100644 --- a/toolkit/source/awt/vclxwindows_internal.hxx +++ b/toolkit/source/awt/vclxwindows_internal.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX #define INCLUDED_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX +#include <vcl/window.hxx> + namespace toolkit { void setButtonLikeFaceColor( vcl::Window* _pWindow, const css::uno::Any& _rColorValue ); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index efbd432b5718..140d9c103db6 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -20,10 +20,9 @@ #include <toolkit/controls/controlmodelcontainerbase.hxx> #include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <vcl/wall.hxx> #include <osl/mutex.hxx> #include <toolkit/helper/property.hxx> +#include <toolkit/helper/servicenames.hxx> #include <toolkit/controls/geometrycontrolmodel.hxx> #include <toolkit/controls/unocontrols.hxx> #include <toolkit/controls/formattedcontrol.hxx> @@ -32,11 +31,8 @@ #include <toolkit/controls/tabpagemodel.hxx> #include <toolkit/controls/stdtabcontroller.hxx> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> @@ -45,9 +41,6 @@ #include <vcl/outdev.hxx> #include <comphelper/types.hxx> -#include <vcl/graph.hxx> -#include <vcl/image.hxx> - #include "tree/treecontrol.hxx" #include "grid/gridcontrol.hxx" #include <toolkit/controls/tabpagecontainer.hxx> @@ -59,7 +52,6 @@ #include <sal/log.hxx> #include <toolkit/controls/dialogcontrol.hxx> -#include <helper/tkresmgr.hxx> #include <helper/unopropertyarrayhelper.hxx> #include "controlmodelcontainerbase_internal.hxx" diff --git a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx index 09e1a1aebf2f..2a70aaa9d2ad 100644 --- a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx +++ b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX #define INCLUDED_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX +#include <com/sun/star/uno/Any.hxx> + ////HELPER OUString getPhysicalLocation( const css::uno::Any& rbase, const css::uno::Any& rUrl ); diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index fa5a4a17efaa..d260dce6ad7c 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -19,36 +19,25 @@ #include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <vcl/wall.hxx> #include <osl/mutex.hxx> #include <toolkit/controls/dialogcontrol.hxx> #include <toolkit/controls/geometrycontrolmodel.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/servicenames.hxx> -#include <toolkit/controls/stdtabcontroller.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> -#include <cppuhelper/weakagg.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> #include <comphelper/sequence.hxx> #include <vcl/outdev.hxx> -#include <vcl/graph.hxx> #include <vcl/image.hxx> #include <cppuhelper/implbase.hxx> -#include <algorithm> -#include <functional> -#include <map> #include <unordered_map> -#include <osl/file.hxx> #include <vcl/tabctrl.hxx> #include <toolkit/awt/vclxwindows.hxx> diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index 8873c638ad0a..24b832020bbb 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cppuhelper/queryinterface.hxx> -#include <cppuhelper/weak.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <toolkit/controls/eventcontainer.hxx> #include <com/sun/star/script/ScriptEventDescriptor.hpp> diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index f47283a0b9e2..a40856f16179 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -18,7 +18,6 @@ */ #include <toolkit/controls/geometrycontrolmodel.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <osl/diagnose.h> diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index bbaf3502e3bf..d880b62a3df8 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -20,7 +20,6 @@ #include "gridcolumn.hxx" -#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/awt/grid/XGridColumnModel.hpp> #include <com/sun/star/awt/grid/XGridColumn.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> @@ -34,6 +33,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> +#include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index b2c13aac6b4a..e29315ddd79c 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/awt/grid/XMutableGridDataModel.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -26,12 +27,8 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <toolkit/helper/servicenames.hxx> -#include <tools/diagnose_ex.h> -#include <toolkit/helper/mutexandbroadcasthelper.hxx> #include <algorithm> -#include <functional> #include <vector> using namespace ::com::sun::star; diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index 4986fb164b8c..077a491e5295 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -21,7 +21,6 @@ #define INCLUDED_TOOLKIT_SOURCE_CONTROLS_GRID_GRIDCOLUMN_HXX #include <com/sun/star/awt/grid/XGridColumn.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/style/HorizontalAlignment.hpp> @@ -29,10 +28,6 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <comphelper/componentguard.hxx> -#include <rtl/ref.hxx> -#include <toolkit/helper/mutexandbroadcasthelper.hxx> - -#include <vector> namespace toolkit { diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 88335b4d5baf..f8e0a8b8a5d8 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/awt/grid/DefaultGridColumnModel.hpp> #include <toolkit/helper/property.hxx> #include <tools/diagnose_ex.h> -#include <tools/color.hxx> #include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/helper/listenermultiplexer.hxx> diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index e0dc8ba4fcd7..c5a7459f6b31 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -25,7 +25,6 @@ #include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/controls/unocontrolmodel.hxx> -#include <toolkit/helper/servicenames.hxx> #include <cppuhelper/implbase.hxx> #include <toolkit/helper/listenermultiplexer.hxx> diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx index 50a3fd4501da..713b54d04ee5 100644 --- a/toolkit/source/controls/grid/grideventforwarder.hxx +++ b/toolkit/source/controls/grid/grideventforwarder.hxx @@ -21,7 +21,6 @@ #define INCLUDED_TOOLKIT_SOURCE_CONTROLS_GRID_GRIDEVENTFORWARDER_HXX #include <com/sun/star/awt/grid/XGridDataListener.hpp> -#include <com/sun/star/awt/grid/XGridColumnListener.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <cppuhelper/implbase2.hxx> diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 44204b35458b..6219cc5c06b5 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -36,7 +36,6 @@ #include <comphelper/anycompare.hxx> #include <comphelper/componentguard.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <tools/diagnose_ex.h> #include <i18nlangtag/languagetag.hxx> #include <vcl/svapp.hxx> diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 427d2fb1bf87..0c09f75ab428 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -22,7 +22,6 @@ #include <toolkit/controls/roadmapentry.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/servicenames.hxx> -#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index 00bd78f45c5d..af06ad1820c5 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/uno/XComponentContext.hpp> -#include <rtl/ustrbuf.hxx> #include <toolkit/controls/animatedimages.hxx> #include <tools/diagnose_ex.h> #include <vcl/toolkit/throbber.hxx> diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 3eba0ee86288..b989f3f5a8e5 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -23,14 +23,11 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <toolkit/controls/stdtabcontroller.hxx> -#include <toolkit/controls/stdtabcontrollermodel.hxx> #include <toolkit/helper/servicenames.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <rtl/uuid.h> #include <sal/log.hxx> #include <tools/debug.hxx> diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index f21720854035..a6866aed9977 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -23,11 +23,8 @@ #include <toolkit/controls/stdtabcontrollermodel.hxx> #include <toolkit/helper/macros.hxx> #include <toolkit/helper/servicenames.hxx> -#include <toolkit/helper/property.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <rtl/uuid.h> #include <tools/debug.hxx> diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 2a67e44e756b..b424b5757b9e 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -24,9 +24,7 @@ #include <toolkit/helper/property.hxx> #include <com/sun/star/awt/XControlModel.hpp> -#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <tools/diagnose_ex.h> diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 27e2f3342c94..34849170bd14 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -20,26 +20,17 @@ #include <toolkit/controls/tabpagemodel.hxx> #include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <vcl/wall.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/controls/stdtabcontroller.hxx> #include <com/sun/star/awt/UnoControlDialogModelProvider.hpp> #include <com/sun/star/awt/tab/XTabPage.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> #include <vcl/outdev.hxx> -#include <vcl/graph.hxx> -#include <vcl/image.hxx> -#include <toolkit/controls/geometrycontrolmodel.hxx> #include <toolkit/controls/controlmodelcontainerbase.hxx> #include <toolkit/controls/unocontrolcontainer.hxx> -#include <cppuhelper/basemutex.hxx> #include <helper/unopropertyarrayhelper.hxx> diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index 25702fd45886..22bbf0c77407 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -24,10 +24,8 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase2.hxx> -#include <cppuhelper/typeprovider.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/controls/unocontrolbase.hxx> -#include <toolkit/helper/macros.hxx> #include <toolkit/helper/property.hxx> #include <helper/unopropertyarrayhelper.hxx> diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 3d374bfadacd..11c758473cad 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -24,12 +24,12 @@ #include <com/sun/star/awt/tree/XTreeDataModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/view/SelectionType.hpp> +#include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/helper/property.hxx> #include <osl/diagnose.h> #include <cppuhelper/implbase.hxx> #include <helper/unopropertyarrayhelper.hxx> -#include <tools/diagnose_ex.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index 0d7dc6a066cc..d05809d7fead 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_TOOLKIT_SOURCE_CONTROLS_TREE_TREECONTROL_HXX #define INCLUDED_TOOLKIT_SOURCE_CONTROLS_TREE_TREECONTROL_HXX -#include <toolkit/controls/unocontrols.hxx> #include <toolkit/controls/unocontrolmodel.hxx> -#include <toolkit/helper/servicenames.hxx> -#include <toolkit/helper/listenermultiplexer.hxx> namespace toolkit { diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 822b22b4d50e..c4fa7c6e34f3 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -21,13 +21,11 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> #include <toolkit/helper/mutexandbroadcasthelper.hxx> -#include <toolkit/helper/servicenames.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 18018b759c5a..c5c9450a6eb4 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -31,22 +31,16 @@ #include <toolkit/controls/unocontrol.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <rtl/uuid.h> #include <osl/mutex.hxx> -#include <tools/date.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/controls/accessiblecontrolcontext.hxx> #include <algorithm> #include <map> -#include <set> #include <vector> using namespace ::com::sun::star; diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 5b9889a6bb68..d7f2aefaba85 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -23,18 +23,12 @@ #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/implbase.hxx> -#include <rtl/uuid.h> #include <toolkit/controls/unocontrolcontainer.hxx> -#include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> #include <comphelper/sequence.hxx> #include <tools/debug.hxx> -#include <vcl/svapp.hxx> -#include <vcl/window.hxx> #include <limits> #include <map> diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 3ea0613f17df..2926c365b31c 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -21,34 +21,28 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/FontWidth.hpp> -#include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/MouseWheelBehavior.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/i18n/Currency2.hpp> +#include <com/sun/star/util/Date.hpp> +#include <com/sun/star/util/Time.hpp> #include <toolkit/controls/unocontrolmodel.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <rtl/uuid.h> #include <sal/log.hxx> #include <tools/diagnose_ex.h> -#include <tools/date.hxx> -#include <tools/time.hxx> #include <tools/debug.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/emptyfontdescriptor.hxx> -#include <com/sun/star/lang/Locale.hpp> #include <unotools/localedatawrapper.hxx> #include <unotools/configmgr.hxx> #include <comphelper/sequence.hxx> #include <comphelper/extract.hxx> #include <comphelper/servicehelper.hxx> -#include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> -#include <uno/data.h> #include <memory> #include <set> diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 6145b6564b7a..e2ebbf77ed41 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -20,22 +20,17 @@ #include <com/sun/star/awt/XTextArea.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/awt/LineEndFormat.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <com/sun/star/graphic/GraphicObject.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/awt/ImageScaleMode.hpp> #include <toolkit/controls/formattedcontrol.hxx> -#include <toolkit/controls/roadmapcontrol.hxx> #include <toolkit/controls/unocontrols.hxx> -#include <toolkit/controls/stdtabcontroller.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/macros.hxx> @@ -45,18 +40,8 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> -#include <vcl/wrkwin.hxx> -#include <vcl/svapp.hxx> -#include <vcl/edit.hxx> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/combobox.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <tools/date.hxx> -#include <tools/time.hxx> -#include <sal/log.hxx> #include <algorithm> diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 821e06eae211..7394a442cef7 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -26,8 +26,6 @@ #include <sal/log.hxx> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -43,7 +41,6 @@ #include <vcl/pdfextoutdevdata.hxx> #include <vcl/outdev.hxx> -#include <functional> #include <algorithm> #include <iterator> diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index a1c4d8a53c0f..80728a2dc20e 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -18,9 +18,9 @@ */ #include <toolkit/helper/listenermultiplexer.hxx> +#include <toolkit/helper/macros.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/queryinterface.hxx> -#include <tools/diagnose_ex.h> // class ListenerMultiplexerBase diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index ad9ca0c89edf..b09b0a7e8fff 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -18,20 +18,9 @@ */ #include <toolkit/helper/property.hxx> -#include <toolkit/helper/macros.hxx> -#include <osl/mutex.hxx> -#include <stdlib.h> #include <tools/debug.hxx> -#include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/awt/CharSet.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/awt/FontWidth.hpp> -#include <com/sun/star/awt/FontType.hpp> -#include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/FontStrikeout.hpp> -#include <com/sun/star/awt/FontPitch.hpp> #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/tree/XTreeDataModel.hpp> #include <com/sun/star/awt/grid/XGridDataModel.hpp> diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index fb425f7bced8..13fa5aeb7537 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/awt/WindowEvent.hpp> - #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/helper/convert.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/awt/vclxcontainer.hxx> @@ -28,8 +25,6 @@ #include <toolkit/awt/vclxgraphics.hxx> #include <toolkit/dllapi.h> -#include <vcl/svapp.hxx> -#include <vcl/syswin.hxx> #include <vcl/menu.hxx> #include <tools/debug.hxx> diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 3e43f81502a8..0c763099f41d 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -22,20 +22,15 @@ #include <vcl/window.hxx> #include <vcl/unohelp.hxx> #include <vcl/metric.hxx> -#include <sal/macros.h> #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/awt/XPointer.hpp> #include <com/sun/star/awt/SimpleFontMetric.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/awt/FontWidth.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/MouseButton.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <toolkit/helper/vclunohelper.hxx> @@ -44,7 +39,6 @@ #include <toolkit/awt/vclxregion.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/awt/vclxgraphics.hxx> -#include <toolkit/awt/vclxpointer.hxx> #include <toolkit/awt/vclxfont.hxx> #include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/controls/unocontrolcontainermodel.hxx> |