diff options
302 files changed, 50 insertions, 288 deletions
diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx index 5c2ba39d345d..774a0a2b96ec 100644 --- a/avmedia/source/vlc/vlcuno.cxx +++ b/avmedia/source/vlc/vlcuno.cxx @@ -18,7 +18,6 @@ */ #include <comphelper/processfactory.hxx> -#include <comphelper/configuration.hxx> #include <officecfg/Office/Common.hxx> #include "vlccommon.hxx" diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 787988ca622e..05b8bda07041 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -43,7 +43,6 @@ #include <vcl/textdata.hxx> #include <basic/codecompletecache.hxx> #include <com/sun/star/reflection/XIdlClass.hpp> -#include <comphelper/namedvaluecollection.hxx> #include <comphelper/syntaxhighlight.hxx> #include <com/sun/star/reflection/XIdlReflection.hpp> diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 09f23f3e0e99..208195afddee 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -64,7 +64,6 @@ #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XControl.hpp> -#include <comphelper/anytostring.hxx> #include <ooo/vba/VbQueryClose.hpp> #include <list> #include <memory> diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index 2afc58f3e5f7..a8e08cf6157d 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -23,7 +23,6 @@ #include <svtools/miscopt.hxx> #include <osl/diagnose.h> #include <com/sun/star/reflection/theCoreReflection.hpp> -#include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp> #include <com/sun/star/reflection/XIdlMethod.hpp> diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx index a0cf139b8ee2..a4a0ce78e536 100644 --- a/basic/source/uno/modsizeexceeded.cxx +++ b/basic/source/uno/modsizeexceeded.cxx @@ -20,6 +20,7 @@ #include <basic/modsizeexceeded.hxx> #include <comphelper/interaction.hxx> +#include <comphelper/sequence.hxx> #include <com/sun/star/script/ModuleSizeExceededRequest.hpp> using namespace com::sun::star; diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index a547717e656d..25d1ead2f2b2 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <basegfx/vector/b2isize.hxx> #include <cppuhelper/compbase.hxx> -#include <comphelper/uno3.hxx> #include <canvas/base/basemutexhelper.hxx> #include <canvas/base/integerbitmapbase.hxx> diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx index c26d955c8ea6..e01a7d87f7eb 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.hxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx @@ -11,7 +11,6 @@ #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX #include <cppuhelper/compbase.hxx> -#include <comphelper/uno3.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/rendering/XCustomSprite.hpp> diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index c31b10180919..069c26e6197a 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -21,6 +21,7 @@ #include "Chart2ModelContact.hxx" #include <WrappedDirectStateProperty.hxx> #include <com/sun/star/drawing/FillStyle.hpp> +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 227861f72c07..90acc01e5d79 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -21,7 +21,6 @@ #include <WrappedPropertySet.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index d5662f5d2981..fd03ae35f55c 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -27,6 +27,7 @@ #include <DisposeHelper.hxx> #include <unonames.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index dc5a53e3aa0d..49ddd3c32319 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -22,7 +22,6 @@ #include <WrappedPropertySet.hxx> #include "ReferenceSizePropertyProvider.hxx" #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/chart/XAxis.hpp> #include <com/sun/star/chart2/XAxis.hpp> diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 93b413f25189..50c6c213da43 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -50,6 +50,7 @@ #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/sequence.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index dec06433ac9a..f49bcb0d4fe5 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <comphelper/sequence.hxx> #include <cppuhelper/exc_hlp.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index 7b6f000c864a..a8fe2c55421f 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -22,7 +22,6 @@ #include <WrappedPropertySet.hxx> #include "ReferenceSizePropertyProvider.hxx" #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index b2da48874a18..1d72050806ab 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -46,6 +46,7 @@ #include "WrappedAutomaticPositionProperties.hxx" #include <CommonConverters.hxx> #include <unonames.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 022b87a3082d..7452ae50ebff 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -22,7 +22,6 @@ #include <WrappedPropertySet.hxx> #include <DiagramHelper.hxx> -#include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XDiagram.hpp> diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index f61f17a616e0..b5327cf740c6 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -27,6 +27,7 @@ #include <UserDefinedProperties.hxx> #include <WrappedDefaultProperty.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <algorithm> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index 2e65dcc39ae7..a0a314da75ef 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -21,7 +21,6 @@ #include <WrappedPropertySet.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index f515e7d1b797..0614d4844151 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -20,6 +20,7 @@ #include "LegendWrapper.hxx" #include "Chart2ModelContact.hxx" #include <LegendHelper.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/XTitled.hpp> diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 461458d1a46f..049eb589b4ec 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -22,7 +22,6 @@ #include <WrappedPropertySet.hxx> #include "ReferenceSizePropertyProvider.hxx" #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index b98950ca4278..01b9d8209a3d 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -20,6 +20,7 @@ #include "TitleWrapper.hxx" #include <ControllerLockGuard.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 59a2bea8c409..8419c7d0b37d 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -24,7 +24,6 @@ #include "Chart2ModelContact.hxx" #include <TitleHelper.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index c0d3ce259cf1..73d57841c1fd 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -19,6 +19,7 @@ #include "WallFloorWrapper.hxx" #include "Chart2ModelContact.hxx" +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/FillStyle.hpp> diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index 63a4dc8e7bb2..6572471a4901 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -21,7 +21,6 @@ #include <WrappedPropertySet.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 872fbf46fe4d..1fb605aed2f4 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/util/XRefreshable.hpp> #include <cppuhelper/implbase.hxx> #include <unotools/eventlisteneradapter.hxx> -#include <comphelper/uno3.hxx> #include <memory> diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx index 103e8b4bb97f..9d1f5b7a5be7 100644 --- a/chart2/source/controller/main/ToolbarController.cxx +++ b/chart2/source/controller/main/ToolbarController.cxx @@ -17,7 +17,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> -#include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/supportsservice.hxx> namespace chart { diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 1e6da809232f..b4a4ee5004ee 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -21,7 +21,6 @@ #include "charttoolsdllapi.hxx" #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <com/sun/star/chart2/XColorScheme.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 1d0bb7fce7d9..17d2a386be1f 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> namespace chart { diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index da8b3d8ec9da..3e20a0c5c280 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -24,7 +24,6 @@ #include "charttoolsdllapi.hxx" #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 948b38898a0d..5b8923cb7530 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_INC_LABELEDDATASEQUENCE_HXX #include "MutexContainer.hxx" -#include <comphelper/uno3.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp> diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 5088ee14b49f..7b09b1a16b7e 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -22,7 +22,6 @@ #include <OPropertySet.hxx> #include <MutexContainer.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 59103d56c082..59bea3f0b7ea 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> +#include <comphelper/sequence.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index d0c58314fa4c..f4118dd9b05d 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -23,6 +23,7 @@ #include <PropertyHelper.hxx> #include <CloneHelper.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <svl/itemprop.hxx> #include <vcl/svapp.hxx> diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 5a6c2ae428c0..3c5fe7951792 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -23,7 +23,6 @@ #include <comphelper/anytostring.hxx> #include <comphelper/anycompare.hxx> #include <comphelper/componentbase.hxx> -#include <comphelper/extract.hxx> #include <com/sun/star/container/XEnumerableMap.hpp> #include <com/sun/star/lang/NoSupportException.hpp> diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index 8f07dafb638f..c585a3ca6d10 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -18,6 +18,8 @@ */ #include <comphelper/interaction.hxx> + +#include <comphelper/sequence.hxx> #include <osl/diagnose.h> diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index 0deb62f38a6f..371b2a63c0d2 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <comphelper/extract.hxx> #include <cppuhelper/interfacecontainer.h> #include <TConnection.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index b1fd4d547ebf..1f774fd1440d 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> -#include <comphelper/extract.hxx> #include <comphelper/property.hxx> #include <TConnection.hxx> #include <connectivity/TTableHelper.hxx> diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 41d28a2bdf54..97e80a56cc51 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -34,9 +34,7 @@ #include <tools/diagnose_ex.h> -#include <comphelper/uno3.hxx> #include <comphelper/proparrhlp.hxx> -#include <comphelper/broadcasthelper.hxx> #include <connectivity/ParameterCont.hxx> #include <rtl/ustrbuf.hxx> diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 672ba58d8086..ee727509d1c3 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -21,7 +21,6 @@ #include "ZConnectionPool.hxx" #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/container/ElementExistException.hpp> -#include <comphelper/extract.hxx> #include <comphelper/types.hxx> #include <com/sun/star/lang/XComponent.hpp> #include "ZPooledConnection.hxx" diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index 4b1157afa39e..1aa6374656c7 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.cxx +++ b/connectivity/source/cpool/ZConnectionWrapper.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <comphelper/extract.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index c8fd83e39553..7d2559de2382 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -22,7 +22,6 @@ #include <connectivity/ConnectionWrapper.hxx> #include <com/sun/star/sdbc/XCloseable.hpp> #include <comphelper/types.hxx> -#include <comphelper/uno3.hxx> #include <cppuhelper/component.hxx> using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index eb5d2dbde812..6c0b385bc7f9 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -23,7 +23,6 @@ #include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> #include <ado/AColumns.hxx> -#include <comphelper/extract.hxx> #include <TConnection.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index bce84e2b05b3..ffeaf9c79ccf 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -44,7 +44,6 @@ #include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbconversion.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/component/CTable.cxx b/connectivity/source/drivers/component/CTable.cxx index 3abfc2224923..c31a7f6df349 100644 --- a/connectivity/source/drivers/component/CTable.cxx +++ b/connectivity/source/drivers/component/CTable.cxx @@ -43,7 +43,6 @@ #include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbconversion.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 4dec39d2b1ca..e07402af2198 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <comphelper/extract.hxx> #include <unotools/ucbhelper.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 36323fbe5a04..0b2b724e9764 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbc/TransactionIsolation.hpp> #include "NPreparedStatement.hxx" #include "NStatement.hxx" -#include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> #include <comphelper/sequence.hxx> #include <rtl/ustring.hxx> diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index d838d07e9033..e20b8adf8f7f 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> -#include <comphelper/extract.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 7beaffdca6d6..b5b5e3f4fc1e 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -26,7 +26,6 @@ #include <connectivity/sdbcx/VTable.hxx> #include "NCatalog.hxx" #include "NConnection.hxx" -#include <comphelper/extract.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 42c78e82e1dc..a078e095a3fa 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> #include <algorithm> -#include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> #include <comphelper/types.hxx> #include <resource/sharedresources.hxx> diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index a700f3511046..accd53ab6809 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -20,7 +20,6 @@ #include <file/fanalyzer.hxx> #include <connectivity/sqlparse.hxx> #include <tools/debug.hxx> -#include <comphelper/extract.hxx> #include <connectivity/sqlnode.hxx> #include <connectivity/dbexception.hxx> #include <file/FConnection.hxx> diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index 1ee3d2a23129..ace657fd642d 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <flat/EPreparedStatement.hxx> #include <flat/EStatement.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> using namespace connectivity::flat; diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index e10874e93189..33c6557737b2 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -28,7 +28,6 @@ #include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/extract.hxx> #include <comphelper/numbers.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 618b00930655..a05d004ee864 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> #include <comphelper/property.hxx> -#include <comphelper/extract.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sdbcx/VColumn.hxx> diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index bde5866b9d92..2f6047e7703f 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/sdbc/KeyRule.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> #include <hsqldb/HCatalog.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index c66d869e09a4..09e98f6d52af 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbcx/CheckOption.hpp> #include <hsqldb/HCatalog.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 976e2fde3758..1cfb692ec18e 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <comphelper/broadcasthelper.hxx> #include <cppuhelper/compbase.hxx> #include <TConnection.hxx> diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index a6db7380e2fe..7192c2393907 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> #include <comphelper/property.hxx> -#include <comphelper/extract.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sdbcx/VColumn.hxx> diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index be47c7c7a116..55077af30426 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/sdbc/KeyRule.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> #include <mysql/YCatalog.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index 2f4f123285b3..c6a3c2800073 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbcx/CheckOption.hpp> #include <mysql/YCatalog.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index cc474837bb52..7d7a741f93c5 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <connectivity/dbcharset.hxx> #include <connectivity/FValue.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> #include <string.h> diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 5f40aca6a69a..a26526894080 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -32,7 +32,6 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/extract.hxx> #include <comphelper/types.hxx> #include <algorithm> #include <strings.hrc> diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index c181a1b2f940..8fe534bbbad9 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -25,7 +25,6 @@ #include <jni.h> #include <java/sql/SQLException.hxx> -#include <comphelper/uno3.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index d5f16da9e50b..595b66576ed1 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -25,7 +25,6 @@ #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/dbexception.hxx> #include <comphelper/enumhelper.hxx> -#include <comphelper/container.hxx> #include <comphelper/types.hxx> #include <comphelper/property.hxx> #include <TConnection.hxx> diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index cfa7996563fd..9f4e2328b337 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -61,7 +61,6 @@ #include "eventdlg.hxx" #include <dialmgr.hxx> -#include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <unotools/configmgr.hxx> diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index f3b64a304e08..dfa1e000d7c7 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -61,7 +61,6 @@ #include "eventdlg.hxx" #include <dialmgr.hxx> -#include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <unotools/configmgr.hxx> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index f8a2aa420835..762570f5a3d3 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -95,6 +95,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/util/thePathSettings.hpp> +#include <comphelper/documentinfo.hxx> #include <comphelper/propertysequence.hxx> #include <dlgname.hxx> diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 1bc84e2b4c3f..1f66ca104c71 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -53,7 +53,6 @@ #include <svx/svxerr.hxx> #include <treeopt.hxx> #include <svtools/langtab.hxx> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> using namespace ::com::sun::star; diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index ea36b0c0bc8c..c579c55059c7 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -35,7 +35,6 @@ #include <o3tl/make_unique.hxx> #include <officecfg/Office/Common.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/propertysequence.hxx> #include <comphelper/dispatchcommand.hxx> #include <dialmgr.hxx> diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 4168e1098e64..21d06cd6a0d5 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -49,9 +49,7 @@ #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <comphelper/documentinfo.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index bb8ce1b24f60..63f6bf2fc123 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -32,7 +32,6 @@ #include <svtools/svmedit2.hxx> #include <svtools/svmedit.hxx> -#include <comphelper/documentinfo.hxx> #include <comphelper/random.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index ccc7e88a8469..7256fe68f4c9 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -30,7 +30,6 @@ #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <tools/link.hxx> -#include <comphelper/uno3.hxx> #include <rtl/ustring.hxx> namespace svxform { diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index a2af0e7ba3c2..434a81c27051 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -23,7 +23,6 @@ #include "connpooloptions.hxx" #include <svl/itemset.hxx> #include <unotools/confignode.hxx> -#include <comphelper/extract.hxx> #include <svl/eitem.hxx> #include <comphelper/processfactory.hxx> #include "sdbcdriverenum.hxx" diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 764559249e2d..4af9678fe40d 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -23,7 +23,6 @@ #include <svx/svxids.hrc> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> -#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <svl/eitem.hxx> #include <svl/itemset.hxx> diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index ed713db72a53..1a9bde5569e0 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/sdbc/IndexType.hpp> #include <stringconstants.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/extract.hxx> using namespace connectivity; diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index c8ba3635aa2f..ddd7d0575d79 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -36,7 +36,6 @@ #include <connectivity/dbtools.hxx> #include <com/sun/star/sdbcx/KeyType.hpp> -#include <comphelper/extract.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <comphelper/types.hxx> #include <rtl/ustrbuf.hxx> diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 103419cc035d..630209ae9bf3 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -39,7 +39,6 @@ #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include "RowSetRow.hxx" -#include <comphelper/broadcasthelper.hxx> #include "RowSetCacheIterator.hxx" #include <functional> diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 5ad4cdc22d5f..a4b082a21583 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -44,7 +44,6 @@ #include <comphelper/extract.hxx> #include <comphelper/property.hxx> #include <comphelper/seqstream.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqliterator.hxx> diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 0312a3122c68..a57883ba2ba2 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -27,8 +27,6 @@ #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/enumhelper.hxx> -#include <comphelper/container.hxx> #include <comphelper/sequence.hxx> #include <comphelper/property.hxx> #include <comphelper/types.hxx> @@ -39,7 +37,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> -#include <comphelper/extract.hxx> #include <ContainerMediator.hxx> using namespace dbaccess; diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index e9e7ae90dbf6..fcbd4e9fb456 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -29,8 +29,6 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <comphelper/enumhelper.hxx> -#include <comphelper/extract.hxx> #include <comphelper/property.hxx> #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 6c9a4da2f9f2..8215be2e48ce 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -34,11 +34,9 @@ #include <connectivity/dbexception.hxx> #include <osl/diagnose.h> -#include <comphelper/enumhelper.hxx> #include <comphelper/uno3.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/extract.hxx> #include <cppuhelper/exc_hlp.hxx> using namespace dbtools; diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index c2f13dcf9bdc..d0a414e03693 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -28,8 +28,6 @@ #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/enumhelper.hxx> -#include <comphelper/container.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <com/sun/star/util/XRefreshListener.hpp> diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 61b182bc25ac..ad83c8a866fa 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -23,7 +23,6 @@ #include <comphelper/property.hxx> #include <comphelper/processfactory.hxx> #include <tools/debug.hxx> -#include <comphelper/enumhelper.hxx> #include <core_resource.hxx> #include <strings.hrc> #include <com/sun/star/sdb/CommandType.hpp> @@ -41,7 +40,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> #include <TableDeco.hxx> #include <sdbcoretools.hxx> diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index f3004cb1c1c5..3e29c4ae1dcc 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -21,10 +21,8 @@ #include <stringconstants.hxx> #include <View.hxx> -#include <comphelper/enumhelper.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> #include <rtl/ustrbuf.hxx> diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 006f19138dd0..57ba4ebae1f8 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -24,7 +24,6 @@ #include <osl/diagnose.h> #include <comphelper/sequence.hxx> #include <comphelper/enumhelper.hxx> -#include <comphelper/extract.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 95999104e9f8..4919c9b42615 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -47,8 +47,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <comphelper/extract.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 1b55e47b4bd8..974d431109d7 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -51,7 +51,6 @@ #include <basic/basmgr.hxx> #include <comphelper/enumhelper.hxx> -#include <comphelper/evtlistenerhlp.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index d06413fc59dd..135d5964df25 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -52,7 +52,6 @@ #include <comphelper/guarding.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/interaction.hxx> -#include <comphelper/namedvaluecollection.hxx> #include <comphelper/property.hxx> #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index a330cccd9625..faa7b9901221 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -39,7 +39,6 @@ #include <bookmarkcontainer.hxx> #include <rtl/ref.hxx> #include <connectivity/CommonTools.hxx> -#include <comphelper/broadcasthelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp> diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index c173226b9945..95b4676006ba 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -28,7 +28,6 @@ #include <osl/diagnose.h> #include <comphelper/sequence.hxx> #include <comphelper/enumhelper.hxx> -#include <comphelper/extract.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 7f201e3f229b..a60a45a30ad1 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -34,7 +34,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <comphelper/uno3.hxx> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/sdbcx/XRename.hpp> diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx index 20e62457456a..4a763c577912 100644 --- a/dbaccess/source/core/inc/ModelImpl.hxx +++ b/dbaccess/source/core/inc/ModelImpl.hxx @@ -55,7 +55,6 @@ #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/sharedmutex.hxx> diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 5caa9bef5bb7..94a351b78d10 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/broadcasthelper.hxx> #include <vector> diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 137528fb7b71..1b3f061f84b2 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -21,6 +21,7 @@ #include <stringconstants.hxx> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index f58e284d7b3f..8ad356b80b36 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/io/TextInputStream.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <comphelper/namedvaluecollection.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index b60d11fad841..55878ad61c48 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -27,7 +27,6 @@ #include <xmloff/xmltoken.hxx> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <comphelper/extract.hxx> #include <xmloff/xmlprcon.hxx> #include <xmloff/xmluconv.hxx> #include <osl/diagnose.h> diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 5b35fedaa7ac..a951ab1302c6 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -30,7 +30,6 @@ #include <ucbhelper/content.hxx> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <comphelper/namecontainer.hxx> #include <comphelper/propertysequence.hxx> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 2be57bf4343a..906a2bd69272 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -55,8 +55,8 @@ #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> +#include <comphelper/types.hxx> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/uno3.hxx> #include <cppuhelper/exc_hlp.hxx> #include <connectivity/DriversConfig.hxx> #include <dsntypes.hxx> diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 40943501bf4d..9c31a5c56909 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -18,7 +18,7 @@ */ #include <connectiontools.hxx> -#include <comphelper/componentmodule.hxx> +#include <cppuhelper/factory.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 238dcf83ebce..e9889c442f83 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -57,7 +57,6 @@ #include <dbu_reghelper.hxx> #include <strings.hrc> #include <vcl/menu.hxx> -#include <comphelper/uno3.hxx> #include <vcl/svapp.hxx> #include <svtools/svlbitm.hxx> #include <listviewitems.hxx> diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index e5f673c81643..41500c1c5dc3 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/sdb/XResultSetAccess.hpp> #include <TokenWriter.hxx> #include <stringconstants.hxx> -#include <comphelper/uno3.hxx> #include <svx/dataaccessdescriptor.hxx> #include <UITools.hxx> diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 25688f5145c4..d911c15f1a01 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -18,7 +18,6 @@ */ #include <dbaccess/genericcontroller.hxx> -#include <comphelper/uno3.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <browserids.hxx> #include <vcl/svapp.hxx> @@ -32,7 +31,6 @@ #include <cppuhelper/typeprovider.hxx> #include <framework/titlehelper.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/extract.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 0b1dc557fa9d..17fa0bdf5454 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -27,7 +27,6 @@ #include <vcl/group.hxx> #include <TableGrantCtrl.hxx> #include "adminpages.hxx" -#include <comphelper/uno3.hxx> namespace com { namespace sun { namespace star { namespace sdbc { diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 520045fb09dd..f2129bd5acc8 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -32,6 +32,7 @@ #include "optionalboolitem.hxx" #include <sqlmessage.hxx> +#include <comphelper/types.hxx> #include <osl/file.hxx> #include <vcl/accel.hxx> #include <vcl/button.hxx> diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 1711710d51d8..5bdea50c7530 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <stringconstants.hxx> -#include <comphelper/extract.hxx> #include <comphelper/types.hxx> #include <dsitems.hxx> #include <svl/stritem.hxx> diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 16962ea0e0bb..75068c040397 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -28,7 +28,6 @@ #include <tools/debug.hxx> #include <connectivity/sqliterator.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/extract.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <tools/diagnose_ex.h> #include <vcl/settings.hxx> diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index 6cc2c555e165..ef688f306b98 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_IITEMSETHELPER_HXX #include <sal/types.h> -#include <comphelper/uno3.hxx> #include <dsntypes.hxx> namespace com { namespace sun { namespace star { diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index b0ee3e4e30a1..4622f91a72ca 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -22,7 +22,6 @@ #include <sfx2/basedlgs.hxx> #include "IItemSetHelper.hxx" -#include <comphelper/uno3.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <memory> diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 1a373cabd5d1..bc7d692f9ee7 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -23,7 +23,6 @@ #include <sfx2/tabdlg.hxx> #include <dsntypes.hxx> #include "IItemSetHelper.hxx" -#include <comphelper/uno3.hxx> #include <memory> namespace com { namespace sun { namespace star { diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index b5e8be4e32b0..2bad2aaaba57 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -23,7 +23,6 @@ #include <sfx2/tabdlg.hxx> #include <dsntypes.hxx> #include "IItemSetHelper.hxx" -#include <comphelper/uno3.hxx> #include <memory> namespace com { namespace sun { namespace star { diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index ba6c6d3d819f..48a7fc7dc501 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <svx/dbaexchange.hxx> -#include <comphelper/uno3.hxx> #include <vector> #include <rtl/ref.hxx> diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 907a3d9a6701..14a7ef675fd6 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -23,7 +23,6 @@ #include <sfx2/tabdlg.hxx> #include <dsntypes.hxx> #include "IItemSetHelper.hxx" -#include <comphelper/uno3.hxx> #include <svtools/wizardmachine.hxx> #include <memory> diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index ce0d0c7d0a90..0f0588f9bf68 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -23,7 +23,6 @@ #include <sfx2/tabdlg.hxx> #include <dsntypes.hxx> #include "IItemSetHelper.hxx" -#include <comphelper/uno3.hxx> #include <tools/urlobj.hxx> #include <memory> #include <svtools/roadmapwizard.hxx> diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 7d01589458d5..ddd3a07bc042 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -41,7 +41,6 @@ #include <sfx2/sfxhtml.hxx> #include <svl/numuno.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/extract.hxx> #include <TypeInfo.hxx> #include <FieldDescriptions.hxx> #include <UITools.hxx> diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index ca24a9f1ea4e..8bc0b36eb156 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -23,7 +23,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/stream.hxx> #include <tools/tenccvt.hxx> -#include <comphelper/extract.hxx> #include <comphelper/string.hxx> #include <strings.hrc> #include <stringconstants.hxx> diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 1ca5567a2cc6..f09ac52b8eb3 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -38,7 +38,6 @@ #include <strings.hrc> #include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/extract.hxx> #include <comphelper/string.hxx> #include <tools/color.hxx> #include <WExtendPages.hxx> diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index fe5b66048327..ca58612c2c81 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include <comphelper/extract.hxx> #include <comphelper/types.hxx> #include <comphelper/interaction.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index d21365727fab..301fac338545 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <comphelper/extract.hxx> #include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 434f000d907f..406575239f68 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdbc/SQLWarning.hpp> #include <osl/thread.h> -#include <comphelper/extract.hxx> #include <comphelper/namedvaluecollection.hxx> #include <connectivity/dbexception.hxx> #include <com/sun/star/sdbc/XDataSource.hpp> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 778d838f0443..c3bd6fa4deaf 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/ucb/OpenCommandArgument.hpp> #include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -#include <comphelper/extract.hxx> #include <comphelper/types.hxx> #include <ucbhelper/content.hxx> #include <strings.hrc> diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index ddebfc064ddd..04a9da583b56 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -25,7 +25,6 @@ #include <toolkit/awt/vclxwindow.hxx> #include <TableConnection.hxx> #include <TableWindow.hxx> -#include <comphelper/uno3.hxx> #include <JoinDesignView.hxx> #include <JoinController.hxx> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index dc2ad13b4aa7..a76706572b2d 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -22,7 +22,6 @@ #include <comphelper/types.hxx> #include <stringconstants.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/extract.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index c744c24b8d30..f3eced0bc113 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -33,7 +33,6 @@ #include <ConnectionLineData.hxx> #include <TableConnectionData.hxx> #include <stringconstants.hxx> -#include <comphelper/extract.hxx> #include <UITools.hxx> #include <vcl/settings.hxx> diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 8daae7f44de9..b5acfc05bbcd 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include "TableFieldInfo.hxx" -#include <comphelper/extract.hxx> #include <comphelper/string.hxx> -#include <comphelper/uno3.hxx> #include <UITools.hxx> #include <svtools/treelistentry.hxx> diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 60d0d92c148e..db4cc89d46fa 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -36,7 +36,6 @@ #include <strings.hrc> #include <strings.hxx> #include <unotools/configmgr.hxx> -#include <comphelper/extract.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 53c36fb0dac5..12688f0b4877 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -45,7 +45,6 @@ #include <comphelper/sequence.hxx> #include "querydlg.hxx" #include <JoinExchange.hxx> -#include <comphelper/extract.hxx> #include <core_resource.hxx> #include <strings.hrc> #include <strings.hxx> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 780e3dc02ee8..94a6897bde6d 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -25,7 +25,6 @@ #include <sqlbison.hxx> #include <QueryTableView.hxx> #include <browserids.hxx> -#include <comphelper/extract.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 6d29cb77bc30..d13b2d49f4e5 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -37,7 +37,6 @@ #include <querycontroller.hxx> #include <stringconstants.hxx> #include <bitmaps.hlst> -#include <comphelper/extract.hxx> #include <UITools.hxx> #include <TableWindowAccess.hxx> #include <browserids.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 8256aaaaf111..78ffb0d342d8 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -34,7 +34,6 @@ #include <core_resource.hxx> #include <stringconstants.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index e1779a816cf1..eafa83720b28 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -32,7 +32,6 @@ #include <ConnectionLineData.hxx> #include <RTableConnectionData.hxx> #include <stringconstants.hxx> -#include <comphelper/extract.hxx> #include <UITools.hxx> using namespace ::dbaui; diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 7c9827489458..2346efadd685 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -19,7 +19,6 @@ #include <RelationTableView.hxx> #include <JoinExchange.hxx> -#include <comphelper/extract.hxx> #include <core_resource.hxx> #include <browserids.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index f1f2f64a33a4..716add82c7db 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/extract.hxx> #include <stringconstants.hxx> #include <dbu_reghelper.hxx> #include <comphelper/property.hxx> diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 5e1497a82805..7c665ce21ef3 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -22,7 +22,6 @@ #include <dbu_reghelper.hxx> #include <unoadmin.hxx> #include <dbadmin.hxx> -#include <comphelper/extract.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/property.hxx> diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 47c9fa9fe4f3..37c5d77b79aa 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -31,7 +31,6 @@ #include <sal/log.hxx> #include <cppuhelper/exc_hlp.hxx> #include <ucbhelper/content.hxx> -#include <comphelper/anytostring.hxx> #include <comphelper/servicedecl.hxx> #include <comphelper/sequence.hxx> #include <xmlscript/xml_helper.hxx> diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 0393e934e343..4b1c943f0cac 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -35,7 +35,6 @@ #include <cppuhelper/exc_hlp.hxx> #include <ucbhelper/content.hxx> #include <unotools/ucbhelper.hxx> -#include <comphelper/anytostring.hxx> #include <comphelper/servicedecl.hxx> #include <xmlscript/xml_helper.hxx> #include <comphelper/lok.hxx> diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 22da67f706d6..02333733f83d 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -48,7 +48,6 @@ #include <com/sun/star/io/XDataInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <comphelper/container.hxx> #include <svl/urihelper.hxx> #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index d1c450feed03..c114135cfcca 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -27,7 +27,6 @@ #include <tools/debug.hxx> #include <connectivity/dbtools.hxx> #include <helpids.h> -#include <comphelper/extract.hxx> namespace dbp diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index e0be314b6d71..0bf05ceb15d3 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -20,7 +20,6 @@ #include "handlerhelper.hxx" #include <strings.hrc> #include <yesno.hrc> -#include <comphelper/extract.hxx> #include "modulepcr.hxx" #include "enumrepresentation.hxx" #include "formmetadata.hxx" diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 224d23f483ad..03be5c88b29d 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -25,9 +25,6 @@ #include <com/sun/star/ucb/AlreadyInitializedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <comphelper/broadcasthelper.hxx> -#include <comphelper/uno3.hxx> - namespace pcr { diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 6688846cfb3c..e26537d69dac 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -38,7 +38,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/types.hxx> -#include <comphelper/extract.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/property.hxx> diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 0db369ead9b2..890e02afb332 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -33,8 +33,6 @@ #include <vcl/fixed.hxx> -#include <comphelper/uno3.hxx> - namespace pcr { diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 56b9252cafbb..25313b36bee6 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -24,7 +24,6 @@ #include "versions.hxx" #include <com/sun/star/lang/XInitialization.hpp> -#include <comphelper/enumhelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index cbb727aebd79..5faf77c6e5d6 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -23,7 +23,6 @@ #include "versions.hxx" #include <com/sun/star/lang/XInitialization.hpp> -#include <comphelper/enumhelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 811ad6458d8b..f7effe9b7f34 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -23,6 +23,7 @@ #include <sax/tools/documenthandleradapter.hxx> +#include <osl/diagnose.h> #include <osl/time.h> #include <osl/conditn.hxx> #include <rtl/strbuf.hxx> diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index ca4d1d065aea..92652c7cd647 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#include <comphelper/numbers.hxx> #include <comphelper/basicio.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index ceb1cfe8befa..77dad35de045 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -55,8 +55,6 @@ #include <com/sun/star/util/XModifiable2.hpp> #include <comphelper/basicio.hxx> -#include <comphelper/container.hxx> -#include <comphelper/enumhelper.hxx> #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index e14b0526b4bb..4e87cdd8c3d4 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -38,9 +38,6 @@ #include <tools/diagnose_ex.h> -#include <comphelper/container.hxx> -#include <comphelper/numbers.hxx> - using namespace dbtools; namespace frm diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 9a57c0c737fd..1b3e698de8d5 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -24,7 +24,6 @@ #include <services.hxx> #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> -#include <comphelper/container.hxx> #include <comphelper/basicio.hxx> #include <comphelper/guarding.hxx> diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index f877753dc789..46b5fa307cd5 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -47,7 +47,6 @@ #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/awt/XItemList.hpp> -#include <comphelper/numbers.hxx> #include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> #include <connectivity/dbconversion.hxx> diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 34b31657bb45..6b92c9a8b138 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <comphelper/basicio.hxx> -#include <comphelper/container.hxx> #include <cppuhelper/queryinterface.hxx> #include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index ef0a4e574814..67c4c3615c90 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -39,8 +39,6 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <comphelper/basicio.hxx> -#include <comphelper/container.hxx> -#include <comphelper/numbers.hxx> #include <comphelper/listenernotification.hxx> #include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 75b53aee5a24..ab3cfe52d83b 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -42,7 +42,6 @@ #include <sfx2/objsh.hxx> #include <osl/mutex.hxx> #include <services.hxx> -#include <comphelper/container.hxx> #include <comphelper/listenernotification.hxx> #include <svtools/imageresourceaccess.hxx> #define LOCAL_URL_PREFIX '#' diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index dd228e81dc5c..8d9c27bdd390 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/form/XForm.hpp> -#include <comphelper/container.hxx> #include <comphelper/enumhelper.hxx> #include <comphelper/eventattachermgr.hxx> #include <comphelper/property.hxx> diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 7753af6924d9..7cac02da7777 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -10,6 +10,7 @@ #include "RemoteFilesDialog.hxx" #include <fpsofficeResMgr.hxx> #include <strings.hrc> +#include <comphelper/docpasswordrequest.hxx> #include <comphelper/stillreadwriteinteraction.hxx> #include <bitmaps.hlst> diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 33445bf41a3b..b2ffa7099f15 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -10,8 +10,6 @@ #ifndef INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX #define INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX -#include <comphelper/docpasswordrequest.hxx> - #include <svtools/autocmpledit.hxx> #include <svtools/foldertree.hxx> #include <svtools/place.hxx> diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index f3b96051a1e8..55d7270e09da 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -38,7 +38,6 @@ #include "asyncfilepicker.hxx" #include "OfficeControlAccess.hxx" #include "fpsmartcontent.hxx" -#include <comphelper/configuration.hxx> #include "fpdialogbase.hxx" #include <o3tl/typed_flags_set.hxx> diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 381f2f287f0c..4703d1cf5161 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -31,7 +31,6 @@ #include <comphelper/propertysequence.hxx> #include <framework/interaction.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/configuration.hxx> #include <officecfg/Office/Common.hxx> #include <com/sun/star/awt/XWindow.hpp> diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index fbfe5cd9f7c6..d88371979f20 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -69,7 +69,6 @@ #include <vcl/errinf.hxx> #include <unotools/configmgr.hxx> -#include <comphelper/extract.hxx> namespace framework{ diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 2ac48b5ad89b..413d2da27825 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -54,7 +54,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> -#include <comphelper/extract.hxx> #include <svtools/menuoptions.hxx> #include <svtools/javainteractionhandler.hxx> #include <uno/current_context.hxx> diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 089addefd7b3..aec066ff33f1 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -22,7 +22,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertyvalue.hxx> -#include <comphelper/propertysequence.hxx> #include <framework/menuconfiguration.hxx> #include <rtl/ref.hxx> #include <svtools/imagemgr.hxx> diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx index c85e5c25dd92..84c0b528067e 100644 --- a/include/comphelper/interaction.hxx +++ b/include/comphelper/interaction.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_COMPHELPER_INTERACTION_HXX #define INCLUDED_COMPHELPER_INTERACTION_HXX -#include <comphelper/uno3.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/task/XInteractionDisapprove.hpp> diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx index f09a2d702e4d..14bc9e88d8c7 100644 --- a/include/connectivity/ConnectionWrapper.hxx +++ b/include/connectivity/ConnectionWrapper.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/broadcasthelper.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/dbtoolsdllapi.hxx> diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 89d5a75c6586..dcec2b1ae037 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Any.hxx> #include <vcl/vclptr.hxx> -#include <comphelper/namedvaluecollection.hxx> #include <rtl/ustring.hxx> #include <svl/poolitem.hxx> #include <tools/ref.hxx> diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 2605a6067517..f91893aa3bd0 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -22,7 +22,6 @@ #include <memory> #include <svx/svdpage.hxx> -#include <comphelper/uno3.hxx> #include <svx/svxdllapi.h> #include <tools/contnr.hxx> diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx index 2d1b39439995..6eaafe82d6e2 100644 --- a/include/svx/fmsearch.hxx +++ b/include/svx/fmsearch.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_FMSEARCH_HXX #include <com/sun/star/sdbc/XResultSet.hpp> -#include <comphelper/uno3.hxx> #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> #include <vcl/button.hxx> diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 0ba27ec0da52..239551e0c5b9 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -58,7 +58,6 @@ #include <rtl/ref.hxx> #include <tools/wintypes.hxx> #include <cppuhelper/weakref.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/stl_types.hxx> #include <cppuhelper/implbase.hxx> diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index d0a7eb79836f..c47267f6a968 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_FMVIEW_HXX #include <svx/view3d.hxx> -#include <comphelper/uno3.hxx> #include <svx/svxdllapi.h> namespace com { namespace sun { namespace star { diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index 16d8556bc7be..cf8ea9bdacd0 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -21,7 +21,6 @@ #define INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX #include <comphelper/broadcasthelper.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/propagg.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 144aaa599b85..0f59515dcc15 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -55,7 +55,6 @@ #include <i18nlangtag/languagetag.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> -#include <comphelper/extract.hxx> #include <deque> #include <map> diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index a2021608d753..31d96c7dd7ba 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -25,7 +25,6 @@ #include <osl/diagnose.h> #include <comphelper/sequenceashashmap.hxx> -#include <comphelper/docpasswordhelper.hxx> using namespace ::com::sun::star; diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index aee15b3995a8..c24c61c2fa15 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/docpasswordhelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <unotools/mediadescriptor.hxx> #include <osl/mutex.hxx> diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx index 056a692f4411..f6e0ee38d5fc 100644 --- a/oox/source/drawingml/scene3dcontext.cxx +++ b/oox/source/drawingml/scene3dcontext.cxx @@ -20,7 +20,6 @@ #include <drawingml/scene3dcontext.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <cppuhelper/exc_hlp.hxx> -#include <comphelper/anytostring.hxx> #include <drawingml/colorchoicecontext.hxx> #include <oox/drawingml/drawingmltypes.hxx> #include <drawingml/fillproperties.hxx> diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 2a66f0eaf51f..e68db52a2015 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/TextOutputStream.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> -#include <comphelper/docpasswordhelper.hxx> #include <osl/file.hxx> #include <rtl/math.hxx> #include <rtl/tencinfo.h> diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index 7e1539717641..972fe0b1e9aa 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -19,7 +19,6 @@ #include "animvariantcontext.hxx" -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx index 47e1d8a7d2e5..844c81803e03 100644 --- a/oox/source/ppt/commonbehaviorcontext.cxx +++ b/oox/source/ppt/commonbehaviorcontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index 4dfc82ad904c..26ea235d898d 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -21,7 +21,6 @@ #include <algorithm> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/animations/AnimationFill.hpp> diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index cf4d4fa4775b..cdecaa120891 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -19,7 +19,6 @@ #include "conditioncontext.hxx" -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/animations/AnimationEndSync.hpp> diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx index 39bfa34bb912..2c22ba948577 100644 --- a/oox/source/ppt/layoutfragmenthandler.cxx +++ b/oox/source/ppt/layoutfragmenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx index 2960d7c8d7aa..972454ecfaa7 100644 --- a/oox/source/ppt/slidetimingcontext.cxx +++ b/oox/source/ppt/slidetimingcontext.cxx @@ -19,7 +19,6 @@ #include <oox/ppt/slidetimingcontext.hxx> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/drawing/XShapes.hpp> diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index 94fc1c3862ae..32439a2ea70f 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -19,7 +19,6 @@ #include <oox/ppt/slidetransitioncontext.hxx> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index a5a118f4a231..775ebf688767 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -19,7 +19,6 @@ #include <oox/ppt/soundactioncontext.hxx> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <oox/helper/attributelist.hxx> diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index fe2d9581243b..0d4df9b464a4 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -19,7 +19,6 @@ #include <oox/ppt/timenodelistcontext.hxx> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/math.hxx> diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index cc8b3be60186..07ae4fa31379 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -19,7 +19,6 @@ #include "timetargetelementcontext.hxx" -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 0851df879d06..33de83b9e1a5 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -27,7 +27,6 @@ #include "dllapi.h" #include <com/sun/star/beans/XPropertySet.hpp> -#include <comphelper/uno3.hxx> #include <svx/fmglob.hxx> #include <svx/svdobj.hxx> diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 82dd992f5686..095faf41d281 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/report/XGroup.hpp> #include <com/sun/star/document/XUndoManager.hpp> -#include <comphelper/uno3.hxx> #include <comphelper/sequence.hxx> #include <svl/lstner.hxx> #include <svx/svdouno.hxx> diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index b0e8bea140cb..2929daec53af 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/reflection/XProxyFactory.hpp> #include <com/sun/star/text/ParagraphVertAlign.hpp> #include <com/sun/star/i18n/ScriptType.hpp> +#include <comphelper/uno3.hxx> #include <editeng/unolingu.hxx> #include <unotools/syslocale.hxx> #include <unotools/lingucfg.hxx> diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 2fcc6af56f93..db107276e48d 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/beans/PropertyValue.hpp> #include <ReportEngineJFree.hxx> -#include <comphelper/enumhelper.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/storagehelper.hxx> #include <connectivity/dbtools.hxx> diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index fdb7c2f89e98..5d726a85ed97 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -22,6 +22,7 @@ #include <cppuhelper/propertysetmixin.hxx> #include <com/sun/star/report/XFixedLine.hpp> #include "ReportControlModel.hxx" +#include <comphelper/uno3.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index e72d9f93541b..b08efa10b759 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -23,6 +23,7 @@ #include <cppuhelper/propertysetmixin.hxx> #include <com/sun/star/report/XFixedText.hpp> #include "ReportControlModel.hxx" +#include <comphelper/uno3.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index ca2fec4d727b..a457f7dada59 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -22,6 +22,7 @@ #include <cppuhelper/propertysetmixin.hxx> #include <com/sun/star/report/XFormatCondition.hpp> #include "ReportControlModel.hxx" +#include <comphelper/uno3.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 227088615436..e7860983bff5 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -22,6 +22,7 @@ #include <cppuhelper/propertysetmixin.hxx> #include <com/sun/star/report/XFormattedField.hpp> #include "ReportControlModel.hxx" +#include <comphelper/uno3.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index d4b1012ee70a..4b27adee20d1 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX +#include <comphelper/uno3.hxx> #include <cppuhelper/propertysetmixin.hxx> #include <com/sun/star/report/XFunction.hpp> #include <cppuhelper/basemutex.hxx> diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index 88ffa14461b0..63ed5468efc6 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX +#include <comphelper/uno3.hxx> #include <cppuhelper/propertysetmixin.hxx> #include <com/sun/star/report/XImageControl.hpp> #include "ReportControlModel.hxx" diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx index b9e4f1de907d..6025d72608ef 100644 --- a/reportdesign/source/core/inc/ReportComponent.hxx +++ b/reportdesign/source/core/inc/ReportComponent.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/report/XReportComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/weakref.hxx> -#include <comphelper/uno3.hxx> namespace reportdesign { diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index b60aca183a3a..72dc147aabb3 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> -#include <comphelper/uno3.hxx> #include <comphelper/interfacecontainer2.hxx> diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index a6b1e1d61683..49c6aff75396 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -25,7 +25,6 @@ #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" -#include <comphelper/namecontainer.hxx> #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/report/XShape.hpp> diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index 309a9146dddb..af1af1891d9d 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -27,7 +27,6 @@ #include "xmlCell.hxx" #include "xmlStyleImport.hxx" #include "xmlTable.hxx" -#include <comphelper/namecontainer.hxx> #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <strings.hxx> diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index a090f952aa89..ef17c7b4748f 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -27,7 +27,6 @@ #include <strings.hxx> #include "xmlStyleImport.hxx" #include <ucbhelper/content.hxx> -#include <comphelper/namecontainer.hxx> #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 2c11e4853c4f..808d82537b64 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -27,7 +27,6 @@ #include "xmlHelper.hxx" #include "xmlEnums.hxx" #include <ucbhelper/content.hxx> -#include <comphelper/namecontainer.hxx> #include <com/sun/star/report/GroupOn.hpp> #include <com/sun/star/report/KeepTogether.hpp> diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index 1f9862a01ab2..430d9cdeee8b 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -25,7 +25,6 @@ #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" -#include <comphelper/namecontainer.hxx> #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include "strings.hxx" diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 7634f4f589ff..fc644f1d749b 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -26,7 +26,6 @@ #include <xmloff/xmltoken.hxx> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <comphelper/extract.hxx> #include <xmloff/xmlprcon.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/XMLGraphicsDefaultStyle.hxx> diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 6d9e3c30b014..c1856bda9b97 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/util/XNumberFormatPreviewer.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/i18n/NumberFormatIndex.hpp> -#include <comphelper/numbers.hxx> #include <algorithm> namespace rptui diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 96269a3cf568..778e49120121 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/property.hxx> +#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 82732af556f6..db8ac3eb494f 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -18,7 +18,6 @@ */ #include <metadata.hxx> #include <com/sun/star/inspection/XPropertyHandler.hpp> -#include <comphelper/extract.hxx> #include <core_resource.hxx> #include <helpids.h> #include <strings.hrc> diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 77b16ab92162..d14ff39b183e 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -20,8 +20,6 @@ #include <formula/opcode.hxx> #include <rtl/ustring.hxx> -#include <comphelper/configurationlistener.hxx> - // have to match the registry values enum ScRecalcOptions { diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx index d7d6a45e9231..5db47d1baa3b 100644 --- a/sc/qa/unit/screenshots/screenshots.cxx +++ b/sc/qa/unit/screenshots/screenshots.cxx @@ -11,8 +11,6 @@ #include <test/screenshot_test.hxx> #include <com/sun/star/frame/Desktop.hpp> -#include <comphelper/dispatchcommand.hxx> -#include <comphelper/propertysequence.hxx> #include <comphelper/string.hxx> #include <editeng/editids.hrc> #include <editeng/editview.hxx> diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index a6e1ba765933..9acd3d3e8f02 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/processfactory.hxx> #include <svl/zforlist.hxx> #include <editeng/editeng.hxx> diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index dfe244b415f6..a0df3a54c575 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -18,6 +18,7 @@ */ #include <rtl/math.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <unotools/textsearch.hxx> #include <svl/zforlist.hxx> diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 6e4881eb1eab..4ce542a51b20 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -18,6 +18,7 @@ */ #include <scitems.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <editeng/eeitem.hxx> diff --git a/sc/source/core/tool/numformat.cxx b/sc/source/core/tool/numformat.cxx index 4d18dc4811a3..ec8bf642e5a6 100644 --- a/sc/source/core/tool/numformat.cxx +++ b/sc/source/core/tool/numformat.cxx @@ -22,6 +22,7 @@ #include <scitems.hxx> #include <document.hxx> +#include <comphelper/processfactory.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <svl/intitem.hxx> diff --git a/sc/source/core/tool/webservicelink.cxx b/sc/source/core/tool/webservicelink.cxx index 9dd5fa7007b8..e383ed7b2efd 100644 --- a/sc/source/core/tool/webservicelink.cxx +++ b/sc/source/core/tool/webservicelink.cxx @@ -8,6 +8,7 @@ */ #include <comphelper/fileformat.h> +#include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <osl/thread.h> #include <sfx2/linkmgr.hxx> diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 6ac14466b7d3..169d0d77de5e 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -25,6 +25,7 @@ #include <iterator> #include <set> #include <com/sun/star/i18n/ScriptType.hpp> +#include <comphelper/processfactory.hxx> #include <rtl/tencinfo.h> #include <vcl/font.hxx> #include <svl/zformat.hxx> diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 055663df4782..3ae429f68a90 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -74,6 +74,7 @@ #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> +#include <comphelper/processfactory.hxx> #include <o3tl/numeric.hxx> #include <o3tl/make_unique.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index 1bc8d595f63e..1e343ff57a38 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -25,6 +25,7 @@ #include <orcus/sax_parser_base.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> +#include <comphelper/processfactory.hxx> #include <string> #include <sstream> diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 18771bbb95e1..fd7aab6ddb23 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -26,7 +26,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include <sax/tools/converter.hxx> -#include <comphelper/extract.hxx> using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index f6610a62a010..f8095c33eabf 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -102,7 +102,6 @@ #include <rtl/ustrbuf.hxx> #include <tools/date.hxx> #include <i18nlangtag/lang.h> -#include <comphelper/extract.hxx> #include <o3tl/make_unique.hxx> using namespace com::sun::star; diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index a683169a3f28..6297a62c7c7a 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -45,7 +45,6 @@ #include <sax/tools/converter.hxx> #include <com/sun/star/sheet/DataImportMode.hpp> -#include <comphelper/extract.hxx> #include <memory> diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 0734511f3f96..069eae8d9ac0 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <comphelper/extract.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/packages/WrongPasswordException.hpp> diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 797b33f41132..0ed07439bec3 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -158,7 +158,6 @@ #include <queryentry.hxx> #include <markdata.hxx> #include <basic/sberrors.hxx> -#include <comphelper/anytostring.hxx> #include <cppuhelper/implbase.hxx> #include <global.hxx> diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index bcb4371d21a9..4fe117f8ac66 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <basic/sberrors.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 79642e890f17..ebcd120b6f87 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/reflection/XIdlMethod.hpp> #include <com/sun/star/beans/MethodConcept.hpp> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/anytostring.hxx> #include "vbawsfunction.hxx" #include <compiler.hxx> diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index ced2d021bc63..e494fd8a329b 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -66,8 +66,6 @@ #include <filter/msfilter/msvbahelper.hxx> #include <vbahelper/vbareturntypes.hxx> -#include <comphelper/anytostring.hxx> - #include <com/sun/star/script/XScriptListener.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/evtmethodhelper.hxx> diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 8c920a516973..86aa3707bf25 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -9,7 +9,6 @@ #include <officecfg/Office/Common.hxx> #include "sdmodeltestbase.hxx" #include <Outliner.hxx> -#include <comphelper/propertysequence.hxx> #include <svl/stritem.hxx> #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 4752a84d3529..fca7018e836d 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -9,7 +9,6 @@ #include <officecfg/Office/Common.hxx> #include "sdmodeltestbase.hxx" #include <Outliner.hxx> -#include <comphelper/propertysequence.hxx> #include <svl/stritem.hxx> #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index c22b35b88435..1e2645cd05a8 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -16,7 +16,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/dispatchcommand.hxx> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XModel2.hpp> diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 500a88caa103..36d6a82e251e 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -59,7 +59,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <editeng/outlobj.hxx> #include <unotools/saveopt.hxx> -#include <comphelper/extract.hxx> #include <comphelper/getexpandeduri.hxx> #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 00a605697fa8..e24a66466115 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -19,7 +19,6 @@ #include <memory> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <vcl/wrkwin.hxx> diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 39a7dbad141e..4adc5eeb4a49 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -66,7 +66,6 @@ #include <com/sun/star/embed/Aspects.hpp> #include <vcl/cvtgrf.hxx> #include <tools/urlobj.hxx> -#include <comphelper/extract.hxx> #include <rtl/crc.h> #include <comphelper/classids.hxx> #include <com/sun/star/text/FontRelief.hpp> diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 985d625b04d2..b643f883ae16 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -42,7 +42,6 @@ #include <ClientView.hxx> #include <FrameView.hxx> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index a33291e1c998..ee9fa6622aaa 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -21,6 +21,7 @@ #include <framework/FrameworkHelper.hxx> +#include <comphelper/sequence.hxx> #include <facreg.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 8f90ca9cd3b3..0e851cc5054f 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -27,7 +27,6 @@ #include <FormShellManager.hxx> #include <Window.hxx> -#include <comphelper/anytostring.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index be3b964aebb9..e7a25751d17f 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <vcl/svapp.hxx> #include <svx/svdpage.hxx> -#include <comphelper/extract.hxx> #include <cppuhelper/supportsservice.hxx> #include <createunocustomshow.hxx> diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 0c7f82daaa2d..1f0a1a0cb16e 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -22,7 +22,6 @@ #include <vcl/svapp.hxx> #include <svl/itemset.hxx> #include <svx/svdpool.hxx> -#include <comphelper/extract.hxx> #include <cppuhelper/supportsservice.hxx> #include <svx/xflbstit.hxx> #include <svx/xflbmtit.hxx> diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 1f488005e000..c46753cfc4b9 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -28,8 +28,6 @@ #include <svx/unoprov.hxx> #include <editeng/unotext.hxx> -#include <comphelper/extract.hxx> - #include <unoprnms.hxx> #include <unosrch.hxx> diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 432146681d78..b94f0713046a 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -38,6 +38,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <comphelper/sequence.hxx> #include <rtl/ustrbuf.hxx> #include <sfx2/printer.hxx> #include <editeng/editstat.hxx> diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index a4795358da72..7c8f6a0ce7e4 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -37,7 +37,6 @@ #include <svx/svdotable.hxx> #include <editeng/unolingu.hxx> #include <svx/svditer.hxx> -#include <comphelper/extract.hxx> #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <editeng/forbiddencharacterstable.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 9d56d48725a0..e0720ab65b33 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -46,6 +46,7 @@ #include <com/sun/star/util/CloseVetoException.hpp> #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp> +#include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/propertysequence.hxx> diff --git a/sfx2/source/control/charmapcontrol.cxx b/sfx2/source/control/charmapcontrol.cxx index 7c5a01e0874e..724c95f831a9 100644 --- a/sfx2/source/control/charmapcontrol.cxx +++ b/sfx2/source/control/charmapcontrol.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/propertysequence.hxx> #include <comphelper/dispatchcommand.hxx> #include <officecfg/Office/Common.hxx> #include <sfx2/charmapcontrol.hxx> diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index 7724f2df3a2b..971397c04322 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -20,7 +20,6 @@ #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> #include <sfx2/charwin.hxx> -#include <comphelper/propertysequence.hxx> #include <comphelper/dispatchcommand.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/app.hxx> diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 0bf38e6601dd..f05544d01ae0 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -65,7 +65,6 @@ #include <ucbhelper/content.hxx> #include <tools/urlobj.hxx> #include <unotools/useroptions.hxx> -#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/storagehelper.hxx> diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index f439ade3bce7..bc6bc750497f 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -25,7 +25,6 @@ #include <sfx2/viewsh.hxx> #include <sfx2/bindings.hxx> #include <com/sun/star/lang/NoSupportException.hpp> -#include <comphelper/anytostring.hxx> #include <comphelper/flagguard.hxx> #include <svl/undo.hxx> #include <tools/diagnose_ex.h> diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index a341bf3e8858..2d3093205eaa 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -17,7 +17,6 @@ #include <vcl/tabctrl.hxx> #include <sfx2/viewfrm.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/propertyvalue.hxx> #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> #include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp> #include <com/sun/star/util/URLTransformer.hpp> diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index 47c27adb2520..8571ec09d450 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -22,7 +22,6 @@ #include <sfx2/sidebar/Theme.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/namedvaluecollection.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/gradient.hxx> diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 7618ca605c02..6c7bc18bb719 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -66,6 +66,7 @@ #include <osl/mutex.hxx> #include <tools/diagnose_ex.h> +#include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequence.hxx> #include <rtl/ustrbuf.hxx> #include <toolkit/helper/convert.hxx> diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index dcb6fff399aa..e02d8fc8ab3c 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -29,7 +29,6 @@ #include <cppcanvas/basegfxfactory.hxx> #include <basegfx/range/b2drange.hxx> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/awt/MouseButton.hpp> diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 2c0b741d1884..77ff57810ec9 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -32,7 +32,6 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/fileformat.h> -#include <comphelper/uno3.hxx> #include <tools/stream.hxx> #include <vcl/svapp.hxx> diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 66bd38b9e665..eb7e739f0fbe 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -20,7 +20,6 @@ #include <tools/diagnose_ex.h> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index fd874a46c886..a43c258fd305 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/awt/FontSlant.hpp> #include <cppuhelper/exc_hlp.hxx> -#include <comphelper/anytostring.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 2dccbc09d516..b21266947441 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -20,7 +20,6 @@ #include <tools/diagnose_ex.h> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <shapesubset.hxx> diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 096efe6b1284..ebe4d43e5ff3 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -18,7 +18,6 @@ */ -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/awt/MouseButton.hpp> diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 5138517cc755..de8861a336c0 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -31,7 +31,6 @@ #include <comphelper/make_shared_from_uno.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/servicedecl.hxx> -#include <comphelper/namecontainer.hxx> #include <cppcanvas/spritecanvas.hxx> #include <cppcanvas/vclfactory.hxx> diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index e56bebccb03d..aba709c87c6f 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -20,7 +20,6 @@ #include <tools/diagnose_ex.h> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index c0f035761818..f32eaf500564 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -20,7 +20,6 @@ #include <tools/diagnose_ex.h> -#include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/awt/SystemPointer.hpp> diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx index c5dadb8a823e..2804e79a77e0 100644 --- a/slideshow/test/slidetest.cxx +++ b/slideshow/test/slidetest.cxx @@ -23,8 +23,6 @@ #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include <comphelper/broadcasthelper.hxx> - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drectangle.hxx> #include <cppcanvas/spritecanvas.hxx> diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx index dd09ce5ef9a8..0120380f0426 100644 --- a/slideshow/test/views.cxx +++ b/slideshow/test/views.cxx @@ -22,8 +22,6 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <comphelper/broadcasthelper.hxx> - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drectangle.hxx> #include <cppcanvas/spritecanvas.hxx> diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 7e9a110ff9c9..4de164ec6769 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -33,7 +33,6 @@ #include <svtools/fmtfield.hxx> -#include <comphelper/uno3.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/awt/XItemEventBroadcaster.hpp> diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index f214edc80361..ea92a77a77c0 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -20,7 +20,6 @@ #include <svtools/addresstemplate.hxx> #include <svtools/genericunodialog.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/extract.hxx> #include <comphelper/property.hxx> #include <comphelper/propertysequence.hxx> #include <com/sun/star/sdbc/XDataSource.hpp> diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 93e1ed34a94b..0ddbd77670a2 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/container/XChild.hpp> -#include <comphelper/uno3.hxx> #include <rtl/ustring.hxx> #include <tools/debug.hxx> diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index 28c96fa232a7..355ba12fcec9 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -30,7 +30,6 @@ #include <vcl/weld.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <comphelper/anytostring.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index 12027f312a42..af99ec1bd172 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -15,7 +15,6 @@ #include <sfx2/safemode.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <comphelper/anytostring.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ZipPackageHelper.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 8565db970e6f..d1ac997b1716 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -43,8 +43,6 @@ #include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp> #include <officecfg/Office/Common.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/dispatchcommand.hxx> -#include <comphelper/propertysequence.hxx> #include <comphelper/types.hxx> #include <svl/itemset.hxx> #include <unicode/uchar.h> diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 8dbd59722a1d..00c8c9b0a988 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <fmprop.hxx> -#include <comphelper/extract.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <comphelper/propertysetinfo.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 83e507a54eb2..0f982f884e2d 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -53,7 +53,6 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <comphelper/numbers.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <comphelper/string.hxx> diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 32bdc76ab2c9..e7c6fa716127 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -44,7 +44,6 @@ #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> -#include <comphelper/container.hxx> #include <comphelper/enumhelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index c6e4da5cc95d..9abd9b82a88b 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -36,7 +36,6 @@ #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/string.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqlnode.hxx> #include <cppuhelper/implbase.hxx> diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 6b64cd679b9e..b53e247e3f20 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -51,6 +51,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/component_context.hxx> #include <sfx2/bindings.hxx> #include <sfx2/childwin.hxx> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 9f488bfd098e..92900633d08d 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -56,6 +56,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> using namespace ::svxform; using namespace ::com::sun::star::uno; diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index ca79aba3845f..41abde23855a 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -43,6 +43,7 @@ #include <svx/fmtools.hxx> using namespace ::svxform; #include <comphelper/property.hxx> +#include <comphelper/types.hxx> using com::sun::star::uno::Reference; using com::sun::star::uno::UNO_QUERY; diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 417f84a1212c..d72e39af505f 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -43,7 +43,6 @@ #include <vcl/stdtext.hxx> #include <svx/dialmgr.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/types.hxx> #include <unotools/streamwrap.hxx> #include <connectivity/dbtools.hxx> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index c37dcd92a748..bd5047b276a3 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -44,7 +44,7 @@ #include <svx/fmsrcimp.hxx> #include <svx/fmsearch.hxx> -#include <comphelper/numbers.hxx> +#include <comphelper/types.hxx> #include <unotools/syslocale.hxx> #include <i18nutil/searchopt.hxx> diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 7b2655e6e0b9..39c9969705be 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -62,13 +62,10 @@ #include <basic/sbxvar.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#include <comphelper/container.hxx> -#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index cffafa9aa822..b29e55358a60 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -52,7 +52,6 @@ #include <sfx2/event.hxx> #include <osl/mutex.hxx> #include <comphelper/property.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/dbtools.hxx> using namespace ::com::sun::star::uno; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 30dd8add1b1d..ff339be116f2 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -71,10 +71,7 @@ #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/container/XContainer.hpp> -#include <comphelper/enumhelper.hxx> -#include <comphelper/extract.hxx> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/numbers.hxx> #include <comphelper/property.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 2632ed1e4f62..139147fd377e 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -67,7 +67,6 @@ #include <comphelper/enumhelper.hxx> #include <comphelper/interaction.hxx> -#include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propagg.hxx> #include <comphelper/property.hxx> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 129c16a08582..3effbc37375d 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -40,6 +40,7 @@ #include <sfx2/viewfrm.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 64311e2d9f44..0b9a98d44012 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -36,6 +36,7 @@ #include <sfx2/objsh.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/container/XContainer.hpp> +#include <comphelper/types.hxx> namespace svxform diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index fd1ce3a6f5a2..10dcebfe73fc 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -21,7 +21,6 @@ #include <svl/poolitem.hxx> -#include <comphelper/uno3.hxx> class FmInterfaceItem : public SfxPoolItem diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 26a17f84fba6..3e0a2503f149 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/container/XMap.hpp> #include <tools/link.hxx> -#include <comphelper/uno3.hxx> #include <cppuhelper/weakref.hxx> #include <svx/svxdllapi.h> diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 3763cf113525..8dd367b5a46e 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -39,7 +39,6 @@ #include <svl/lstner.hxx> -#include <comphelper/uno3.hxx> class FmFormModel; class FmFormObj; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 7f4c8ce594bc..8e77b3eeb641 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -43,7 +43,6 @@ #include <comphelper/stl_types.hxx> #include <tools/link.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/uno3.hxx> #include <rtl/ref.hxx> #include <vcl/vclptr.hxx> diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 3935a5ac9849..d2947eec551e 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <cppuhelper/compbase.hxx> -#include <comphelper/uno3.hxx> namespace svxform diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 6603f5a18e22..33afa53635a4 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -33,7 +33,6 @@ #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> #include <svx/shapepropertynotifier.hxx> -#include <comphelper/extract.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index eefb014e3501..878fd2ebf0de 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -60,7 +60,6 @@ #include <drawdoc.hxx> #include <oox/drawingml/drawingmltypes.hxx> #include <unotools/streamwrap.hxx> -#include <comphelper/propertysequence.hxx> #include <svx/svdpage.hxx> #include <editeng/unoprnms.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index 9fdcab559430..e3ae1ffad629 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -65,7 +65,6 @@ #include <drawdoc.hxx> #include <oox/drawingml/drawingmltypes.hxx> #include <unotools/streamwrap.hxx> -#include <comphelper/propertysequence.hxx> #include <svx/svdpage.hxx> #include <bordertest.hxx> diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx index 571c96e5d6a2..4e3299c6243d 100644 --- a/sw/qa/extras/rtfexport/rtfexport2.cxx +++ b/sw/qa/extras/rtfexport/rtfexport2.cxx @@ -45,7 +45,6 @@ #include <vcl/settings.hxx> #include <unotools/ucbstreamhelper.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <comphelper/configuration.hxx> #include <bordertest.hxx> diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 09fe4f488346..7b78f96eacc6 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -107,7 +107,6 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <comphelper/propertyvalue.hxx> #include <comphelper/configurationhelper.hxx> #include <editeng/unolingu.hxx> #include <vcl/scheduler.hxx> diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index f6b731ba2be1..856870f2cf4f 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -29,6 +29,7 @@ #include <tools/globname.hxx> #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <comphelper/types.hxx> #include <fmtanchr.hxx> #include <txtflcnt.hxx> #include <fmtcntnt.hxx> diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index ca641d8844e6..07bf6eaa6576 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XNodeList.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/propertyvalue.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <doc.hxx> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index ce893b951085..1f939e2e002d 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -90,7 +90,6 @@ #include <strings.hrc> #include <fmtline.hxx> #include <fmtfsize.hxx> -#include <comphelper/extract.hxx> #include <comphelper/string.hxx> #include "sprmids.hxx" diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 1bc236dccaa6..9a6db02f582b 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -80,7 +80,6 @@ #include <cmdid.h> #include <SwStyleNameMapper.hxx> -#include <comphelper/uno3.hxx> #include <tabsh.hxx> #include <swabstdlg.hxx> #include <strings.hrc> diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index 7f86aa969718..aa22d79fe830 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -31,11 +31,11 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> +#include <comphelper/types.hxx> #include <sfx2/frame.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> #include <dbmgr.hxx> -#include <comphelper/uno3.hxx> #include <svx/dataaccessdescriptor.hxx> #include <vcl/svapp.hxx> diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index ec3f2efe074f..011aa72e08df 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -41,7 +41,6 @@ #include <toolkit/helper/servicenames.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/controls/accessiblecontrolcontext.hxx> -#include <comphelper/container.hxx> #include <algorithm> #include <map> diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index 58e8d3acbe28..f15b085e9b14 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -19,7 +19,6 @@ #include "vbalistbox.hxx" #include "vbanewfont.hxx" -#include <comphelper/anytostring.hxx> #include <com/sun/star/form/validation/XValidatableFormComponent.hpp> #include <ooo/vba/msforms/fmMultiSelect.hpp> diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index b039d25d8d5a..b9fe20df099f 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -15,7 +15,6 @@ #include <com/sun/star/view/XPrintable.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/propertyvalue.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/implbase.hxx> #include <test/bootstrapfixture.hxx> diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 7c97657f022f..a2145ae6bcc2 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -57,7 +57,6 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> -#include <comphelper/extract.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index c2768d40adf0..848416b8a2fe 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -46,7 +46,6 @@ #include <xmloff/SchXMLSeriesHelper.hxx> #include <xexptran.hxx> #include <rtl/math.hxx> -#include <comphelper/extract.hxx> #include <vector> #include <typeinfo> diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index bc28f6c83226..df2597c458fe 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/drawing/XLayerSupplier.hpp> -#include <comphelper/extract.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 763c692ccf5d..1a2a3434fee7 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -64,7 +64,6 @@ #include <facreg.hxx> #include <xexptran.hxx> -#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <PropertySetMerger.hxx> diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 313461bccc3d..a04343009b6b 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -82,7 +82,6 @@ #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <comphelper/classids.hxx> -#include <comphelper/graphicmimetype.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <officecfg/Office/Common.hxx> diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 44fb29c84423..ed0a701d5976 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/extract.hxx> #include "ximp3dobject.hxx" #include <xmloff/XMLShapeStyleContext.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index 8023489dfd9a..f9a2405ac2b0 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -25,7 +25,6 @@ #include "layerexport.hxx" #include "propertyexport.hxx" #include <osl/diagnose.h> -#include <comphelper/extract.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include "officeforms.hxx" diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx index 40590ec97cd4..e9bf5926f130 100644 --- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx @@ -21,7 +21,6 @@ #include <XMLFillBitmapSizePropertyHandler.hxx> #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> -#include <comphelper/extract.hxx> #include <sax/tools/converter.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index a9c5c35d56f2..2e7349780ed2 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -116,7 +116,6 @@ #include <vector> #include <algorithm> #include <iterator> -#include <comphelper/graphicmimetype.hxx> #include <officecfg/Office/Common.hxx> using namespace ::std; |