diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-05-27 14:07:43 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-05 10:56:36 +0200 |
| commit | 8ddca0648a2b673b7dd5357871f79a83c3830ed8 (patch) | |
| tree | 33f6f1eaaa2d3f5f73ddbf25f40c60cbb365d663 | |
| parent | d3c650f6170894a87e59436cf48eba5622403e27 (diff) | |
tdf#42949 remove unused compheler includes ..
and fix the fallout
Change-Id: I15bc5d626f4d157cbc69a87392078b41e621d14e
Reviewed-on: https://gerrit.libreoffice.org/54882
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
576 files changed, 121 insertions, 577 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index f9ade6d25fa7..f5bf6416380b 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -19,7 +19,6 @@ #include <extended/AccessibleBrowseBoxBase.hxx> #include <svtools/accessibletableprovider.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 4497a93f496a..0a8ac6fa3d70 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -19,7 +19,6 @@ #include <extended/AccessibleBrowseBoxHeaderBar.hxx> #include <svtools/accessibletableprovider.hxx> -#include <comphelper/servicehelper.hxx> using ::com::sun::star::uno::Reference; diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 99e96920dc9d..b881cc468105 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -21,7 +21,6 @@ #include <svtools/accessibletableprovider.hxx> #include <tools/multisel.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> using css::uno::Reference; diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index a5a634feb129..6f2ab23735a9 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -19,7 +19,6 @@ #include <extended/AccessibleGridControlBase.hxx> #include <svtools/accessibletable.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <sal/types.h> diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 282aa582313c..296e236e2a5a 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -21,7 +21,6 @@ #include <extended/AccessibleGridControlHeaderCell.hxx> #include <extended/AccessibleGridControlTableCell.hxx> #include <svtools/accessibletable.hxx> -#include <comphelper/servicehelper.hxx> using ::com::sun::star::uno::Reference; diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index f18f13363c36..68bee622413d 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -21,7 +21,6 @@ #include <svtools/accessibletable.hxx> #include <tools/multisel.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> using css::uno::Reference; diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 1520a3db70eb..c965db29ac5d 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -35,7 +35,6 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <svtools/stringtransfer.hxx> #include <comphelper/accessibleeventnotifier.hxx> diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 2c9bafee467c..4d409d80299a 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -38,7 +38,6 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <helper/accresmgr.hxx> #include <strings.hrc> diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index fb2116f74852..ddbc03825c92 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -21,7 +21,6 @@ #include <extended/accessibletablistbox.hxx> #include <extended/accessibletablistboxtable.hxx> #include <svtools/svtabbx.hxx> -#include <comphelper/sequence.hxx> namespace accessibility diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 86a9946c0e12..efe3e79dc816 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -29,7 +29,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/menu.hxx> diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 0acbcca9bddd..ba5b930db03e 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -32,7 +32,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/accessibletexthelper.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 02412e3ce204..5ec472639640 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <strings.hxx> #include <vcl/button.hxx> diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index a0eff42c5874..6b979c18bfad 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <vcl/button.hxx> diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index a1085da19aa8..2ed7a72fc20c 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -32,7 +32,6 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/convert.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 1f0b827f38ac..c04cb8fc452f 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -31,7 +31,6 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/convert.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 118c9d85f6d0..bbc864d86eab 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/accessibility/AccessibleTextType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/string.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index b1faf0feb92e..b116060a2105 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -33,7 +33,6 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/convert.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 90f2ac4256fd..a519cef8f815 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -39,7 +39,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/accessibleeventnotifier.hxx> namespace diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 56fb3c1c61a3..4db841005697 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <vcl/window.hxx> #include <vcl/button.hxx> #include <strings.hxx> diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 7474691ad5e8..c515df91064f 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/awt/ScrollBarOrientation.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <vcl/scrbar.hxx> #include <strings.hxx> diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 851b20471dc8..75aeaf1d5b65 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/unohelp2.hxx> diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 20707c94b7e2..65b53191a3c9 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -41,7 +41,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <strings.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx index 349483f36194..3cd4a9e70f4f 100644 --- a/avmedia/source/avmediadummy.cxx +++ b/avmedia/source/avmediadummy.cxx @@ -34,8 +34,6 @@ #include <ucbhelper/content.hxx> -#include <comphelper/storagehelper.hxx> - using namespace ::com::sun::star; namespace avmedia diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 0fb8a2b7d5a0..70ed2f53c2dc 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -#include <comphelper/sequenceashashmap.hxx> #include <rtl/ustrbuf.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx index 2d4954700e55..d8ce12c316bc 100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.cxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/RepaintResult.hpp> #include <com/sun/star/rendering/TexturingMode.hpp> -#include <comphelper/sequence.hxx> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 56469e17ee72..3b1246cf15c9 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/rendering/PanoseProportion.hpp> #include <com/sun/star/rendering/XCanvasFont.hpp> #include <comphelper/scopeguard.hxx> -#include <comphelper/sequence.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/color.hxx> #include <tools/diagnose_ex.h> diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index b8003dd338d1..c65e73fd660a 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -38,7 +38,6 @@ #include <com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/rendering/TexturingMode.hpp> -#include <comphelper/sequence.hxx> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> #include <tools/poly.hxx> diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 2ef8b41ff185..9390c9ffe18b 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -26,7 +26,6 @@ #include <toolkit/awt/vclxwindow.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/servicehelper.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 81c28734ba6f..98065d3468bf 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_UNO_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_UNO_HXX +#include <comphelper/proparrhlp.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 9c3993095e47..a1c09e85fc87 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -61,7 +61,6 @@ #include <comphelper/lok.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> -#include <comphelper/sequence.hxx> #include <toolkit/awt/vclxmenu.hxx> diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 6c8312832bff..cdc0d0338a02 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -53,7 +53,6 @@ #include <vcl/cvtgrf.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/sequence.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <tools/diagnose_ex.h> diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index 884109279251..34c82c6e74c3 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -20,7 +20,6 @@ #include <comphelper/accessibleeventnotifier.hxx> #include <rtl/instance.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <comphelper/guarding.hxx> #include <map> #include <limits> diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index 2a2ef6b1c819..c73bd22cf163 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -21,7 +21,6 @@ #include <osl/mutex.hxx> #include <osl/conditn.hxx> #include <rtl/instance.hxx> -#include <comphelper/guarding.hxx> #include <cassert> #include <deque> diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index e1e95aee11a1..786d6d7885cd 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -19,8 +19,6 @@ #include <comphelper/componentmodule.hxx> -#include <comphelper/sequence.hxx> - #include <vector> namespace comphelper diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 93ce85d3779a..2bb428e9c8c6 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -30,7 +30,6 @@ #include <osl/mutex.hxx> #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> -#include <comphelper/servicehelper.hxx> using namespace ::osl; using namespace ::cppu; diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index 6768075320de..4ee79a43309d 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -18,7 +18,6 @@ */ #include <comphelper/propertycontainer.hxx> -#include <comphelper/property.hxx> #include <cppuhelper/typeprovider.hxx> #include <uno/data.h> #include <com/sun/star/uno/genfunc.h> diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index 5508677396b3..ec9ca1292319 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/propmultiplex.hxx> #include <osl/diagnose.h> diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index a3c6a2fc2251..51d449ad1bb0 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/interfacecontainer.h> #include <TConnection.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/java/JavaVirtualMachine.hpp> #if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 967c8b5696db..ae9731e3f61f 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -29,6 +29,7 @@ #include <comphelper/extract.hxx> #include <TConnection.hxx> #include <comphelper/numbers.hxx> +#include <comphelper/types.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index ec53891aae38..cfc283d7e86f 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/sdbc/KeyRule.hpp> #include <com/sun/star/sdbc/ProcedureResult.hpp> #include <com/sun/star/sdbc/IndexType.hpp> -#include <comphelper/property.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 700de660730a..6155ec09443b 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -30,7 +30,6 @@ #include <connectivity/dbtools.hxx> #include <TConnection.hxx> #include <connectivity/TTableHelper.hxx> -#include <comphelper/property.hxx> using namespace ::comphelper; diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index 6038be6262b2..966db4fc141c 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> -#include <comphelper/property.hxx> #include <connectivity/TIndex.hxx> #include <connectivity/TTableHelper.hxx> #include <TConnection.hxx> diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 33dabdd76a23..0157f5c41051 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -26,6 +26,7 @@ #include <connectivity/TTableHelper.hxx> #include <TConnection.hxx> #include <comphelper/extract.hxx> +#include <comphelper/types.hxx> #include <rtl/ustrbuf.hxx> using namespace connectivity; using namespace connectivity::sdbcx; diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index 1f774fd1440d..c31a616926c2 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/property.hxx> #include <TConnection.hxx> #include <connectivity/TTableHelper.hxx> diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 6736aae96c2e..34259d93e334 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/sdbc/KeyRule.hpp> #include <connectivity/dbtools.hxx> #include <comphelper/types.hxx> -#include <comphelper/property.hxx> #include <TConnection.hxx> namespace connectivity diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 7bb03a90da3c..48dab7e1f6b1 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sdbcx/VCollection.hxx> diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 603d003754f1..1540b49840e4 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -68,6 +68,7 @@ #include <comphelper/interaction.hxx> #include <comphelper/property.hxx> #include <comphelper/propertysequence.hxx> +#include <comphelper/types.hxx> #include <connectivity/conncleanup.hxx> #include <connectivity/dbconversion.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 1b9d480f8198..5faf1146e67e 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/container/XChild.hpp> +#include <comphelper/types.hxx> #include <tools/diagnose_ex.h> #include <unotools/sharedunocomponent.hxx> #include <algorithm> diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 97e80a56cc51..53498e1d43d6 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -34,7 +34,6 @@ #include <tools/diagnose_ex.h> -#include <comphelper/proparrhlp.hxx> #include <connectivity/ParameterCont.hxx> #include <rtl/ustrbuf.hxx> diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index ee727509d1c3..0289e4e55a23 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/types.hxx> #include <com/sun/star/lang/XComponent.hpp> #include "ZPooledConnection.hxx" #include "ZPoolCollection.hxx" diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index 1aa6374656c7..46ed4bfb32c3 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.cxx +++ b/connectivity/source/cpool/ZConnectionWrapper.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> using namespace connectivity; diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 962b57aa0a4c..236d758760d1 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -21,7 +21,6 @@ #include <ado/AConnection.hxx> #include <ado/Awrapado.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <comphelper/extract.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 67dc08a055e6..e0c8b49a2d01 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -21,7 +21,6 @@ #include <ado/AGroup.hxx> #include <ado/AUsers.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <ado/AConnection.hxx> diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index 6c0b385bc7f9..29ecf4d4d74b 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <ado/AColumns.hxx> #include <TConnection.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index bcf31b79d076..4393666d40be 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <ado/AColumns.hxx> #include <ado/AConnection.hxx> diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index e96b2dd9b031..559d7a7f101d 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -26,7 +26,6 @@ #include <ado/AConnection.hxx> #include <comphelper/types.hxx> #include <ado/Awrapado.hxx> -#include <comphelper/property.hxx> #include <connectivity/dbexception.hxx> #include <strings.hrc> diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 0c028794a6c3..09c4c397051d 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <ado/Awrapado.hxx> -#include <comphelper/sequence.hxx> #include <TConnection.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 50e270477ce9..cff7695c757d 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -21,7 +21,6 @@ #include <ado/ACatalog.hxx> #include <ado/AGroups.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <ado/AConnection.hxx> diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index 4b70bf767ddc..c2f0bc86d601 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -22,7 +22,6 @@ #include <ado/adoimp.hxx> #include <cppuhelper/typeprovider.hxx> #include <ado/Awrapado.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <TConnection.hxx> diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 828376f63986..65e79f2b5df0 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/sheet/XDatabaseRange.hpp> #include <FDatabaseMetaDataResultSet.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <comphelper/types.hxx> using namespace connectivity::calc; using namespace connectivity::file; diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index ffeaf9c79ccf..f1154f87dd68 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -41,7 +41,6 @@ #include <rtl/ustrbuf.hxx> #include <osl/thread.h> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx index 9c74fd8bc77f..943732fdbb36 100644 --- a/connectivity/source/drivers/calc/CTables.cxx +++ b/connectivity/source/drivers/calc/CTables.cxx @@ -25,7 +25,6 @@ #include <file/FCatalog.hxx> #include <file/FConnection.hxx> #include <calc/CCatalog.hxx> -#include <comphelper/types.hxx> using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/component/CTable.cxx b/connectivity/source/drivers/component/CTable.cxx index c31a7f6df349..c02635bf1fc1 100644 --- a/connectivity/source/drivers/component/CTable.cxx +++ b/connectivity/source/drivers/component/CTable.cxx @@ -40,12 +40,10 @@ #include <rtl/ustrbuf.hxx> #include <osl/thread.h> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbconversion.hxx> -#include <comphelper/types.hxx> using namespace connectivity; using namespace connectivity::component; diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index 1ffc95fbcfb1..c43caf4a4a8a 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -21,7 +21,6 @@ #include <dbase/DTable.hxx> #include <connectivity/sdbcx/VColumn.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <comphelper/property.hxx> using namespace connectivity::dbase; using namespace connectivity; diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 9468c3d3ad25..899e982fe433 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -21,7 +21,6 @@ #include <dbase/DIndexColumns.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <connectivity/sdbcx/VColumn.hxx> -#include <comphelper/sequence.hxx> #include <dbase/DTable.hxx> #include <dbase/DIndexIter.hxx> #include <osl/file.hxx> diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 5d144bf6f8d6..bdc774e95549 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -21,7 +21,6 @@ #include <dbase/DTable.hxx> #include <connectivity/sdbcx/VIndexColumn.hxx> #include <comphelper/types.hxx> -#include <comphelper/property.hxx> #include <connectivity/dbexception.hxx> using namespace ::comphelper; diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx index 643c67eeee40..541eb3287634 100644 --- a/connectivity/source/drivers/dbase/DIndexes.cxx +++ b/connectivity/source/drivers/dbase/DIndexes.cxx @@ -21,7 +21,6 @@ #include <dbase/DIndex.hxx> #include <connectivity/dbexception.hxx> #include <unotools/ucbhelper.hxx> -#include <comphelper/types.hxx> #include <strings.hrc> using namespace ::comphelper; diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index f0112d35a03e..3c2e3d832898 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -31,7 +31,6 @@ #include <dbase/DIndex.hxx> #include <dbase/DIndexes.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <unotools/syslocale.hxx> #include <rtl/math.hxx> diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 056b287aa994..99c192dd2751 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -31,7 +31,6 @@ #include <file/FConnection.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <dbase/DCatalog.hxx> -#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <strings.hrc> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 29fefcf4e80a..1913e5ed7e13 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -25,7 +25,6 @@ #include "NPreparedStatement.hxx" #include "NStatement.hxx" #include <connectivity/dbexception.hxx> -#include <comphelper/sequence.hxx> #include <rtl/ustring.hxx> using namespace connectivity::evoab; diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index e20b8adf8f7f..162c6da4aa6a 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/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index e3fc8f21b455..f964e1f7d355 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <file/FTable.hxx> -#include <comphelper/property.hxx> using namespace connectivity::file; using namespace connectivity; diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 765c7a542531..d7156147fcff 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -23,8 +23,6 @@ #include <sqlbison.hxx> #include <file/FDriver.hxx> #include <file/FResultSet.hxx> -#include <comphelper/property.hxx> -#include <comphelper/uno3.hxx> #include <osl/thread.h> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx index b41ea4e2d21b..dc8255dbda61 100644 --- a/connectivity/source/drivers/firebird/Tables.cxx +++ b/connectivity/source/drivers/firebird/Tables.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> +#include <comphelper/types.hxx> using namespace ::connectivity; using namespace ::connectivity::firebird; diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 33c6557737b2..c1ccf54dd815 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -30,8 +30,6 @@ #include <cppuhelper/queryinterface.hxx> #include <comphelper/numbers.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> -#include <comphelper/string.hxx> #include <comphelper/types.hxx> #include <flat/EDriver.hxx> #include <com/sun/star/util/NumberFormat.hpp> diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx index ebdaaa634703..f38b73e81167 100644 --- a/connectivity/source/drivers/flat/ETables.cxx +++ b/connectivity/source/drivers/flat/ETables.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <file/FCatalog.hxx> #include <file/FConnection.hxx> -#include <comphelper/types.hxx> using namespace connectivity; using namespace ::comphelper; diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 7da46daafb2f..04d58a33a1b3 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -33,8 +33,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData2.hpp> -#include <comphelper/listenernotification.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 9facdd3660b6..bf55c45cf975 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -45,7 +45,6 @@ #include <osl/process.h> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <unotools/confignode.hxx> diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index 2c738f15f37f..e6a84d46bed5 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> -#include <comphelper/types.hxx> #include <hsqldb/HStorageAccess.hxx> #include <hsqldb/HStorageMap.hxx> diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx index 56c0fbdf6856..bd6229d0566e 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> -#include <comphelper/types.hxx> #include <hsqldb/HStorageAccess.hxx> #include <hsqldb/HStorageMap.hxx> diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index f52c8ad891b9..97f34155dc0d 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -19,7 +19,6 @@ #include <java/sql/Timestamp.hxx> #include <java/tools.hxx> -#include <comphelper/types.hxx> #include <connectivity/dbconversion.hxx> using namespace ::comphelper; diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 3f6ce867a801..15eb853b19dd 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -23,7 +23,6 @@ #include "MacabHeader.hxx" #include "MacabRecord.hxx" -#include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> namespace connectivity diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 95094265e508..b78954531b93 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -21,6 +21,7 @@ #include <mysql/YCatalog.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbcharset.hxx> diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 4f096b5fffc2..278a3595095b 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -30,7 +30,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/proparrhlp.hxx> -#include <comphelper/uno3.hxx> #include <ado/AConnection.hxx> #include <vector> #include <ado/Awrapado.hxx> diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index bb759444fe5c..f70568e8f31e 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -31,7 +31,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> #include <file/FConnection.hxx> #include <file/filedllapi.hxx> diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index b88e1227de1c..4df9a546dafe 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index a6cde3aa2ac3..62cbe81547d2 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -30,7 +30,6 @@ #include <comphelper/proparrhlp.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index fc4b7b35f493..a44f6604802b 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 29d4f51612ba..5beaf9bb6fb3 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -31,7 +31,6 @@ #include <comphelper/proparrhlp.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> #include <odbc/OFunctions.hxx> #include <odbc/OConnection.hxx> diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index 96f32461871e..b10fd7882917 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/types.hxx> #include <connectivity/sdbcx/VCatalog.hxx> #include <connectivity/sdbcx/VCollection.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <connectivity/sdbcx/VDescriptor.hxx> #include <TConnection.hxx> -#include <comphelper/uno3.hxx> #include <connectivity/dbtools.hxx> using namespace connectivity; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 25e9b1b3f1a3..f0b867272651 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -19,7 +19,6 @@ #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/anytostring.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx index cc81e230ddfa..74f8a9b5d0cd 100644 --- a/cui/source/customize/SvxConfigPageHelper.cxx +++ b/cui/source/customize/SvxConfigPageHelper.cxx @@ -19,6 +19,8 @@ #include <SvxConfigPageHelper.hxx> +#include <comphelper/random.hxx> + static sal_Int16 theImageType = css::ui::ImageType::COLOR_NORMAL | css::ui::ImageType::SIZE_DEFAULT; diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 9b69c64a1374..826814b9248c 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -61,7 +61,6 @@ #include <dialmgr.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/random.hxx> #include <unotools/configmgr.hxx> #include <o3tl/make_unique.hxx> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index bdca809fd326..9cbad5b1d65d 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -61,7 +61,6 @@ #include <dialmgr.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/random.hxx> #include <unotools/configmgr.hxx> #include <o3tl/make_unique.hxx> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx index 0753ecf30298..fa7df5861b71 100644 --- a/cui/source/dialogs/SignSignatureLineDialog.cxx +++ b/cui/source/dialogs/SignSignatureLineDialog.cxx @@ -15,8 +15,6 @@ #include <strings.hrc> #include <comphelper/processfactory.hxx> -#include <comphelper/storagehelper.hxx> -#include <comphelper/xmltools.hxx> #include <tools/stream.hxx> #include <unotools/streamwrap.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 21d06cd6a0d5..91fa1b76a815 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -50,8 +50,6 @@ #include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/propertycontainer.hxx> -#include <comphelper/proparrhlp.hxx> #include <basic/sbx.hxx> #include <svtools/imagemgr.hxx> diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 5438f48a625e..2b566bcfdfda 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/random.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 5b6538eb65dc..454fe099c253 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -42,8 +42,6 @@ #include <unotools/syslocaleoptions.hxx> #include <unotools/configitem.hxx> #include <sfx2/objsh.hxx> -#include <comphelper/string.hxx> -#include <comphelper/types.hxx> #include <comphelper/propertysequence.hxx> #include <svtools/langtab.hxx> #include <unotools/localfilehelper.hxx> diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 3f8c0cb794da..527c8ee8985c 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -60,8 +60,6 @@ #define CLASSPATH_DELIMITER SAL_PATHSEPARATOR -#include <comphelper/solarmutex.hxx> - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index ae321e6a8fd2..6091c2e84eda 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -23,7 +23,6 @@ #include <comphelper/processfactory.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/saveopt.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index c6e4a8952c6f..19874430deec 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -50,7 +50,6 @@ #include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <vcl/GraphicObject.hxx> -#include <comphelper/lok.hxx> #include <svx/unobrushitemhelper.hxx> diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index efaa03fbbe20..2425b08b68af 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <swpossizetabpage.hxx> diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 7fff37490a36..ce0016bfbc3a 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <comphelper/types.hxx> #include <cppuhelper/typeprovider.hxx> using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 5cb93dd40bf9..ae9cf694e891 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -23,6 +23,7 @@ #include <RefreshListener.hxx> #include <sdbcoretools.hxx> #include <com/sun/star/sdbc/XRow.hpp> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <tools/wldcrd.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index f7c7f95cdac5..0ce715ed1a8a 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -55,7 +55,6 @@ #include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <comphelper/interaction.hxx> #include <comphelper/property.hxx> #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index a4b082a21583..4c3f5706935b 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -43,7 +43,6 @@ #include <comphelper/extract.hxx> #include <comphelper/property.hxx> -#include <comphelper/seqstream.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqliterator.hxx> diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 4a8373d1ee85..08be66c40108 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -35,8 +35,6 @@ #include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbcx/XDeleteRows.hpp> -#include <comphelper/propertycontainer.hxx> -#include <comphelper/proparrhlp.hxx> #include "RowSetRow.hxx" #include "RowSetCacheIterator.hxx" diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index 673af3d290c5..11337dec7cb6 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -22,7 +22,6 @@ #include <rtl/ref.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/FValue.hxx> -#include <comphelper/types.hxx> #include <salhelper/simplereferenceobject.hxx> namespace dbaccess diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index e7a7af6870e9..6e0797e55f84 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -44,7 +44,6 @@ #include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/util/NumberFormatter.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index a57883ba2ba2..d2798165b36c 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -27,7 +27,6 @@ #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <com/sun/star/util/XRefreshListener.hpp> diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index 64a91cdbcb48..cbf9ad8ab874 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/property.hxx> #include <stringconstants.hxx> #include <strings.hxx> diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index fcbd4e9fb456..c344b31c21a6 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -29,10 +29,9 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <comphelper/property.hxx> -#include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> +#include <comphelper/uno3.hxx> #include <connectivity/TTableHelper.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index ac10ab6c5d8f..37ec588f4de3 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -20,7 +20,6 @@ #include <datasettings.hxx> #include <apitools.hxx> #include <stringconstants.hxx> -#include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 69e5138d689a..5f7926ce34c0 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -24,8 +24,6 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index de12b938c00e..6e1eca3faaa5 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -28,8 +28,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <comphelper/propagg.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 8215be2e48ce..26bbec26c13d 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -36,7 +36,6 @@ #include <osl/diagnose.h> #include <comphelper/uno3.hxx> #include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/exc_hlp.hxx> using namespace dbtools; diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 84b4ae657bfa..1ec9a990b97e 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -22,8 +22,6 @@ #include "querydescriptor.hxx" #include <apitools.hxx> #include <stringconstants.hxx> -#include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -35,7 +33,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; -using namespace ::comphelper; using namespace ::osl; using namespace ::cppu; diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 400838008388..6698429bc03e 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <column.hxx> #include <boost/optional.hpp> +#include <comphelper/proparrhlp.hxx> namespace dbaccess { diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 4942597e9774..ae663eaf5c84 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -26,7 +26,6 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index 1a63e8b7f99a..aaff69dada25 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -22,7 +22,6 @@ #include <stringconstants.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <comphelper/sequence.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index eec18f7a8952..3590e93613aa 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -28,7 +28,6 @@ #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <com/sun/star/util/XRefreshListener.hpp> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 72dbde0c2e44..41de9c5f995c 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -22,7 +22,6 @@ #include <stringconstants.hxx> #include <osl/diagnose.h> -#include <comphelper/sequence.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/property.hxx> #include <comphelper/propertysequence.hxx> diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index adc7ea3839d5..58f78745a4bc 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMPONENTDEFINITION_HXX #include <commandbase.hxx> -#include <comphelper/propertycontainer.hxx> #include <com/sun/star/sdbcx/XRename.hpp> #include <cppuhelper/implbase1.hxx> #include <comphelper/proparrhlp.hxx> diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 18db105b95d9..39f341ddb901 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -21,7 +21,6 @@ #include <ContentHelper.hxx> #include <rtl/ustrbuf.hxx> #include <ucbhelper/cancelcommandexecution.hxx> -#include <comphelper/property.hxx> #include <com/sun/star/ucb/UnsupportedCommandException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> @@ -47,7 +46,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::util; using namespace ::com::sun::star::embed; using namespace ::com::sun::star::container; -using namespace ::comphelper; using namespace ::cppu; OContentHelper_Impl::OContentHelper_Impl() diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index af71c72510c4..0e1df6750176 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -41,9 +41,6 @@ #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> -#include <comphelper/interaction.hxx> -#include <comphelper/seqstream.hxx> -#include <comphelper/sequence.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 57ba4ebae1f8..47d08357a5a7 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -22,7 +22,6 @@ #include <apitools.hxx> #include <osl/diagnose.h> -#include <comphelper/sequence.hxx> #include <comphelper/enumhelper.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 59a530e71662..112a0eaa2b7c 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -29,7 +29,6 @@ #include <ContentHelper.hxx> #include "ComponentDefinition.hxx" -#include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 0e548f9508d7..a17325b2e1e8 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -45,7 +45,6 @@ #include <com/sun/star/sdb/application/XTableUIProvider.hpp> #include <cppuhelper/implbase13.hxx> -#include <comphelper/stl_types.hxx> #include <connectivity/ConnectionWrapper.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/warningscontainer.hxx> diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 3f4a443abaa1..85683e6a5367 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -54,7 +54,6 @@ #include <comphelper/enumhelper.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index e147cf0281de..516766ca81e3 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -65,10 +65,8 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/enumhelper.hxx> #include <comphelper/genericpropertyset.hxx> -#include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/numberedcollection.hxx> -#include <comphelper/property.hxx> #include <comphelper/storagehelper.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index ffe45b4521a0..4f1bb6d477be 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -50,11 +50,9 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/view/XPrintable.hpp> -#include <comphelper/guarding.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/interaction.hxx> #include <comphelper/property.hxx> -#include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <connectivity/dbexception.hxx> diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index ae52ecc5e67b..4acaa00fcc52 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -26,7 +26,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <comphelper/sequence.hxx> #include <comphelper/enumhelper.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index b48f27ba0144..cf72ef2d2520 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -23,7 +23,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/classids.hxx> @@ -93,9 +92,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <comphelper/mimeconfighelper.hxx> -#include <comphelper/storagehelper.hxx> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index c54dc9ee95a1..a6837692d691 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <cppuhelper/weak.hxx> -#include <comphelper/types.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 21616edaa3da..cb63c28eb9c2 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -35,8 +35,6 @@ #include <cppuhelper/propertysetmixin.hxx> #include <cppuhelper/implementationentry.hxx> -#include <comphelper/sequence.hxx> - #include <connectivity/parameters.hxx> #include <connectivity/filtermanager.hxx> diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx index 4a763c577912..ab4276c4e5cf 100644 --- a/dbaccess/source/core/inc/ModelImpl.hxx +++ b/dbaccess/source/core/inc/ModelImpl.hxx @@ -56,8 +56,6 @@ #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/proparrhlp.hxx> -#include <comphelper/sharedmutex.hxx> #include <comphelper/solarmutex.hxx> #include <connectivity/CommonTools.hxx> #include <cppuhelper/propshlp.hxx> diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index f32a00f6c8d8..eca1a728e841 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -39,7 +39,6 @@ #include <com/sun/star/sdbcx/XDrop.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/FValue.hxx> diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index 8ec104584b2c..b7683f30e709 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/container/XChild.hpp> #include <comphelper/IdPropArrayHelper.hxx> +#include <comphelper/proparrhlp.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 28ae2b42470e..0b4b284558df 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -35,7 +35,6 @@ #include "column.hxx" #include <connectivity/CommonTools.hxx> #include <connectivity/TTableHelper.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/IdPropArrayHelper.hxx> namespace dbaccess diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx index c2ed8b02f66f..1ba2e973cb63 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/frame/XStorable.hpp> +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> namespace dbmm diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 1c4c26f435cd..8e17e81c6f58 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -51,10 +51,8 @@ #include <com/sun/star/io/XInputStreamProvider.hpp> #include <comphelper/documentinfo.hxx> -#include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <tools/diagnose_ex.h> #include <rtl/ustrbuf.hxx> diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 410c3cfa501e..0872891cf1e3 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -55,7 +55,6 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/types.hxx> #include <comphelper/propertysequence.hxx> diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 8afd0c9190bd..e81ab45933f3 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -27,7 +27,6 @@ #include <strings.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <comphelper/sequence.hxx> #include <svl/filenotation.hxx> #include <unotools/pathoptions.hxx> #include <dsntypes.hxx> diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index e9889c442f83..39e470259e2b 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -19,7 +19,6 @@ #include <memory> #include "AppController.hxx" -#include <comphelper/sequence.hxx> #include <comphelper/property.hxx> #include <core_resource.hxx> #include <stringconstants.hxx> @@ -43,7 +42,6 @@ #include <com/sun/star/sdbcx/XDrop.hpp> #include <unotools/ucbhelper.hxx> #include <dlgsave.hxx> -#include <comphelper/types.hxx> #include <vcl/weld.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 78931828a8dd..8a2e9d1419e3 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -24,7 +24,6 @@ #include <vcl/toolbox.hxx> #include <unotools/configmgr.hxx> #include <vcl/waitobj.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 18241bf19778..d5ce5952b3a9 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> #include <dbaccess/dataview.hxx> -#include <comphelper/types.hxx> #include <comphelper/namedvaluecollection.hxx> #include <sfx2/app.hxx> #include <dbaccess/IController.hxx> diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 97c56ae88f92..2836c3bfd6af 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/sdbc/XDataSource.hpp> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <toolkit/awt/vclxwindow.hxx> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 5556e0f02cc6..0f83166db4e1 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -32,6 +32,7 @@ #include <sbagrid.hxx> #include <dlgattr.hxx> #include <dlgsize.hxx> +#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/form/ControlFontDialog.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index c884e31e55f5..4f22d829ff10 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -48,7 +48,7 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> #include <comphelper/numbers.hxx> -#include <comphelper/string.hxx> +#include <comphelper/types.hxx> #include <UITools.hxx> #include <strings.hrc> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index f25f0cde10e5..e78cde9de379 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -35,7 +35,6 @@ #include <vcl/weld.hxx> #include <sfx2/filedlghelper.hxx> #include <dbadmin.hxx> -#include <comphelper/types.hxx> #include <vcl/stdtext.hxx> #include <sqlmessage.hxx> #include "odbcconfig.hxx" diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 9575384f1009..ea87983a665d 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -36,7 +36,6 @@ #include <helpids.h> #include <osl/process.h> #include <dbadmin.hxx> -#include <comphelper/types.hxx> #include <vcl/stdtext.hxx> #include <sqlmessage.hxx> #include "odbcconfig.hxx" diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index a6f2203eed6d..d9a96fa9b5cd 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -29,7 +29,6 @@ #include <dsitems.hxx> #include <osl/process.h> #include <dbadmin.hxx> -#include <comphelper/types.hxx> #include <vcl/stdtext.hxx> #include <sqlmessage.hxx> #include "odbcconfig.hxx" diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index b2ca1e21182e..3334dac786e4 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -41,7 +41,6 @@ #include <connectivity/CommonTools.hxx> #include "DriverSettings.hxx" #include <dbadmin.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 0cce73ebbba6..a0318b05d6be 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -52,11 +52,8 @@ #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp> #include <com/sun/star/ucb/AuthenticationRequest.hpp> -#include <comphelper/guarding.hxx> #include <comphelper/interaction.hxx> -#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/string.hxx> #include <connectivity/DriversConfig.hxx> #include <connectivity/dbexception.hxx> #include <osl/file.hxx> diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index f036b655d8cb..a26ae5b69b2f 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -42,7 +42,6 @@ #include "DriverSettings.hxx" #include <dbadmin.hxx> #include <comphelper/string.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> #include <svl/filenotation.hxx> #include <unotools/localfilehelper.hxx> diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 0daf9f8f13d9..e3cf3e7f28e6 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -20,7 +20,6 @@ #include "UserAdmin.hxx" #include <UITools.hxx> #include <dbu_dlg.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/sdbcx/XUsersSupplier.hpp> diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 37a1db875882..f00712dc408c 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -30,6 +30,7 @@ #include <UserAdminDlg.hxx> #include <connectivity/dbmetadata.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 03b520739f25..fc6bd8996ae1 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -74,7 +74,6 @@ #include <svl/filenotation.hxx> #include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <connectivity/DriversConfig.hxx> diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index a78a7526416d..e5300105392a 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -43,7 +43,6 @@ #include <connectivity/CommonTools.hxx> #include "DriverSettings.hxx" #include <dbadmin.hxx> -#include <comphelper/types.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 3c6485405282..5b4ee249b4b1 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/types.hxx> #include <dsitems.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 36aa35494d20..425c9e0936df 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -25,6 +25,7 @@ #include <commontypes.hxx> #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <stringconstants.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 7015be4581db..948803be278e 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -22,6 +22,7 @@ #include <svtools/genericunodialog.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <comphelper/proparrhlp.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index fec1afc95b63..0ab2ec4c0614 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -69,6 +69,7 @@ #include <TypeInfo.hxx> #include <FieldDescriptions.hxx> #include <comphelper/stl_types.hxx> +#include <comphelper/types.hxx> #include <comphelper/propertysequence.hxx> #include <svx/svxids.hrc> diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 301fac338545..676b26cbf92f 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/sequence.hxx> #include <connectivity/dbtools.hxx> #include <osl/diagnose.h> #include <toolkit/helper/vclunohelper.hxx> diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 136e83014e5a..d3003aa2aac9 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbmetadata.hxx> diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index a76706572b2d..34efc1019ae5 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -19,7 +19,6 @@ #include <sfx2/sfxsids.hrc> #include <browserids.hxx> -#include <comphelper/types.hxx> #include <stringconstants.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/container/XChild.hpp> @@ -36,8 +35,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <connectivity/dbexception.hxx> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <comphelper/streamsection.hxx> -#include <comphelper/seqstream.hxx> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <sqlmessage.hxx> diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index f3eced0bc113..d93e8a36a50a 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -24,7 +24,6 @@ #include <adtabdlg.hxx> #include <vcl/svapp.hxx> #include <browserids.hxx> -#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index b5acfc05bbcd..cba04bb093e9 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include "TableFieldInfo.hxx" -#include <comphelper/string.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 077376b66ceb..abce427f98e7 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -37,7 +37,6 @@ #include <strings.hxx> #include <unotools/configmgr.hxx> #include <comphelper/string.hxx> -#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <com/sun/star/i18n/XLocaleData.hpp> diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index a2da22fc1304..1b192ce1dcca 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -27,7 +27,6 @@ #include <stringconstants.hxx> #include <vcl/split.hxx> #include <vcl/svapp.hxx> -#include <comphelper/types.hxx> #include <QueryDesignView.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 39f1c0a5866e..455adc02121d 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -27,7 +27,6 @@ #include <browserids.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/string.hxx> -#include <comphelper/types.hxx> #include "TableFieldInfo.hxx" #include <core_resource.hxx> #include <strings.hrc> diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 25ce126c306d..6aede7e64b54 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -21,7 +21,6 @@ #include <ConnectionLine.hxx> #include <TableConnectionData.hxx> #include <JoinTableView.hxx> -#include <comphelper/stl_types.hxx> #include <ConnectionLineAccess.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 8f065adb3a43..f7659b211088 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -68,8 +68,6 @@ #include <comphelper/propertysequence.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> -#include <comphelper/seqstream.hxx> -#include <comphelper/streamsection.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 78ffb0d342d8..1ccb6d649d12 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -52,8 +52,6 @@ #include <connectivity/dbexception.hxx> #include <connectivity/dbmetadata.hxx> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <comphelper/streamsection.hxx> -#include <comphelper/seqstream.hxx> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <sqlmessage.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index eafa83720b28..6b46690fb5b8 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -23,7 +23,6 @@ #include <svl/undo.hxx> #include <vcl/svapp.hxx> #include <browserids.hxx> -#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 2346efadd685..86b5b44e48be 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <stringconstants.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/sequence.hxx> #include <helpids.h> #include <RelationDesignView.hxx> #include <JoinController.hxx> diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index de6d7fef6aa1..71c6e722fecc 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -56,7 +56,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/streamsection.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 683d84c2abe7..748b47ff8a5c 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -25,7 +25,6 @@ #include "TableFieldDescWin.hxx" #include <TableRow.hxx> #include <unotools/configmgr.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <unotools/syslocale.hxx> #include <vcl/settings.hxx> diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 8f1d34334555..4b361e5ef3e6 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -24,6 +24,7 @@ #include <dbu_reghelper.hxx> #include <advancedsettingsdlg.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/proparrhlp.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 716add82c7db..63799e50dabf 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -26,7 +26,6 @@ #include <cppuhelper/queryinterface.hxx> #include <stringconstants.hxx> #include <dbu_reghelper.hxx> -#include <comphelper/property.hxx> extern "C" void createRegistryInfo_OColumnControlModel() { diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 6be18eba68df..7177ace3845b 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { class ODBTypeWizDialog final diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index d70aac205b57..a65062ce083e 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { class ODBTypeWizDialogSetup final diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 3a8d9b7f3f6e..075f703f4c2b 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index b7b7cc66e469..3d54cc9e3940 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { // OUserSettingsDialog diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index e0e80e8586ae..394ad2db53c2 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { class ODataSourcePropertyDialog final diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index ddc09cb37d32..5ceef84c9fb9 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> #include <apitools.hxx> diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 965fd6291a98..46f17eb47a45 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/sdb/XTextConnectionSettings.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> #include <cppuhelper/implbase.hxx> diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index c100adee7dd5..9855e31cf1bf 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> +#include <comphelper/proparrhlp.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 7c665ce21ef3..c19e4d09c9f3 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -23,7 +23,6 @@ #include <unoadmin.hxx> #include <dbadmin.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/property.hxx> // --- needed because of the solar mutex #include <osl/mutex.hxx> diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 620377d60e62..3a59f5cfd854 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -35,7 +35,6 @@ #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 4fb84d39d2d1..372598abdb9d 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -36,7 +36,6 @@ #include <vcl/svmain.hxx> #include <com/sun/star/beans/NamedValue.hpp> -#include <comphelper/storagehelper.hxx> #include <cppuhelper/bootstrap.hxx> #include <unotools/mediadescriptor.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 5db21a5a40ca..d6755d83d135 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_THEEXTMGR_HXX -#include <comphelper/sequence.hxx> - #include <cppuhelper/implbase.hxx> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 1bab915f178b..50b9d59018c2 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -20,7 +20,6 @@ #include <cppuhelper/implementationentry.hxx> #include <unotools/configmgr.hxx> -#include <comphelper/servicedecl.hxx> #include <comphelper/unwrapargs.hxx> #include <i18nlangtag/mslangid.hxx> #include <vcl/svapp.hxx> diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 3d91177d7e58..31ad83643550 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -29,7 +29,6 @@ #include <sal/log.hxx> #include <osl/file.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <comphelper/servicedecl.hxx> #include <comphelper/unwrapargs.hxx> #include <ucbhelper/content.hxx> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx index 1baf274b386b..4b566d106d01 100644 --- a/desktop/source/lib/lokinteractionhandler.cxx +++ b/desktop/source/lib/lokinteractionhandler.cxx @@ -43,7 +43,6 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <sfx2/lokhelper.hxx> #include <sfx2/viewsh.hxx> -#include <comphelper/lok.hxx> using namespace com::sun::star; diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index ee3d4f12cb2d..3397b46e964a 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -21,7 +21,6 @@ #include "FmtFilter.hxx" #include <osl/diagnose.h> -#include <comphelper/sequence.hxx> #include <shobjidl.h> #include <shlguid.h> diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index d4e8d018a0a1..b8bf944a64ec 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -28,7 +28,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <comphelper/accessibleeventnotifier.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 90481112cca1..40f4a8619cfd 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -18,7 +18,6 @@ */ #include <memory> -#include <comphelper/string.hxx> #include <vcl/wrkwin.hxx> #include <vcl/dialog.hxx> #include <vcl/svapp.hxx> diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index dbba13a7a3bf..aca013ad748b 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -18,7 +18,6 @@ */ #include <memory> -#include <comphelper/string.hxx> #include <rtl/strbuf.hxx> #include <vcl/wrkwin.hxx> #include <vcl/dialog.hxx> diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index d90fbc522688..eca2d4a7ec78 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <osl/file.hxx> #include <vcl/metaact.hxx> #include <svl/zforlist.hxx> diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 0813021dd4e3..957c6f9edb4a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -53,7 +53,6 @@ #include <vcl/GraphicObject.hxx> #include <tools/urlobj.hxx> #include <comphelper/fileformat.h> -#include <comphelper/types.hxx> #include <svl/memberid.h> #include <svtools/borderhelper.hxx> #include <rtl/ustring.hxx> diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 338c9b51e161..2941aabcdc09 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -26,7 +26,6 @@ #include <comphelper/extract.hxx> #include <osl/diagnose.h> #include <unotools/syslocale.hxx> -#include <comphelper/types.hxx> #include <tools/mapunit.hxx> #include <svl/itempool.hxx> #include <editeng/editrids.hrc> diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index fff084f04427..9e20c30cc4ce 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <vcl/outdev.hxx> #include <vcl/print.hxx> #include <tools/gen.hxx> diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index 15ad7950bc90..4c50307dcc43 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XComponent.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weakref.hxx> #include <editeng/unopracc.hxx> diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 43d803c3d340..cf2a7f8aa4b9 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -24,7 +24,6 @@ #include <editeng/flditem.hxx> #include <editeng/unofield.hxx> #include <editeng/unotext.hxx> -#include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 09512a28ccfb..7b4a27ead172 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -36,6 +36,7 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> +#include <osl/diagnose.h> #include <specialobject.hxx> #include <intercept.hxx> diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx index 987792c5431a..a551fd5b0c79 100644 --- a/embeddedobj/source/inc/intercept.hxx +++ b/embeddedobj/source/inc/intercept.hxx @@ -22,7 +22,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XInterceptorInfo.hpp> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index cd9ac6e142f8..03e49fc83115 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -34,7 +34,6 @@ #include <cppuhelper/interfacecontainer.h> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/storagehelper.hxx> #include <osl/file.hxx> #include <rtl/ref.hxx> #include <o3tl/char16_t2wchar_t.hxx> diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index e9078734d2a9..f117496a6ef4 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -48,7 +48,6 @@ #include <cppuhelper/interfacecontainer.h> #include <comphelper/processfactory.hxx> #include <comphelper/mimeconfighelper.hxx> -#include <comphelper/storagehelper.hxx> #include <targetstatecontrol.hxx> diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 562b8692a38b..f1fc23d2ebe8 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -23,7 +23,6 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <svl/solar.hrc> -#include <comphelper/sequence.hxx> #include <tools/debug.hxx> #include <rtl/strbuf.hxx> @@ -32,7 +31,6 @@ namespace compmodule using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; - using namespace ::comphelper; using namespace ::cppu; OUString ModuleRes(const char* pId) diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 939f6287f64d..75668b430abf 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -18,6 +18,8 @@ */ #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MASTERDETAILLINKDIALOG_HXX #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MASTERDETAILLINKDIALOG_HXX + +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> #include "modulepcr.hxx" diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index 980441320064..d5fb90d0b67f 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLFONTDIALOG_HXX #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLFONTDIALOG_HXX +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> #include "modulepcr.hxx" diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index 5cf57aa3283c..1781c6093e30 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/form/binding/XListEntrySource.hpp> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> -#include <comphelper/listenernotification.hxx> #include <vector> #include <set> diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 82aff7da34b0..7c461c6e0bc4 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase.hxx> -#include <comphelper/listenernotification.hxx> namespace pcr diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 48d85f9be880..6f4224e9e2dc 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -23,6 +23,7 @@ #include "modulepcr.hxx" #include <com/sun/star/awt/XTabControllerModel.hpp> #include <com/sun/star/awt/XControlContainer.hpp> +#include <comphelper/proparrhlp.hxx> namespace pcr diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 08adeb1dab75..fd7818eeb8c5 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/beans/PropertyVetoException.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/listenernotification.hxx> #include <memory> #include <vector> diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 492721abedbb..90ba6e5cbc58 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -34,8 +34,8 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> -#include <comphelper/sequence.hxx> #include <connectivity/dbconversion.hxx> +#include <osl/diagnose.h> #include <strings.hrc> #include <yesno.hrc> #include "pcrservices.hxx" diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index c444ddf02328..3315ab088832 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/document/XExporter.hpp> +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index ce6a2a0f407d..278d887e9753 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -23,6 +23,7 @@ #include "pdffilter.hxx" #include <svtools/genericunodialog.hxx> +#include <comphelper/proparrhlp.hxx> #include <cppuhelper/implbase.hxx> diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 1ef549d62cf0..b686071574c1 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -29,7 +29,6 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> -#include <comphelper/property.hxx> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 16d43eb24eb3..d4db26ef8e52 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/xml/sax/Writer.hpp> -#include <comphelper/lok.hxx> #include <rtl/bootstrap.hxx> #include <svtools/miscopt.hxx> #include <svx/unopage.hxx> diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index d0f77ca64d13..5f48bdb74f58 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -24,6 +24,7 @@ #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> +#include <comphelper/property.hxx> #include <o3tl/any.hxx> #include <tools/diagnose_ex.h> #include <tools/debug.hxx> diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index a6cef2d2605d..667ad43c0734 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> #include <com/sun/star/text/XText.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/property.hxx> #include <comphelper/basicio.hxx> #include <comphelper/servicehelper.hxx> diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index 482a004347b0..e3b4111da6cb 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/io/XObjectOutputStream.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <comphelper/propagg.hxx> diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 71b8a25efc58..c0561c5a62d4 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <comphelper/basicio.hxx> +#include <comphelper/property.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 77dad35de045..c434543fbace 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -55,6 +55,7 @@ #include <com/sun/star/util/XModifiable2.hpp> #include <comphelper/basicio.hxx> +#include <comphelper/property.hxx> #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 1958a6b1b5b6..211cf216c68d 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -68,7 +68,6 @@ #include <listenercontainers.hxx> #include <comphelper/propmultiplex.hxx> #include <comphelper/uno3.hxx> -#include <comphelper/proparrhlp.hxx> #include <cppuhelper/implbase12.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase7.hxx> diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 4e87cdd8c3d4..064bfe7205a0 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -36,6 +36,7 @@ #include <connectivity/formattedcolumnvalue.hxx> #include <connectivity/dbconversion.hxx> +#include <comphelper/property.hxx> #include <tools/diagnose_ex.h> using namespace dbtools; diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 4bf9a0fc815b..52f368f54051 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -22,6 +22,7 @@ #include <services.hxx> #include <tools/debug.hxx> #include <comphelper/basicio.hxx> +#include <comphelper/property.hxx> #include <cppuhelper/queryinterface.hxx> #include <frm_resource.hxx> #include <strings.hrc> diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 1b3e698de8d5..281f18e9a476 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -25,7 +25,7 @@ #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <comphelper/basicio.hxx> -#include <comphelper/guarding.hxx> +#include <comphelper/property.hxx> namespace frm diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index fb35214cf428..34e74d094d70 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -21,6 +21,8 @@ #include <services.hxx> #include <property.hxx> +#include <comphelper/property.hxx> + namespace frm { diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 05ed6dc5018d..a28e9ab5bcb6 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -41,7 +41,7 @@ #include <comphelper/basicio.hxx> #include <comphelper/guarding.hxx> -#include <comphelper/listenernotification.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <comphelper/property.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index cec040e8c869..c3b2914f7ba7 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -22,6 +22,7 @@ #include <frm_resource.hxx> #include <strings.hrc> #include <propertybaghelper.hxx> +#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/numbers.hxx> #include <connectivity/dbtools.hxx> diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index f64a5c94ff44..8d3f3d16c917 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -22,7 +22,6 @@ #include "EditBase.hxx" #include <tools/link.hxx> -#include <comphelper/propmultiplex.hxx> #include <cppuhelper/implbase1.hxx> #include "errorbroadcaster.hxx" diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 6b92c9a8b138..03336a91fa08 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <comphelper/basicio.hxx> +#include <comphelper/property.hxx> #include <cppuhelper/queryinterface.hxx> #include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 2e8e77ad1e02..43c3d277d064 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/sdb/XRowSetChangeBroadcaster.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <comphelper/proparrhlp.hxx> #include <cppuhelper/implbase7.hxx> diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 4d7d8c25214c..510b993e5fe9 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -20,6 +20,7 @@ #include "GroupBox.hxx" #include <property.hxx> #include <services.hxx> +#include <comphelper/property.hxx> #include <tools/debug.hxx> namespace frm diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index 199b9a3a6c32..35fd716a47a2 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <comphelper/property.hxx> +#include <comphelper/types.hxx> #include <osl/diagnose.h> #include <tools/solar.h> @@ -37,6 +38,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::form; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::lang; +using namespace ::comphelper; namespace { diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index a39f91fb6bee..b2966e9ec3cd 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -27,15 +27,12 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XContainer.hpp> #include <cppuhelper/implbase.hxx> -#include <comphelper/types.hxx> #include <algorithm> #include <map> #include <memory> #include <vector> -using namespace comphelper; - /* * The GroupManager listens at the StarForm for FormComponent insertion and removal as well as * its properties "Name" and "TabIndex" and updates its Group using this information. diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index c4531804912d..d127e30cc5ff 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -22,6 +22,7 @@ #include <services.hxx> #include <tools/debug.hxx> #include <comphelper/basicio.hxx> +#include <comphelper/property.hxx> namespace frm diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 8e76aefc7d52..b75b08270334 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -50,6 +50,7 @@ #include <vcl/svapp.hxx> #include <unotools/streamhelper.hxx> #include <comphelper/guarding.hxx> +#include <comphelper/property.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svl/urihelper.hxx> diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 920a459200f9..f72d69cda836 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -26,12 +26,9 @@ #include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/graphic/XGraphicObject.hpp> -#include <comphelper/propmultiplex.hxx> #include <cppuhelper/implbase2.hxx> #include <rtl/ref.hxx> -using namespace comphelper; - namespace frm { diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 2b3a6a4a82ba..869c0e9e04ab 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <comphelper/basicio.hxx> -#include <comphelper/listenernotification.hxx> +#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/formattedcolumnvalue.hxx> diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index ee910f0d2578..0fac875bb2a1 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -22,6 +22,7 @@ #include <property.hxx> #include <services.hxx> #include <comphelper/basicio.hxx> +#include <comphelper/property.hxx> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index d110b36f1524..7d0b389db85b 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -42,7 +42,8 @@ #include <sfx2/objsh.hxx> #include <osl/mutex.hxx> #include <services.hxx> -#include <comphelper/listenernotification.hxx> +#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/property.hxx> #include <cppuhelper/exc_hlp.hxx> #include <svtools/imageresourceaccess.hxx> #define LOCAL_URL_PREFIX '#' diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx index 62a8f26b6b9b..02d63f7bce38 100644 --- a/forms/source/component/findpos.cxx +++ b/forms/source/component/findpos.cxx @@ -23,7 +23,6 @@ #include "findpos.hxx" #include <com/sun/star/uno/Sequence.hxx> -#include <comphelper/types.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index 6cc028c6b8e5..e9ebb688c402 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -22,7 +22,6 @@ #include <FormComponent.hxx> #include <com/sun/star/io/XPersistObject.hpp> -#include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainerhelper.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index 760fd6f9c164..8321db5785cf 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.cxx @@ -19,6 +19,7 @@ #include "refvaluecomponent.hxx" +#include <comphelper/property.hxx> #include <tools/diagnose_ex.h> #include <vector> diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 957167f83718..1d8e1aacc988 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -18,6 +18,7 @@ */ #include "scrollbar.hxx" +#include <comphelper/property.hxx> #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> #include <rtl/math.hxx> diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 164cce42319e..3156418a4b43 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -19,6 +19,7 @@ #include "spinbutton.hxx" #include "scrollbar.hxx" +#include <comphelper/property.hxx> #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index bef6e81ec25d..38ed4a08f3a7 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -53,6 +53,7 @@ #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/uno/XAggregation.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/form/XLoadable.hpp> @@ -60,7 +61,6 @@ #include <comphelper/propagg.hxx> #include <comphelper/propertybag.hxx> #include <comphelper/propmultiplex.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 59d0ea530845..3939b77306ea 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX #define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX -#include <comphelper/types.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XIndexReplace.hpp> diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx index 1ad4fce608ce..2910c01ef17b 100644 --- a/forms/source/inc/frm_strings.hxx +++ b/forms/source/inc/frm_strings.hxx @@ -22,7 +22,6 @@ #include <sal/types.h> #include <rtl/ustring.hxx> -#include <comphelper/string.hxx> namespace frm diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 346c6c6a4c9c..97945b54fe14 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/propshlp.hxx> -#include <comphelper/property.hxx> #include <comphelper/propagg.hxx> #include <tools/debug.hxx> diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 8d9c27bdd390..266b5de5d5b6 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/form/XForm.hpp> diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index 07406bfb295b..493fbda75807 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -22,8 +22,8 @@ #include <FormComponent.hxx> #include <formcontrolfont.hxx> #include "richtextunowrapper.hxx" +#include <comphelper/interfacecontainer2.hxx> #include <comphelper/propertycontainerhelper.hxx> -#include <comphelper/listenernotification.hxx> #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index feb5ac62826d..f4f6c64d07a7 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -52,7 +52,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <comphelper/propertysetinfo.hxx> #include <unotools/textsearch.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index ad6ccbcece3d..8566f60e4040 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -34,7 +34,6 @@ #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> -#include <comphelper/propertysetinfo.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index 04dfa535879b..5627055a8a61 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <comphelper/propstate.hxx> #include <comphelper/propertysetinfo.hxx> -#include <comphelper/proparrhlp.hxx> #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index e2d29e00b948..914e3b8010e7 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -24,6 +24,10 @@ #include "xpathlib.hxx" #include <services.hxx> +namespace com { namespace sun { namespace star { namespace uno { + class XComponentContext; +} } } } + using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::xforms; diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index 9c13ac0c81c0..ddce581d9960 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -25,7 +25,6 @@ #include <formula/FormulaCompiler.hxx> #include <formula/FormulaOpCodeMapperObj.hxx> #include <formula/opcode.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <o3tl/make_unique.hxx> diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 8f6b305dfd29..e5b07260915a 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -59,7 +59,6 @@ #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp> #include <com/sun/star/sheet/XFormulaParser.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <comphelper/string.hxx> #include <map> // For tab page diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index bdd55362b8c6..581f015a0ec6 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <unotools/ucbhelper.hxx> #include <unotools/pathoptions.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index e736df90a40e..0bf9165f9e48 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -29,8 +29,6 @@ #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> -#include <comphelper/storagehelper.hxx> - #include <osl/file.hxx> diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 37274b44eb8d..f617601720b6 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index a01e102df934..09a9318a2906 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -46,7 +46,7 @@ #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/numberedcollection.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/propshlp.hxx> #include <unotools/cmdoptions.hxx> diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 3781966bd11d..10c7da5049dc 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -#include <comphelper/sequenceashashmap.hxx> #include <rtl/ustrbuf.hxx> namespace framework{ diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 90f9c7ac89f5..17ecb666322c 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/util/URL.hpp> #include <rtl/ref.hxx> #include <unotools/mediadescriptor.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 3887eac49779..658229302c33 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/script/CannotConvertException.hpp> #include <com/sun/star/script/Converter.hpp> #include <o3tl/any.hxx> +#include <osl/diagnose.h> #include <services.h> #include <vcl/svapp.hxx> #include <typelib/typedescription.h> diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index d88371979f20..16a84c2f84ac 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -59,6 +59,7 @@ #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/frame/XTerminateListener2.hpp> +#include <comphelper/numberedcollection.hxx> #include <comphelper/sequence.hxx> #include <comphelper/lok.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 959b78737cbf..c64bfa4efc81 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -66,7 +66,6 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index fc6779c2600e..5e2fe175f411 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -33,7 +33,6 @@ #include <vcl/svapp.hxx> #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> -#include <comphelper/sequence.hxx> using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index 1fe2501c20fb..afad4cb7ca99 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -38,7 +38,6 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <osl/file.hxx> -#include <comphelper/sequence.hxx> // namespaces diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 89287f145567..f30c2b88d799 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -38,7 +38,6 @@ #include <vcl/mnemonic.hxx> #include <comphelper/propertysequence.hxx> -#include <comphelper/sequence.hxx> #include <unordered_map> diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index d1e3d8d36691..e8a5582f5ec9 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -25,7 +25,6 @@ #include <osl/diagnose.h> #include <tools/stream.hxx> -#include <comphelper/newarray.hxx> #include "fontmap.hxx" #include "formula.h" diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index 70727dea8cb1..6114dec332f9 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/i18n/KCharacterType.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <unicode/uchar.h> -#include <comphelper/string.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <breakiteratorImpl.hxx> diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index f075e5324c16..c19f339bc2eb 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -24,7 +24,6 @@ #include <nativenumbersupplier.hxx> #include <localedata.hxx> #include "data/numberchar.h" -#include <comphelper/string.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> #include <map> diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index 82f0a0ffaf47..cf32266012d8 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/linguistic2/ConversionDirection.hpp> #include <com/sun/star/linguistic2/ConversionDictionaryType.hpp> #include <com/sun/star/linguistic2/ConversionDictionaryList.hpp> -#include <comphelper/string.hxx> #include <memory> using namespace com::sun::star::lang; diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx index 5d1a92e467c7..d7cca08ba58f 100644 --- a/i18npool/source/transliteration/transliteration_Numeric.cxx +++ b/i18npool/source/transliteration/transliteration_Numeric.cxx @@ -21,7 +21,6 @@ #include <transliteration_Numeric.hxx> #include <nativenumbersupplier.hxx> #include <defaultnumberingprovider.hxx> -#include <comphelper/string.hxx> #include <rtl/ref.hxx> using namespace com::sun::star::i18n; diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index ea5682daec4f..8608e26f7eb0 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -23,7 +23,6 @@ #include <i18nutil/unicode.hxx> #include <com/sun/star/i18n/MultipleCharsOutputException.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <string.h> diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx index 8db7524235e2..535f76a894c4 100644 --- a/i18nutil/source/utility/widthfolding.cxx +++ b/i18nutil/source/utility/widthfolding.cxx @@ -18,7 +18,6 @@ */ #include <i18nutil/widthfolding.hxx> -#include <comphelper/string.hxx> #include "widthfolding_data.h" using namespace com::sun::star::uno; diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index b37e5a0f8ffb..73643169cd39 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -34,7 +34,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/accessibleeventnotifier.hxx> diff --git a/include/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx index a4a1bbfc366c..2539ea0b8441 100644 --- a/include/comphelper/evtmethodhelper.hxx +++ b/include/comphelper/evtmethodhelper.hxx @@ -18,7 +18,9 @@ */ #ifndef INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX #define INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX -#include <comphelper/sequence.hxx> + +#include <com/sun/star/uno/Sequence.h> +#include <comphelper/comphelperdllapi.h> namespace comphelper { diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx index d9eb59115b1b..baa5103d5bd8 100644 --- a/include/comphelper/propmultiplex.hxx +++ b/include/comphelper/propmultiplex.hxx @@ -20,11 +20,15 @@ #ifndef INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX #define INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX -#include <comphelper/propstate.hxx> +#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/comphelperdllapi.h> #include <rtl/ref.hxx> +#include <vector> +namespace com { namespace sun { namespace star { namespace beans { + class XPropertySet; +} } } } //= property helper classes diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index 432d5a66fadf..b777635a100b 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <connectivity/dbexception.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <comphelper/stl_types.hxx> #include <unotools/sharedunocomponent.hxx> diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx index 80aa1cb321e6..61722d234e2f 100644 --- a/include/connectivity/sdbcx/VGroup.hxx +++ b/include/connectivity/sdbcx/VGroup.hxx @@ -31,7 +31,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <connectivity/sdbcx/VCollection.hxx> -#include <comphelper/propertycontainer.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/dbtoolsdllapi.hxx> diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx index e9cc8865c6b7..604024ef8f7c 100644 --- a/include/editeng/unofield.hxx +++ b/include/editeng/unofield.hxx @@ -29,8 +29,6 @@ #include <cppuhelper/component.hxx> #include <editeng/editengdllapi.h> -#include <comphelper/servicehelper.hxx> - #include <editeng/mutxhelp.hxx> #include <memory> diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index 08424a90f770..ef50a4bb5167 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -15,7 +15,6 @@ #include <sfx2/viewsh.hxx> #include <cstddef> #include <rtl/string.hxx> -#include <comphelper/lok.hxx> class SfxViewShell; diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index 2f814bdfa920..4e45ce995374 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -36,7 +36,6 @@ #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/servicehelper.hxx> #include <vcl/vclptr.hxx> namespace com { namespace sun { namespace star { namespace awt { diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 89d10a124540..de020cda80fe 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -33,7 +33,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/propshlp.hxx> -#include <comphelper/proparrhlp.hxx> #include <comphelper/uno3.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/broadcasthelper.hxx> diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index ce6079103c21..f66ad50c8dbc 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -34,7 +34,6 @@ #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/proparrhlp.hxx> -#include <comphelper/property.hxx> #include <comphelper/propertycontainer.hxx> #include <cppuhelper/propshlp.hxx> #include <tools/link.hxx> diff --git a/include/test/testinteractionhandler.hxx b/include/test/testinteractionhandler.hxx index 950127ae185d..e4acac3abbab 100644 --- a/include/test/testinteractionhandler.hxx +++ b/include/test/testinteractionhandler.hxx @@ -23,7 +23,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/sequence.hxx> class TestInteractionHandler : public cppu::WeakImplHelper<css::lang::XServiceInfo, css::lang::XInitialization, diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx index baba7498c71f..5e85542c99af 100644 --- a/include/toolkit/controls/tabpagecontainer.hxx +++ b/include/toolkit/controls/tabpagecontainer.hxx @@ -29,7 +29,6 @@ #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/helper/servicenames.hxx> #include <cppuhelper/implbase1.hxx> -#include <comphelper/sequence.hxx> #include <toolkit/controls/controlmodelcontainerbase.hxx> #include <toolkit/helper/listenermultiplexer.hxx> diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index bbbefcd2b1ff..28a43f912bea 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/XServiceName.hpp> #include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/servicehelper.hxx> #include <memory> class AccessibleRelationSetHelperImpl; diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index 4091153df059..38e9a3a69837 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/XServiceName.hpp> #include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/servicehelper.hxx> #include <memory> class AccessibleStateSetHelperImpl; diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index 4f688f21f56d..ded6f83bf846 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/linguistic2/SpellFailure.hpp> #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> -#include <comphelper/string.hxx> #include <osl/mutex.hxx> #include <algorithm> diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 6a80eb5e1381..51d9c14abf0e 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> #include <com/sun/star/linguistic2/SpellFailure.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> -#include <comphelper/string.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/debug.hxx> diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index 31d96c7dd7ba..98cf0f8cc430 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -24,7 +24,6 @@ #include <oox/helper/attributelist.hxx> #include <osl/diagnose.h> -#include <comphelper/sequenceashashmap.hxx> using namespace ::com::sun::star; diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 807a2deff54f..8731047cd4b6 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -45,7 +45,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/drawing/XShape.hpp> -#include <comphelper/genericpropertyset.hxx> #include <oox/ppt/pptimport.hxx> #include <oox/ppt/slidepersist.hxx> #endif diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 9f170eaa53e8..d12827629794 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -92,7 +92,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> -#include <comphelper/sequence.hxx> #include <utility> #include <xmloff/SchXMLSeriesHelper.hxx> #include "ColorPropertySet.hxx" diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index c8e93211d6a5..2c8564b0d335 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -81,7 +81,6 @@ #include <tools/globname.hxx> #include <comphelper/classids.hxx> #include <comphelper/propertysequence.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/storagehelper.hxx> #include <sot/exchange.hxx> #include <utility> diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx index b5a45b31c1ca..e8b41474026e 100644 --- a/oox/source/ole/vbaexport.cxx +++ b/oox/source/ole/vbaexport.cxx @@ -31,7 +31,6 @@ #include <sot/storage.hxx> -#include <comphelper/string.hxx> #include <comphelper/xmltools.hxx> #define USE_UTF8_CODEPAGE 0 diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 5a779944e0e6..3a9d237b05fa 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/script/vba/XVBAMacroResolver.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/configurationhelper.hxx> -#include <comphelper/string.hxx> #include <comphelper/storagehelper.hxx> #include <osl/diagnose.h> #include <rtl/tencinfo.h> diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index 0754a5071185..0f742cf42231 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -11,7 +11,6 @@ #include <opencl_device.hxx> -#include <comphelper/string.hxx> #include <opencl/openclconfig.hxx> #include <opencl/openclwrapper.hxx> #include <osl/file.hxx> diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index 014898115517..7909c8818107 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include "ZipPackageEntry.hxx" #include <rtl/ref.hxx> -#include <comphelper/refcountedmutex.hxx> #include <cppuhelper/implbase.hxx> #include "EncryptionData.hxx" diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx index 815dfa9a09a6..2b6410700971 100644 --- a/package/source/zipapi/ZipOutputEntry.cxx +++ b/package/source/zipapi/ZipOutputEntry.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/packages/zip/ZipConstants.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ucb/XSimpleFileAccess3.hpp> -#include <comphelper/storagehelper.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 095faf41d281..9088eb693202 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/sequence.hxx> #include <svl/lstner.hxx> #include <svx/svdouno.hxx> #include <svx/svdundo.hxx> diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index e9468e58d5dc..1b0b74a7fb78 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -21,7 +21,6 @@ #include <strings.hxx> #include <strings.hrc> #include <core_resource.hxx> -#include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> #include <Tools.hxx> #include <FormatCondition.hxx> @@ -36,7 +35,6 @@ namespace reportdesign { using namespace com::sun::star; - using namespace comphelper; uno::Sequence< OUString > lcl_getLineOptionals() { OUString pProps[] = { diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 4ab06e2ca3e6..f14f113320fb 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -24,7 +24,6 @@ #include <core_resource.hxx> #include <Tools.hxx> #include <tools/color.hxx> -#include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> #include <FormatCondition.hxx> #include <com/sun/star/text/ParagraphVertAlign.hpp> @@ -34,7 +33,6 @@ namespace reportdesign { using namespace com::sun::star; - using namespace comphelper; uno::Sequence< OUString > lcl_getFixedTextOptionals() { diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index eb1a96406f6c..6a484663116d 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -21,7 +21,6 @@ #include <strings.hxx> #include <tools/color.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> #include <Tools.hxx> #include <com/sun/star/text/ParagraphVertAlign.hpp> @@ -31,7 +30,6 @@ namespace reportdesign { using namespace com::sun::star; - using namespace comphelper; uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno::XComponentContext > const & xContext) { diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 44782a4cd6ff..3111327aac89 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <strings.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> #include <Tools.hxx> @@ -28,7 +27,6 @@ namespace reportdesign { using namespace com::sun::star; - using namespace comphelper; uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XComponentContext > const & xContext) { diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 0b30ee4c82fb..9885ce5791c1 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -21,7 +21,6 @@ #include <core_resource.hxx> #include <strings.hrc> #include <com/sun/star/lang/NoSupportException.hpp> -#include <comphelper/property.hxx> #include <algorithm> namespace reportdesign diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index bdb275d3bb63..c68054557312 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -26,7 +26,6 @@ #include <strings.hrc> #include <core_resource.hxx> #include <Tools.hxx> -#include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> #include <Functions.hxx> @@ -35,7 +34,6 @@ namespace reportdesign { using namespace com::sun::star; - using namespace comphelper; OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent ,const uno::Reference< uno::XComponentContext >& _xContext) diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 363995cc16c0..7d50aab65073 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -24,7 +24,6 @@ #include <core_resource.hxx> #include <Tools.hxx> #include <tools/color.hxx> -#include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> #include <FormatCondition.hxx> #include <com/sun/star/awt/ImageScaleMode.hpp> @@ -35,7 +34,6 @@ namespace reportdesign { using namespace com::sun::star; - using namespace comphelper; uno::Sequence< OUString > lcl_getImageOptionals() { OUString pProps[] = { diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index de391990eb12..593d7eb54640 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -88,12 +88,10 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/genericpropertyset.hxx> #include <unotools/mediadescriptor.hxx> -#include <comphelper/mimeconfighelper.hxx> #include <comphelper/namecontainer.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/numberedcollection.hxx> #include <comphelper/proparrhlp.hxx> -#include <comphelper/property.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/propertystatecontainer.hxx> #include <comphelper/seqstream.hxx> @@ -188,7 +186,6 @@ namespace reportdesign { using namespace com::sun::star; - using namespace comphelper; using namespace rptui; void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,std::shared_ptr<rptui::OReportModel> const & _rModel) diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index db107276e48d..b58be52e5fa4 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -22,7 +22,6 @@ #include <comphelper/storagehelper.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/mimeconfighelper.hxx> -#include <comphelper/property.hxx> #include <comphelper/string.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 9c53b15393c7..9b497320fbd5 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -35,7 +35,6 @@ #include <vcl/svapp.hxx> #include <RptObject.hxx> #include <ReportDrawPage.hxx> -#include <comphelper/property.hxx> namespace reportdesign { diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index c3c766df4892..63166492cd37 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/text/ParagraphVertAlign.hpp> -#include <comphelper/property.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index 1944eeb55238..e4039c120178 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/report/XGroup.hpp> #include <cppuhelper/compbase.hxx> #include <comphelper/broadcasthelper.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/propertysetmixin.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <GroupProperties.hxx> diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index 23544c319dc8..2347bd702b4d 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -31,7 +31,6 @@ #include <cppuhelper/propertysetmixin.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> -#include <comphelper/stl_types.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <rtl/ref.hxx> diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 39787c83a752..f69427efa035 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -58,7 +58,6 @@ #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/report/XFormattedField.hpp> -#include <comphelper/genericpropertyset.hxx> #include <comphelper/property.hxx> #include <tools/diagnose_ex.h> #include <PropertyForward.hxx> diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 4ec5c57dc647..861e17740a44 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -35,9 +35,9 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <tools/diagnose_ex.h> -#include <comphelper/stl_types.hxx> #include <vcl/svapp.hxx> #include <dbaccess/dbsubcomponentcontroller.hxx> #include <svx/unoshape.hxx> diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index d723d5809b07..b9d4810f5cca 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -18,6 +18,8 @@ */ #include "dbloader2.hxx" #include <tools/urlobj.hxx> +#include <comphelper/sequenceashashmap.hxx> +#include <comphelper/storagehelper.hxx> #include <cppuhelper/supportsservice.hxx> namespace rptxml diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 59c762584872..e7cb2dc63f9c 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -46,11 +46,9 @@ #include <ucbhelper/commandenvironment.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/types.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <osl/file.hxx> #include <sfx2/docfile.hxx> #include <unotools/moduleoptions.hxx> -#include <comphelper/storagehelper.hxx> namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 49c6aff75396..9d501ff5074b 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/genericpropertyset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/report/XShape.hpp> #include <com/sun/star/report/XFixedLine.hpp> @@ -39,7 +38,6 @@ namespace rptxml { - using namespace ::comphelper; using namespace ::com::sun::star; using namespace uno; using namespace beans; diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index 9bff778bfa6d..976a7393a448 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -27,13 +27,11 @@ #include <strings.hxx> #include "xmlStyleImport.hxx" #include <ucbhelper/content.hxx> -#include <comphelper/genericpropertyset.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> namespace rptxml { - using namespace ::comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 74e2dcf1c139..e232f9221fc5 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -24,7 +24,6 @@ #include <xmloff/xmluconv.hxx> #include "xmlEnums.hxx" #include "xmlHelper.hxx" -#include <comphelper/genericpropertyset.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <strings.hxx> @@ -32,7 +31,6 @@ namespace rptxml { - using namespace ::comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::report; using namespace ::com::sun::star::uno; diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 949005ac6b09..799322e05610 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -22,7 +22,6 @@ #include <xmloff/families.hxx> #include <xmloff/controlpropertyhdl.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/propertysethelper.hxx> #include <comphelper/genericpropertyset.hxx> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/awt/TextAlign.hpp> diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 4f60c0ce4f6c..079ef969cc7f 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -34,7 +34,6 @@ #include <unotools/tempfile.hxx> #include <unotools/localfilehelper.hxx> #include <xmloff/xmlimp.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <map> #include <memory> diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 9fd07a97704f..66bf2ec329a5 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -37,7 +37,6 @@ #include <rptui_slotid.hrc> #include <comphelper/propmultiplex.hxx> #include <comphelper/containermultiplexer.hxx> -#include <comphelper/types.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/SelectionMultiplex.hxx> #include <svtools/treelistbox.hxx> diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 50995a252113..1ac0e712632b 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -24,7 +24,6 @@ #include <svtools/colorcfg.hxx> #include "ReportDefines.hxx" #include "ReportSection.hxx" -#include <comphelper/propmultiplex.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <svx/svdedtv.hxx> diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index eb69fba75036..33d9b3bbfb57 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -24,6 +24,7 @@ #include <GeometryHandler.hxx> +#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <comphelper/property.hxx> #include <comphelper/mimeconfighelper.hxx> diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 9ef880f34e3e..10ee07c39fed 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> +#include <comphelper/types.hxx> #include <svx/unoshape.hxx> #include <vcl/settings.hxx> diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index ca03d1e997ff..3c506a98a07d 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -19,7 +19,6 @@ #include <DesignView.hxx> #include <ReportController.hxx> -#include <comphelper/types.hxx> #include <svtools/acceleratorexecute.hxx> #include <unotools/syslocale.hxx> #include <unotools/viewoptions.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 29e8661a4ea4..fba084130f4c 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -62,7 +62,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> -#include <comphelper/streamsection.hxx> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/TextAlign.hpp> diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 08cc3997339a..008792b2cb3f 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -42,9 +42,7 @@ #include <svx/svditer.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <comphelper/property.hxx> #include <comphelper/namecontainer.hxx> -#include <comphelper/stl_types.hxx> #include <comphelper/types.hxx> #include <comphelper/sequence.hxx> #include <core_resource.hxx> diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index 3426b51aa090..d58dd0bfb020 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/util/MeasureUnit.hpp> #include <sax/tools/converter.hxx> -#include <comphelper/sequence.hxx> #include <sal/log.hxx> diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index f8d522e65387..98fe290f9dc7 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -24,7 +24,6 @@ #include <unotools/tempfile.hxx> #include <comphelper/fileformat.h> -#include <comphelper/storagehelper.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <svl/stritem.hxx> diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx index 0bab57810918..5c0bb28fac0b 100644 --- a/sc/qa/unit/screenshots/screenshots.cxx +++ b/sc/qa/unit/screenshots/screenshots.cxx @@ -11,7 +11,6 @@ #include <test/screenshot_test.hxx> #include <com/sun/star/frame/Desktop.hpp> -#include <comphelper/string.hxx> #include <editeng/editids.hrc> #include <editeng/editview.hxx> #include <editeng/outliner.hxx> diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 8762cbcc339a..5a970f0a53fa 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -73,6 +73,7 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/GraphicType.hpp> +#include <comphelper/storagehelper.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 173aa43dc763..4e93415542cf 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -23,7 +23,6 @@ #include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <unotools/collatorwrapper.hxx> -#include <comphelper/stl_types.hxx> #include <com/sun/star/sheet/ConditionOperator2.hpp> diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 2a30a7055202..df375a25f8ea 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -31,9 +31,7 @@ #include <sal/types.h> #include <osl/diagnose.h> #include <o3tl/make_unique.hxx> -#include <comphelper/string.hxx> #include <comphelper/stl_types.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/sheet/GeneralFunction.hpp> #include <com/sun/star/sheet/GeneralFunction2.hpp> diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index d407585bff01..65e684ffcb65 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -57,7 +57,6 @@ #include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp> #include <com/sun/star/sheet/GeneralFunction2.hpp> -#include <comphelper/string.hxx> #include <unotools/collatorwrapper.hxx> #include <unotools/calendarwrapper.hxx> #include <com/sun/star/i18n/CalendarDisplayIndex.hpp> diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 4e33090757f7..46c9870500e7 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -48,7 +48,6 @@ #include <i18nlangtag/mslangid.hxx> #include <com/sun/star/lang/Locale.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/random.hxx> #include <comphelper/string.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/collatorwrapper.hxx> diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index f97eed8ef039..1b4469e707be 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/sheet/ExternalLinkInfo.hpp> #include <com/sun/star/sheet/ExternalLinkType.hpp> -#include <comphelper/string.hxx> #include <sfx2/objsh.hxx> #include <tools/urlobj.hxx> diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 8e53779239d9..ba632ba1a386 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -31,7 +31,6 @@ #include <formulacell.hxx> #include <docoptio.hxx> -#include <comphelper/stl_types.hxx> #include <o3tl/make_unique.hxx> #include <formula/errorcodes.hxx> diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index b40764739a48..c475411fa371 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -19,7 +19,6 @@ #include <scitems.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <editeng/eeitem.hxx> #include <svx/algitem.hxx> diff --git a/sc/source/core/tool/webservicelink.cxx b/sc/source/core/tool/webservicelink.cxx index e383ed7b2efd..6acd9ccaa06a 100644 --- a/sc/source/core/tool/webservicelink.cxx +++ b/sc/source/core/tool/webservicelink.cxx @@ -7,9 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <osl/thread.h> #include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 9b5fc62503de..72343c7797eb 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -46,7 +46,6 @@ #include <unotools/fltrcfg.hxx> #include <vcl/dibtools.hxx> #include <vcl/wmf.hxx> -#include <comphelper/types.hxx> #include <comphelper/classids.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 8af382f16119..33631e8a0f75 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <osl/diagnose.h> #include <tools/color.hxx> -#include <comphelper/types.hxx> #include "ftools.hxx" #include <scdllapi.h> diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index 3205949dadfd..d907b3edfaa4 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -19,7 +19,6 @@ #include <svl/itemset.hxx> #include <rtl/bootstrap.hxx> #include <rtl/ustring.hxx> -#include <comphelper/string.hxx> #include <orcus/spreadsheet/import_interface.hpp> #include <orcus/orcus_csv.hpp> diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 3093137bb3a2..21d0c48554d8 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -45,7 +45,6 @@ #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/XAccessibleTable.hpp> #include <editeng/brushitem.hxx> -#include <comphelper/sequence.hxx> #include <float.h> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 287a5b19a841..cd024862b5a5 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/table/ShadowFormat.hpp> #include <editeng/brushitem.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <sfx2/objsh.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 9ff271df2863..ba615cd412a8 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -27,7 +27,6 @@ #include <toolkit/helper/convert.hxx> #include <svl/hint.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/unohelp.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 85985c4b722c..440765700deb 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -34,7 +34,6 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <scitems.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 640854d0fd33..87614409999b 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -54,7 +54,6 @@ #include <svx/AccessibleShapeInfo.hxx> #include <svx/IAccessibleParent.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> #include <svx/unoshape.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index aa45b54dcef5..96c0d8baed44 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -54,7 +54,6 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/svapp.hxx> #include <sfx2/docfile.hxx> -#include <comphelper/servicehelper.hxx> #include <utility> #include <vector> diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 2977a88fd905..5af3996b14cc 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> -#include <comphelper/servicehelper.hxx> #include <svx/AccessibleTextHelper.hxx> #include <editeng/editview.hxx> #include <editeng/editeng.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 2bd2d38664e6..69538abbf141 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <editeng/editobj.hxx> #include <svx/AccessibleTextHelper.hxx> -#include <comphelper/servicehelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <rtl/ustrbuf.hxx> #include <toolkit/helper/convert.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 52b5c7f12514..e493257ea5c9 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -35,7 +35,6 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/convert.hxx> -#include <comphelper/servicehelper.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <o3tl/make_unique.hxx> using namespace ::com::sun::star; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 80eb03c026a5..b909933d2f39 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -40,7 +40,6 @@ #include <svl/hint.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <toolkit/helper/convert.hxx> #include <o3tl/make_unique.hxx> #ifdef indices diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 080f2c9c49a8..5431a1bc0a3a 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -40,7 +40,6 @@ #include <svl/hint.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 380da8fc4505..c7b1ec6160bc 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp> -#include <comphelper/servicehelper.hxx> #include <tools/gen.hxx> #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 94ccd54312ea..5cd1af79915e 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 6ee59f75efe9..406a0eac4c34 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -33,7 +33,6 @@ #include <sfx2/app.hxx> #include <avmedia/mediaplayer.hxx> #include <avmedia/mediatoolbox.hxx> -#include <comphelper/types.hxx> #include <svx/ParaLineSpacingPopup.hxx> #include <svx/TextCharacterSpacingPopup.hxx> #include <svx/TextUnderlinePopup.hxx> diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 8e84f1abe0ab..c5b4f66179a1 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -38,7 +38,6 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/implbase1.hxx> -#include <comphelper/servicehelper.hxx> namespace tools { class Rectangle; } diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index b40d198397fa..50f8f1017309 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <svl/undo.hxx> #include <unotools/textsearch.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index e931a180e8bc..ba7c93f6161d 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -21,7 +21,6 @@ #include <scopetools.hxx> #include <viewdata.hxx> -#include <comphelper/random.hxx> #include <svtools/svlbitm.hxx> #include <svtools/treelistentry.hxx> diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index f66cd92ac76d..888a86b78eba 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.cxx @@ -31,7 +31,6 @@ #include <undoolk.hxx> -#include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> /** Change column widths or row heights */ diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index dddb262199ae..b929aa58d3d8 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -46,7 +46,6 @@ #include <markdata.hxx> #include <sfx2/lokhelper.hxx> -#include <comphelper/lok.hxx> // Show or hide outline groups diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 9431200524bf..c5505e6ebe1e 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -21,7 +21,6 @@ #include <svl/intitem.hxx> #include <svl/zforlist.hxx> #include <vcl/svapp.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cursuno.hxx> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 1fd3c9158d7f..8120b782547a 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -34,7 +34,6 @@ #include <svx/unoshape.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <comphelper/lok.hxx> #include <comphelper/propertysequence.hxx> #include <officecfg/Office/Common.hxx> #include <officecfg/Office/Calc.hxx> diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index bc5c4ef22edb..fba08ce1711f 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -20,8 +20,6 @@ #include <sal/macros.h> -#include <comphelper/unwrapargs.hxx> - #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/component_context.hxx> diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 0dfd848a1d8f..05c758261dae 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -21,7 +21,7 @@ #include <vbahelper/helperdecl.hxx> -#include <comphelper/unwrapargs.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <o3tl/any.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index ea8bf703d10e..67e83f5e7aab 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -29,8 +29,6 @@ #include <ooo/vba/excel/XlPasteType.hpp> #include <ooo/vba/excel/XlPasteSpecialOperation.hpp> -#include <comphelper/proparrhlp.hxx> -#include <comphelper/propertycontainer.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 93f773838195..d27fc5567eda 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -20,8 +20,6 @@ #include <vbahelper/helperdecl.hxx> #include <tools/urlobj.hxx> #include <boost/optional.hpp> -#include <comphelper/unwrapargs.hxx> -#include <comphelper/servicehelper.hxx> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XProtectable.hpp> diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 27035349936b..b706848bea0e 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX -#include <comphelper/unwrapargs.hxx> - #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <ooo/vba/excel/XWorksheet.hpp> #include <ooo/vba/excel/XComments.hpp> diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 82de4646a28f..336c612fa6f3 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -22,7 +22,6 @@ #include <cstdlib> #include <scitems.hxx> -#include <comphelper/string.hxx> #include <editeng/eeitem.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 634817195d52..e877e28b3d05 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -76,6 +76,7 @@ #include <PivotLayoutDialog.hxx> +#include <comphelper/lok.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <sfx2/lokhelper.hxx> diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 6435f617ecaa..2a9824b24a32 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -37,7 +37,6 @@ #include <sot/exchange.hxx> #include <memory> -#include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> #include <attrib.hxx> diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index 1b6d8acdb9b7..f2338c9f8e16 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -50,7 +50,6 @@ #include <sdresid.hxx> #include <sdattr.hxx> -#include <comphelper/servicehelper.hxx> #include <unotest/macros_test.hxx> using namespace ::com::sun::star; diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index b1840b89547f..45487f233cac 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -27,7 +27,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/lok.hxx> -#include <comphelper/string.hxx> #include <cppuhelper/propertysetmixin.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 96a8516f7249..0a4268c11aa8 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -21,7 +21,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/documentconstants.hxx> -#include <comphelper/string.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 9a01c54095ac..18ae520fbbf7 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -47,7 +47,6 @@ #include <svtools/langtab.hxx> #include <vcl/graphicfilter.hxx> #include <comphelper/classids.hxx> -#include <comphelper/lok.hxx> #include <svl/cjkoptions.hxx> #include <svl/visitem.hxx> #include <o3tl/make_unique.hxx> diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 1f05fcc37ac6..2d235e01c769 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <toolkit/helper/vclunohelper.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 59fa862dd89f..399a1ef7b584 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -21,6 +21,8 @@ #include "SlsCacheConfiguration.hxx" #include "SlsRequestQueue.hxx" +#include <comphelper/profilezone.hxx> + namespace sd { namespace slidesorter { namespace cache { //===== QueueProcessor ====================================================== diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 03cd2e0be94b..a6ea8a42db2b 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -32,7 +32,6 @@ #include <svx/svdpagv.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> -#include <comphelper/profilezone.hxx> #include <functional> diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 45905d242cf9..81e62d1ba278 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -61,7 +61,6 @@ #include <drawview.hxx> #include <helpids.h> #include <vcl/svapp.hxx> -#include <comphelper/lok.hxx> #include <slideshow.hxx> #include <memory> diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index da4af8900c66..fb93a33c5328 100644 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> -#include <comphelper/sequenceashashmap.hxx> #include <sfx2/signaturestate.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 1c19d40fecd9..60cd0ddb28ee 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -48,7 +48,6 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/storagehelper.hxx> #include <comphelper/propertysequence.hxx> #include <svtools/addresstemplate.hxx> diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 84e2371efe6f..31951ce7d9a3 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -33,7 +33,6 @@ #include <sfx2/docfac.hxx> #include <com/sun/star/document/XTypeDetection.hpp> #include <unotools/mediadescriptor.hxx> -#include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/opengrf.hxx> diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index e128dfa9b687..bd61ed37bd39 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -25,7 +25,6 @@ #include "impldde.hxx" -#include <comphelper/string.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sot/exchange.hxx> diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 9c8c13e9afaa..15e488fb1f87 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/status/Visibility.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> #include <officecfg/Office/Common.hxx> #include <uno/current_context.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 84ebee9d8c62..cd435adafa31 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -63,7 +63,6 @@ #include <helper.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> -#include <comphelper/storagehelper.hxx> #include <documentfontsdialog.hxx> #include <dinfdlg.hrc> diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index f05544d01ae0..894496c38a5b 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -67,7 +67,6 @@ #include <unotools/useroptions.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <comphelper/storagehelper.hxx> #include <comphelper/string.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index e72f454a0795..f4feb1f3f959 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> - #include <svl/style.hxx> #include <sfx2/newstyle.hxx> diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 78ba325fd581..93c90965a9ca 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -23,7 +23,6 @@ #include <algorithm> #include <appdata.hxx> -#include <comphelper/lok.hxx> #include <sfxtypes.hxx> #include <sfx2/tabdlg.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index 9ab0e57bbbf8..c42de0b236f3 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -25,7 +25,6 @@ #include <sot/exchange.hxx> #include <sot/storage.hxx> #include <comphelper/fileformat.h> -#include <comphelper/string.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 5f82dde5827c..c4b00b5229b5 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -90,7 +90,6 @@ using namespace ::ucbhelper; #include <sfx2/fcontnr.hxx> #include <svtools/templatefoldercache.hxx> -#include <comphelper/storagehelper.hxx> #include <unotools/ucbhelper.hxx> #include <o3tl/make_unique.hxx> #include <memory> diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index bc6bc750497f..25a7082a1ef9 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/flagguard.hxx> #include <svl/undo.hxx> #include <tools/diagnose_ex.h> #include <framework/undomanagerhelper.hxx> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 1f5472b3087e..4df2c639da83 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -64,6 +64,7 @@ #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> +#include <comphelper/sequenceashashmap.hxx> #include <comphelper/mimeconfighelper.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> @@ -82,7 +83,6 @@ #include <alienwarn.hxx> #include <sfx2/docmacromode.hxx> -#include <comphelper/interaction.hxx> #include <com/sun/star/task/ErrorCodeRequest.hpp> #include <rtl/ref.hxx> #include <framework/interaction.hxx> diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index af26dab03b42..36d91c3bb379 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <osl/file.hxx> #include <sfx2/new.hxx> #include <vcl/builderfactory.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 4a38973fea1d..37326b7e6115 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -35,7 +35,6 @@ #include <svl/eitem.hxx> #include <svl/urihelper.hxx> #include <svl/ctloptions.hxx> -#include <comphelper/storagehelper.hxx> #include <comphelper/processfactory.hxx> #include <unotools/securityoptions.hxx> #include <svtools/sfxecode.hxx> diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index b795550dcb31..2a5e7c050610 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -30,8 +30,6 @@ #include <sfx2/event.hxx> #include <comphelper/fileformat.h> -#include <comphelper/seqstream.hxx> -#include <comphelper/storagehelper.hxx> #include <svtools/embedtransfer.hxx> #include <tools/fract.hxx> #include <vcl/outdev.hxx> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 244de5869a34..61ab2371eb24 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -70,7 +70,6 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> -#include <comphelper/interaction.hxx> #include <svtools/langtab.hxx> #include <svtools/sfxecode.hxx> #include <unotools/configmgr.hxx> @@ -92,7 +91,6 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/seqstream.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/string.hxx> #include <vcl/bitmapex.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index a71748111969..82e376f9f0ac 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -55,7 +55,6 @@ #include <svtools/ehdl.hxx> #include <unotools/printwarningoptions.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 524b4f0b5b3d..488a3d7a06c8 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -59,6 +59,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/sequenceashashmap.hxx> #include <comphelper/namedvaluecollection.hxx> #include <svl/itemset.hxx> #include <svl/stritem.hxx> diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 3fdd009bcabd..9c3ff357b7f2 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Type.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <sfx2/sfxuno.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index d12c1ea3e109..047a4b1acbd0 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -63,6 +63,7 @@ #include <tools/gen.hxx> #include <svl/rectitem.hxx> #include <svtools/soerr.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx index 370330ea83a6..820788a64195 100644 --- a/sfx2/source/view/lokcharthelper.cxx +++ b/sfx2/source/view/lokcharthelper.cxx @@ -9,6 +9,7 @@ #include <sfx2/lokcharthelper.hxx> +#include <comphelper/lok.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <sfx2/ipclient.hxx> #include <sfx2/lokhelper.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 16634c0dd5e2..0bfe4aeb019e 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -80,7 +80,6 @@ #include <basic/sbmod.hxx> #include <basic/sbmeth.hxx> #include <basic/sbx.hxx> -#include <comphelper/storagehelper.hxx> #include <svtools/asynclink.hxx> #include <svl/sharecontrolfile.hxx> #include <svtools/strings.hrc> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0e9f1a0d4e68..d5ec553855d8 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -50,6 +50,7 @@ #include <basic/basmgr.hxx> #include <basic/sbuno.hxx> #include <framework/actiontriggerhelper.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx index 6da629695eed..ab0a0e5a63d1 100644 --- a/slideshow/source/engine/activities/interpolation.hxx +++ b/slideshow/source/engine/activities/interpolation.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_INTERPOLATION_HXX #include <basegfx/utils/lerp.hxx> +#include <osl/diagnose.h> namespace basegfx { diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index 0255f534815e..a8423ec482e9 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> #include <com/sun/star/animations/XAnimate.hpp> +#include <comphelper/sequence.hxx> #include <unordered_map> #include <vector> diff --git a/slideshow/source/engine/slide/targetpropertiescreator.hxx b/slideshow/source/engine/slide/targetpropertiescreator.hxx index abde8a7349ee..9a8c00e5654b 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.hxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.hxx @@ -24,7 +24,6 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> -#include <comphelper/sequence.hxx> using namespace ::com::sun::star; diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index f58593baa3dc..fda1adf503de 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -28,7 +28,6 @@ #include <cppuhelper/exc_hlp.hxx> #include <comphelper/anytostring.hxx> -#include <comphelper/make_shared_from_uno.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/servicedecl.hxx> diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 5ed99a951026..f310f17c07df 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -26,8 +26,6 @@ #include <cppcanvas/basegfxfactory.hxx> -#include <comphelper/make_shared_from_uno.hxx> - #include <com/sun/star/rendering/XIntegerBitmap.hpp> #include <com/sun/star/rendering/IntegerBitmapLayout.hpp> #include <com/sun/star/animations/TransitionType.hpp> diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 8c0fc3f3d97c..dae1fc20ed30 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -38,7 +38,6 @@ one go*/ #include <comphelper/genericpropertyset.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> -#include <comphelper/string.hxx> #include <o3tl/make_unique.hxx> #include <rtl/character.hxx> #include <sfx2/frame.hxx> diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 1a9cb86b80aa..d864aa29dd14 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -33,7 +33,6 @@ #include <tools/multisel.hxx> #include "editbrowseboximpl.hxx" #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#include <comphelper/types.hxx> namespace svt diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 993a0ffb8b30..83e3897d9569 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -20,7 +20,6 @@ #include <memory> #include <string.h> -#include <comphelper/string.hxx> #include <tools/debug.hxx> #include <tools/fract.hxx> #include <i18nlangtag/mslangid.hxx> diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index 9c956bc9ddbd..528c1c0ad689 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <vcl/svapp.hxx> diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 4280dbe6bf7e..10e602ca7e5d 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -35,7 +35,6 @@ #include <rtl/ref.hxx> #include <svl/itemprop.hxx> #include <vcl/GraphicObject.hxx> -#include <comphelper/servicehelper.hxx> #define UNOGRAPHIC_DEVICE 1 #define UNOGRAPHIC_DESTINATIONRECT 2 diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index f2220b8bdfd0..0d83432d15f9 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -24,7 +24,6 @@ #include <comphelper/fileformat.h> #include <comphelper/embeddedobjectcontainer.hxx> -#include <comphelper/seqstream.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index ea92a77a77c0..d76cd16491fc 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -20,7 +20,7 @@ #include <svtools/addresstemplate.hxx> #include <svtools/genericunodialog.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/property.hxx> +#include <comphelper/proparrhlp.hxx> #include <comphelper/propertysequence.hxx> #include <com/sun/star/sdbc/XDataSource.hpp> #include <rtl/ref.hxx> diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 2f249df918f2..ff61474ca994 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -27,14 +27,12 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/property.hxx> #include <osl/diagnose.h> #include <tools/diagnose_ex.h> #include <osl/mutex.hxx> #include <vcl/dialog.hxx> #include <vcl/svapp.hxx> -using namespace ::comphelper; using namespace css::uno; using namespace css::lang; using namespace css::beans; diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 931e61d07750..84f13ebcfe15 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -23,7 +23,6 @@ #include <table/gridtablerenderer.hxx> #include <table/tablecontrol.hxx> #include "unocontroltablemodel.hxx" -#include <comphelper/sequence.hxx> #include <rtl/ref.hxx> #include <tools/diagnose_ex.h> #include <toolkit/helper/property.hxx> diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 103b39c9aff1..1d66b67932bc 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/ui/dialogs/WizardButton.hpp> #include <com/sun/star/util/InvalidStateException.hpp> +#include <comphelper/proparrhlp.hxx> #include <cppuhelper/implbase.hxx> #include <svtools/genericunodialog.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 8b568d80269a..596e0b71a97f 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp> #include <officecfg/Office/Common.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/types.hxx> #include <svl/itemset.hxx> #include <unicode/uchar.h> #include <vcl/textview.hxx> diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 2a66b031bec4..331f9340e54e 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svx/passwd.hxx> diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx index cf9faf363673..d131002f3dee 100644 --- a/svx/source/dialog/searchcharmap.cxx +++ b/svx/source/dialog/searchcharmap.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <comphelper/types.hxx> #include <svl/itemset.hxx> #include <unicode/uchar.h> #include <rtl/ustrbuf.hxx> diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index a699ab62fbc8..35efe327c090 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -37,7 +37,6 @@ #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/protitem.hxx> -#include <comphelper/lok.hxx> #include <svx/svdtrans.hxx> diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 777ba28b61af..3ffe3d0693be 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -26,7 +26,6 @@ #include <comphelper/extract.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> -#include <comphelper/propertysetinfo.hxx> namespace svx @@ -41,7 +40,6 @@ namespace svx using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::datatransfer; - using namespace ::comphelper; OColumnTransferable::OColumnTransferable(const OUString& _rDatasource ,const OUString& _rCommand diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 00c8c9b0a988..bfb427a47897 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -24,7 +24,6 @@ #include <fmprop.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> -#include <comphelper/propertysetinfo.hxx> namespace svx @@ -40,7 +39,6 @@ namespace svx using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::datatransfer; - using namespace ::comphelper; OComponentTransferable::OComponentTransferable(const OUString& _rDatasourceOrLocation ,const Reference< XContent>& _xContent) diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 1dc6aa92eb1b..a944957881d6 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -19,7 +19,6 @@ #include <gridcols.hxx> #include <tools/debug.hxx> -#include <comphelper/types.hxx> #include <fmservs.hxx> #include <svx/fmtools.hxx> using namespace ::com::sun::star::uno; diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index ce8a47d7e095..4ca6d80ce6c1 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -18,12 +18,12 @@ */ #include <svx/dataaccessdescriptor.hxx> -#include <comphelper/genericpropertyset.hxx> #include <osl/diagnose.h> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <tools/urlobj.hxx> +#include <map> namespace svx { @@ -31,7 +31,6 @@ namespace svx using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::ucb; - using namespace ::comphelper; struct PropertyMapEntry { diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9abd9b82a88b..293dbc28c81c 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -33,8 +33,6 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/string.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqlnode.hxx> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 92900633d08d..0ad2377088bb 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -55,7 +55,6 @@ #include <com/sun/star/io/XPersistObject.hpp> #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; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 4a77bfc43496..d2d2fdf24e96 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -81,7 +81,6 @@ #include <svxslots.hxx> #include <tbxform.hxx> -#include <comphelper/property.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <memory> diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 606d5039d8f1..c4e473daacae 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -83,6 +83,7 @@ #include <comphelper/property.hxx> #include <comphelper/solarmutex.hxx> #include <comphelper/string.hxx> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 25a3a38cf581..c51f08c893b9 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -64,7 +64,6 @@ #include <svl/stritem.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 5a7ce3fe8813..024f8a60f8af 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -52,6 +52,7 @@ #include <sfx2/event.hxx> #include <osl/mutex.hxx> #include <comphelper/property.hxx> +#include <comphelper/types.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 f31659ea3a40..27af10cba6a5 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -74,6 +74,7 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/property.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <unotools/moduleoptions.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 4691584d8b24..1b0069b9f725 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -68,7 +68,6 @@ #include <comphelper/enumhelper.hxx> #include <comphelper/interaction.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/propagg.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/flagguard.hxx> diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index cddad49d4d72..2962f02d2c87 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/util/XLocalizedAliases.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/types.hxx> #include <helpids.h> #include <svx/fmshell.hxx> diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index bc1b4a64dcd8..c08b84809cfe 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -23,7 +23,6 @@ #include <sfx2/docfac.hxx> #include <comphelper/fileformat.h> #include <comphelper/classids.hxx> -#include <comphelper/string.hxx> #include <unotools/pathoptions.hxx> #include <unotools/resmgr.hxx> #include <tools/vcompat.hxx> diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index db8a38933ddf..51814d181ac6 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -41,7 +41,6 @@ #include <set> #include <map> -#include <comphelper/servicehelper.hxx> #include <svx/rectenum.hxx> #include <svx/AccessibleShapeTreeInfo.hxx> #include <svx/IAccessibleViewForwarder.hxx> diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 046f8fceb7cb..f67196fd23b3 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -42,6 +42,7 @@ #include <comphelper/propmultiplex.hxx> #include <comphelper/interfacecontainer2.hxx> +#include <comphelper/uno3.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/implbase2.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 618801734d3d..4f399ea4a7a8 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -39,7 +39,6 @@ #include <cppuhelper/compbase6.hxx> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/servicehelper.hxx> #include <svx/rectenum.hxx> #include <tools/gen.hxx> diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 347e7f4c82ad..de5df8a46ad7 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -44,7 +44,6 @@ #include <cppuhelper/compbase3.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/accessibleselectionhelper.hxx> -#include <comphelper/servicehelper.hxx> #include <svx/rectenum.hxx> #include <vcl/vclptr.hxx> #include <tools/gen.hxx> diff --git a/svx/source/inc/tablemodel.hxx b/svx/source/inc/tablemodel.hxx index 791a4310f190..5db52a4afbca 100644 --- a/svx/source/inc/tablemodel.hxx +++ b/svx/source/inc/tablemodel.hxx @@ -27,7 +27,6 @@ #include <basegfx/tuple/b2ituple.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <comphelper/listenernotification.hxx> #include "celltypes.hxx" struct _xmlTextWriter; diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 6d3dfb2f80e3..353e18794886 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -33,7 +33,6 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svdhdl.hxx> -#include <comphelper/sequence.hxx> namespace sdr { namespace contact { diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index 93cf40845dd3..38d092c311ee 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -24,7 +24,6 @@ #include <sdr/contact/viewobjectcontactofe3dscene.hxx> #include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> -#include <comphelper/sequence.hxx> namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index 2188d74afd6d..712c23498e7f 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -28,7 +28,6 @@ #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <comphelper/sequence.hxx> namespace sdr diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index 5d09653ab14c..3c9a1a25ce8d 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -31,7 +31,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svtools/embedhlp.hxx> -#include <comphelper/sequence.hxx> using namespace com::sun::star; diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 89851efb54a7..037e8ace65d2 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -47,7 +47,6 @@ #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/scopeguard.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index 7b39c5fcf53b..d83095da35a1 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -8,7 +8,6 @@ */ #include "ShadowPropertyPanel.hxx" -#include <comphelper/string.hxx> #include <sfx2/sidebar/ControlFactory.hxx> #include <svx/colorbox.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 7c4ae6dc8c7a..30d64a784f86 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/util/XModeChangeBroadcaster.hpp> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index b28b6f8c734e..986b412a9c61 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -80,7 +80,6 @@ #include <memory> #include <libxml/xmlwriter.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <comphelper/lok.hxx> #include <sfx2/viewsh.hxx> #include <o3tl/enumrange.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 0c6f2cfb936f..cd80929059b7 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -24,7 +24,6 @@ #include <tools/helpers.hxx> #include <sot/formats.hxx> #include <sot/storage.hxx> -#include <comphelper/storagehelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/localfilehelper.hxx> #include <svl/style.hxx> diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 94bd1cf7492b..40e8c9601edb 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/types.hxx> #include <vcl/pdfextoutdevdata.hxx> #include <svx/svdouno.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index b1364f6d60ff..807db65c994a 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -24,8 +24,6 @@ #include <com/sun/star/table/TableBorder.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <comphelper/string.hxx> - #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <o3tl/any.hxx> diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 3314ec00b02c..62bf16fd30fc 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -30,7 +30,6 @@ #include <svx/layctrl.hxx> #include <svx/dialmgr.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <svtools/colorcfg.hxx> #include <com/sun/star/util/URLTransformer.hpp> diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 5de4c56b49c4..13407a4b0f97 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -28,7 +28,6 @@ #include <svl/itemprop.hxx> #include <svtools/unoevent.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/implbase.hxx> diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 34019f616f56..aa1976335718 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <comphelper/propertysetinfo.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <svx/unopool.hxx> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 22bf9eecf25f..5fa231086cf8 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -60,7 +60,6 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/utils/unotools.hxx> -#include <comphelper/servicehelper.hxx> #include <com/sun/star/awt/XBitmap.hpp> #include <svx/svdograf.hxx> #include <sfx2/docfile.hxx> diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 3988d6654a33..331ff5b6888b 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/drawing/CameraGeometry.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <vcl/svapp.hxx> -#include <comphelper/servicehelper.hxx> #include <comphelper/serviceinfohelper.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 50f8363ce562..c60e6c1a5d27 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -31,7 +31,6 @@ #include <vcl/svapp.hxx> #include <unotools/pathoptions.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 2ad4a47445b8..668ab6751ade 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -24,7 +24,6 @@ #include <rtl/ref.hxx> #include <vcl/svapp.hxx> #include <unotools/pathoptions.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/container/ElementExistException.hpp> diff --git a/sw/qa/api/SwXDocumentIndex.cxx b/sw/qa/api/SwXDocumentIndex.cxx index 297b3a5899d8..ea082b9051e2 100644 --- a/sw/qa/api/SwXDocumentIndex.cxx +++ b/sw/qa/api/SwXDocumentIndex.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/text/XDocumentIndex.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/propertysequence.hxx> using namespace css; diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 64e1b1612e4c..40a77a8e8024 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -44,6 +44,7 @@ #include <rtl/byteseq.hxx> #include <sfx2/app.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/sequence.hxx> #include <unotools/tempfile.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/mediadescriptor.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index 4fda4e47a930..6036ba18882b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -55,7 +55,6 @@ #include <vcl/bitmapaccess.hxx> #include <unotest/assertion_traits.hxx> #include <unotools/fltrcfg.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <swtypes.hxx> #include <drawdoc.hxx> #include <oox/drawingml/drawingmltypes.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 95218dae815f..6da4c52fb83d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/style/BreakType.hpp> #include <unotools/tempfile.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index 02b26aba67c3..954528239dd3 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -40,7 +40,6 @@ #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/style/BreakType.hpp> #include <unotools/tempfile.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index 36340d4cf1b6..ddba448248d4 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/style/BreakType.hpp> #include <unotools/tempfile.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index f8eb32fd8c3a..96e0a342dc1a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -40,7 +40,6 @@ #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/style/BreakType.hpp> #include <unotools/tempfile.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index fb41c037a76e..277f8b71ce22 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -40,7 +40,6 @@ #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/style/BreakType.hpp> #include <unotools/tempfile.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index f75a6fda8cdd..773c65443508 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <unotools/accessiblestatesethelper.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <cellfrm.hxx> diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index d58e21167ca2..fcd6a2b80c99 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -26,7 +26,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <sfx2/viewsh.hxx> #include <vcl/svapp.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <viewsh.hxx> #include <doc.hxx> diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 4aae73f4993a..d7080245c76d 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -20,7 +20,6 @@ #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/uno/RuntimeException.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <flyfrm.hxx> #include "accembedded.hxx" diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index c21596a011b8..2dd90b3e6079 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <unotools/accessiblestatesethelper.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <ftnfrm.hxx> diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 80b7d57e34a5..f7a87f3423de 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -20,7 +20,6 @@ #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/uno/RuntimeException.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <flyfrm.hxx> #include <fmturl.hxx> diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 0af5793b3247..46508ef60eb6 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <unotools/accessiblestatesethelper.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <hffrm.hxx> diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 7a3ea6f80bf7..03810cc3bba1 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -22,7 +22,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include "accpage.hxx" diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index dece0ef514cd..c31a2bee5c32 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -83,7 +83,6 @@ #include "textmarkuphelper.hxx" #include "parachangetrackinginfo.hxx" #include <com/sun/star/text/TextMarkupType.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <svx/colorwindow.hxx> #include <editeng/editids.hrc> diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 77919e3199ad..aca49e10284e 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -19,7 +19,6 @@ #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <strings.hrc> #include "accpreview.hxx" diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 4b363ce9bc77..0f770311fd11 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -50,7 +50,6 @@ #include <swatrset.hxx> #include <frmatr.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 66f01f51046a..5cff95b717e6 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 6827f75059c3..5c7869a5c331 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -65,7 +65,6 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> -#include <comphelper/string.hxx> #include <editeng/editview.hxx> #include <PostItMgr.hxx> #include <DocumentSettingManager.hxx> diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 164fbb391e0b..feb164612d32 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/util/SearchFlags.hpp> #include <comphelper/lok.hxx> -#include <comphelper/string.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <svx/svdview.hxx> diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 4f12cd39d827..3b7a3a169c6b 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -31,7 +31,6 @@ #include <editsh.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <comphelper/flagguard.hxx> using namespace com::sun::star; diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index 77a887b21f95..5ccdc9859398 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <tools/urlobj.hxx> #include <hintids.hxx> #include <hints.hxx> diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 5fbd8f84271d..68a33ab447bf 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -44,7 +44,6 @@ #include <tools/globname.hxx> #include <svx/svxids.hrc> -#include <comphelper/string.hxx> #include <comphelper/random.hxx> #include <tools/urlobj.hxx> #include <tools/poly.hxx> diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 4d7741fdb402..04184d15723d 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -19,7 +19,6 @@ #include <limits.h> #include <hintids.hxx> -#include <comphelper/string.hxx> #include <editeng/langitem.hxx> #include <editeng/formatbreakitem.hxx> #include <editeng/tstpitem.hxx> diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 1900be46994a..b1cb2f712878 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <osl/endian.h> #include <hintids.hxx> #include <svl/urihelper.hxx> diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 74d9f8833bd9..13187c6889d4 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/linguistic2/XProofreadingIterator.hpp> #include <com/sun/star/text/XFlatParagraph.hpp> #include <com/sun/star/i18n/ScriptType.hpp> -#include <comphelper/string.hxx> #include <o3tl/any.hxx> #include <unoflatpara.hxx> diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 35afdd5654e6..3a9f0f94c7d2 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/SearchFlags.hpp> -#include <comphelper/string.hxx> #include <i18nutil/transliteration.hxx> #include <i18nutil/searchopt.hxx> #include <svl/fstathelper.hxx> diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx index 9311bb65c605..4ecf198ed0d0 100644 --- a/sw/source/core/fields/ddetbl.cxx +++ b/sw/source/core/fields/ddetbl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <frmfmt.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 5d362a8bb6d0..60f16e13b3aa 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -37,7 +37,6 @@ #include <unotools/localedatawrapper.hxx> #include <editeng/unolingu.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/types.hxx> #include <comphelper/string.hxx> #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 1087e04c0a6e..78c446f1dbcd 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/text/ReferenceFieldSource.hpp> #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> -#include <comphelper/string.hxx> #include <editeng/unolingu.hxx> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 6db1895b80e8..4a5062639056 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -108,8 +108,6 @@ #include <frame.hxx> #include <swtable.hxx> -#include <comphelper/string.hxx> - PROT SwProtocol::nRecord = PROT::FileInit; SwImplProtocol* SwProtocol::pImpl = nullptr; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index b684c5ac1b2c..782587b964f2 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -91,7 +91,6 @@ #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <svx/unoapi.hxx> #include <svx/framelinkarray.hxx> -#include <comphelper/sequence.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/color/bcolortools.hxx> diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 9821b5c3cba6..fd5a2a883484 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/chart2/data/LabelOrigin.hpp> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/sequence.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/zforlist.hxx> diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 862f9635d70c..c66685d35f59 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/table/TableSortField.hpp> -#include <comphelper/string.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <o3tl/any.hxx> diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 6088867622c4..541fa5eea8eb 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/text/XTextTable.hpp> #include <vcl/svapp.hxx> -#include <comphelper/servicehelper.hxx> #include <pagedesc.hxx> #include <poolfmt.hxx> diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index f62917904c77..7c9a59f863f9 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/xml/dom/XNodeList.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <doc.hxx> #include <docsh.hxx> #include <IDocumentStylePoolAccess.hxx> diff --git a/sw/source/filter/docx/swdocxreader.hxx b/sw/source/filter/docx/swdocxreader.hxx index 6418194bbdd0..8035b6b746b0 100644 --- a/sw/source/filter/docx/swdocxreader.hxx +++ b/sw/source/filter/docx/swdocxreader.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_FILTER_DOCX_SWDOCXREADER_HXX #include <shellio.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/xml/dom/XDocument.hpp> #include <tools/ref.hxx> diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index cef46d80b366..8a2653608589 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> -#include <comphelper/string.hxx> #include <svx/svxids.hrc> #include <hintids.hxx> #include <tools/fract.hxx> diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 549193949962..0e04a2220a5e 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -81,7 +81,6 @@ #include <oox/token/properties.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/string.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/font.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index c1d94eda7f6c..50216cf52d63 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -29,7 +29,6 @@ #include <i18nlangtag/mslangid.hxx> #include <hintids.hxx> -#include <comphelper/string.hxx> #include <tools/urlobj.hxx> #include <editeng/boxitem.hxx> #include <editeng/cmapitem.hxx> @@ -86,6 +85,7 @@ #include <fmtsrnd.hxx> #include <fmtrowsplt.hxx> #include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/text/RubyPosition.hpp> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index c158514fdd2c..58c4de33f771 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/string.hxx> #include "sprmids.hxx" #include "writerhelper.hxx" diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index c9b994a76f94..aceb1dcf277e 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -40,7 +40,6 @@ #include <comphelper/docpasswordrequest.hxx> #include <comphelper/propertysequence.hxx> -#include <comphelper/string.hxx> #include <editeng/brushitem.hxx> #include <editeng/tstpitem.hxx> @@ -140,6 +139,7 @@ using namespace sw::util; using namespace sw::types; using namespace nsHdFtFlags; +#include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <unotools/pathoptions.hxx> #include <com/sun/star/ucb/SimpleFileAccess.hpp> diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 978c9f877e3e..fdfdc2cd085f 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -22,7 +22,6 @@ #include <sal/types.h> #include <tools/solar.h> #include <comphelper/processfactory.hxx> -#include <comphelper/storagehelper.hxx> #include <comphelper/string.hxx> #include <comphelper/simplefileaccessinteraction.hxx> #include <sot/storinfo.hxx> diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 9a6db02f582b..d1bd4b95d96b 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/types.hxx> #include <editeng/langitem.hxx> #include <svl/numuno.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 9c247434f2c7..8571c2f84ed7 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -36,7 +36,6 @@ #include <svtools/htmlcfg.hxx> #include <svtools/treelistentry.hxx> -#include <comphelper/storagehelper.hxx> #include <uitool.hxx> #include <IMark.hxx> #include <section.hxx> diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index f0039617f3da..cc350e6fb9c8 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -26,7 +26,6 @@ #include <wview.hxx> #include <swwait.hxx> #include <wrtsh.hxx> -#include <comphelper/string.hxx> #include <sfx2/viewfrm.hxx> #include <svl/cjkoptions.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index f6302e7756ec..115c6b89d83b 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/text/AutoTextContainer.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/util/XRefreshable.hpp> -#include <comphelper/processfactory.hxx> #include <svtools/treelistentry.hxx> #include <swtypes.hxx> #include "labfmt.hxx" @@ -34,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::uno; -using namespace ::comphelper; void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > const & xModel, const SwLabItem& rItem) { diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index e8afcea97704..affd29d224c2 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <unotools/charclass.hxx> #include <editeng/unolingu.hxx> #include <wrtsh.hxx> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 9a24ea2cfcb6..d4b8ffd5deda 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -19,7 +19,6 @@ #include <config_folders.h> -#include <comphelper/string.hxx> #include <vcl/builderfactory.hxx> #include <svl/style.hxx> #include <vcl/help.hxx> diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 309892627b47..24d9f8f4e77a 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <sfx2/request.hxx> #include <svl/stritem.hxx> #include <vcl/weld.hxx> diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index cfb40108bc27..1c7583c62373 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -18,7 +18,6 @@ */ #include <hintids.hxx> -#include <comphelper/string.hxx> #include <vcl/weld.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 20645e20a87e..42d52cfda197 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <comphelper/string.hxx> #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> #include <shellio.hxx> diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index b60245621f5d..d58d267d655e 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/text/FilenameDisplayFormat.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/util/XUpdatable.hpp> -#include <comphelper/string.hxx> #include <ooo/vba/word/WdFieldType.hpp> #include <swtypes.hxx> #include <basic/sberrors.hxx> diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index bfb9ffadcf07..79954a706f86 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -20,7 +20,6 @@ #include "service.hxx" #include "vbaglobals.hxx" #include <sal/macros.h> -#include <comphelper/unwrapargs.hxx> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 96608f2f1dee..6220954d1b35 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -106,7 +106,6 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> -#include <comphelper/storagehelper.hxx> #define ShellClass_SwDocShell #include <sfx2/msg.hxx> diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index 0c7afd70a8f6..71eb393d1d2d 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <vcl/builderfactory.hxx> #include <actctrl.hxx> #include <vcl/toolbox.hxx> diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index eaf0b9d07356..5e8b94fd77bf 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -26,7 +26,6 @@ #include <PostItMgr.hxx> #include <AnnotationWin.hxx> #include <basegfx/range/b2drange.hxx> -#include <comphelper/string.hxx> #include "SidebarTxtControl.hxx" #include "SidebarScrollBar.hxx" #include "AnchorOverlayObject.hxx" diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 9e4658eacf4a..d89678c6d088 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> #include <hintids.hxx> #include <doc.hxx> diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index dd6c87ef4b97..31f5efd1104e 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -18,7 +18,6 @@ */ #include <string> -#include <comphelper/string.hxx> #include <i18nutil/unicode.hxx> #include <svl/eitem.hxx> #include <sfx2/htmlmode.hxx> diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index aacaa9b5f462..0a663a365194 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -34,7 +34,6 @@ #include <docsh.hxx> #include <comphelper/documentconstants.hxx> -#include <comphelper/string.hxx> #include <o3tl/make_unique.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 84a3dd598a72..fe051ff12bae 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <comphelper/string.hxx> #include <unotools/tempfile.hxx> #include <tools/urlobj.hxx> #include <vcl/errinf.hxx> diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 90ca68a0f404..f2cbaa68c93f 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -122,7 +122,6 @@ #include <ndtxt.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 02282603ac4d..a7690c7b1b88 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -49,7 +49,6 @@ #include <unomod.hxx> #include <vcl/svapp.hxx> #include <svl/asiancfg.hxx> -#include <comphelper/servicehelper.hxx> #include <swmodule.hxx> #include <cfgitems.hxx> diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 720308feb756..ae67738ba15e 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -100,7 +100,6 @@ #include <FrameControlsManager.hxx> #include <sfx2/msgpool.hxx> -#include <comphelper/lok.hxx> #include <svtools/embedhlp.hxx> #include <memory> diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index fe68f0a402ed..e1f0b7b4dd94 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <osl/diagnose.h> #include <rtl/instance.hxx> -#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <toolkit/controls/eventcontainer.hxx> #include <toolkit/helper/property.hxx> diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 9ad9a8bdbe60..6cf9b0639fdf 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index ed8508e25afc..b82887f35d00 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -27,7 +27,6 @@ #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/helper/servicenames.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/sequence.hxx> #include <toolkit/helper/listenermultiplexer.hxx> #include <memory> diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index e5afd1c4be25..ade7374176f8 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -32,7 +32,6 @@ #include <cppuhelper/typeprovider.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <comphelper/sequence.hxx> #include <vcl/outdev.hxx> #include <vcl/graph.hxx> diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index 4c3015bf6cd0..fe14902a6a4a 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -21,7 +21,6 @@ #include <cassert> -#include <comphelper/string.hxx> #include <sal/log.hxx> #include <sal/types.h> #include <rtl/strbuf.hxx> diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index b48275819739..198a6a80fe2d 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -28,10 +28,11 @@ #include <osl/endian.h> #include <osl/diagnose.h> +#include <rtl/strbuf.hxx> +#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <comphelper/fileformat.h> -#include <comphelper/string.hxx> #define SWAPNIBBLES(c) \ unsigned char nSwapTmp=c; \ diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index b76ccd7b0a7a..f036bae95e9d 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -38,7 +38,6 @@ #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/content.hxx> #include <tools/diagnose_ex.h> -#include <comphelper/string.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/uri.hxx> #include <sal/macros.h> diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx index 3b41f13ef0a9..7982a7322fa9 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx @@ -21,7 +21,6 @@ #include "DAVProperties.hxx" #include "webdavresponseparser.hxx" -#include <comphelper/seqstream.hxx> #include <rtl/strbuf.hxx> diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 92f4d8b187bc..daf39eff7d5a 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/seqstream.hxx> #include <com/sun/star/ucb/LockEntry.hpp> #include <com/sun/star/ucb/LockScope.hpp> #include <com/sun/star/ucb/LockType.hpp> diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx index b93192af973e..697cbd8b2608 100644 --- a/unotools/source/accessibility/accessiblerelationsethelper.cxx +++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx @@ -23,7 +23,6 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <vector> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> using namespace ::utl; using namespace ::com::sun::star; diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index 26cd61c1a5e8..480ae0ab274b 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.cxx @@ -19,7 +19,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <tools/debug.hxx> -#include <comphelper/servicehelper.hxx> // defines how many states the bitfield can contain // it has the size of 64 because I use a uInt64 diff --git a/unotools/source/misc/ZipPackageHelper.cxx b/unotools/source/misc/ZipPackageHelper.cxx index bfdd3b3c0902..4d4720417823 100644 --- a/unotools/source/misc/ZipPackageHelper.cxx +++ b/unotools/source/misc/ZipPackageHelper.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <unotools/ZipPackageHelper.hxx> -#include <comphelper/oslfile2streamwrap.hxx> #include <comphelper/storagehelper.hxx> #include <osl/file.hxx> #include <unotools/pathoptions.hxx> diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index b69fa81e4468..9e46e4c2cb55 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -22,7 +22,6 @@ #include <osl/file.hxx> #include <osl/process.h> #include <comphelper/seqstream.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index e90b2520d865..1233ced8c86c 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/processfactory.hxx> #include <osl/file.h> diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index 0ae4d98e40bc..633752b7095f 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -24,8 +24,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/script/XDefaultProperty.hpp> #include <ooo/vba/msforms/XComboBox.hpp> -#include <comphelper/proparrhlp.hxx> -#include <comphelper/propertycontainer.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include "vbacontrol.hxx" diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index 1a2d5049d897..466ffba9ad5b 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -36,7 +36,6 @@ #include <ooo/vba/XApplicationBase.hpp> #include <cppuhelper/exc_hlp.hxx> -#include <comphelper/unwrapargs.hxx> #include <tools/urlobj.hxx> #include <osl/file.hxx> diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx index 00133c154b3e..1169110f7a0c 100644 --- a/vcl/backendtest/VisualBackendTest.cxx +++ b/vcl/backendtest/VisualBackendTest.cxx @@ -11,7 +11,6 @@ #include <rtl/math.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/random.hxx> #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index f9ccbb310062..c12eb41c236f 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -21,7 +21,6 @@ #include <objc/objc-runtime.h> -#include <comphelper/string.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/commandevent.hxx> diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 590d0acefa8d..443e562192e8 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/lok.hxx> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <salframe.hxx> #include <salinst.hxx> diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 8d5d329a7478..d1f5480a27ed 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -21,7 +21,6 @@ #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <rtl/process.h> #include <tools/gen.hxx> #include <unotools/resmgr.hxx> diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 8febfb02975d..a807409bdd2d 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/lok.hxx> - #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/ctrl.hxx> diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 5832e8de55f9..1283b28d710b 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/lok.hxx> - #include <vcl/IDialogRenderable.hxx> #include <vcl/decoview.hxx> #include <vcl/event.hxx> diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 41258c387866..f37319bdc3f6 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -20,7 +20,6 @@ #include <memory> #include <sal/config.h> -#include <comphelper/string.hxx> #include <rtl/character.hxx> #include <bitmapwriteaccess.hxx> diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index b72078caa819..4e8c19de6541 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -45,7 +45,6 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/random.hxx> #include <comphelper/string.hxx> #include <cppuhelper/implbase.hxx> #include <i18nlangtag/languagetag.hxx> @@ -93,7 +92,6 @@ #include <prewin.h> #include <wincrypt.h> #include <postwin.h> -#include <comphelper/windowserrorstring.hxx> #endif #include <config_eot.h> diff --git a/vcl/source/graphic/UnoGraphic.cxx b/vcl/source/graphic/UnoGraphic.cxx index bc09e40d045d..f6a3431a7068 100644 --- a/vcl/source/graphic/UnoGraphic.cxx +++ b/vcl/source/graphic/UnoGraphic.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/graphic/GraphicType.hpp> #include <com/sun/star/graphic/XGraphicTransformer.hpp> #include <vcl/dibtools.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> #include <string.h> diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx index 6f4a37af2c17..d2389ccacb21 100644 --- a/vcl/source/graphic/UnoGraphicDescriptor.cxx +++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx @@ -22,7 +22,6 @@ #include <unotools/ucbstreamhelper.hxx> #include <vcl/graphicfilter.hxx> #include <svl/itemprop.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyState.hpp> diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx index 4ecb6eedb2db..bf0b0bc8f654 100644 --- a/vcl/source/graphic/UnoGraphicProvider.cxx +++ b/vcl/source/graphic/UnoGraphicProvider.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/fileformat.h> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 82833c72d819..4f736704142e 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -25,7 +25,6 @@ #include <vcl/outdev.hxx> #include <vcl/unowrap.hxx> #include <vcl/sysdata.hxx> -#include <comphelper/lok.hxx> #include <salgdi.hxx> #include <svdata.hxx> diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index faf4ba614f8b..150bec13a75b 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -65,7 +65,6 @@ #include <valgrind/callgrind.h> #endif -#include <comphelper/string.hxx> #include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 5d0eeeaa405a..52cd6c3985ef 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -29,7 +29,6 @@ #include <sys/stat.h> #include <sys/types.h> -#include <comphelper/string.hxx> #include <i18nlangtag/mslangid.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/jobdata.hxx> diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 35ac2902fc37..8db7f9ee30b9 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -32,7 +32,6 @@ #include <tools/config.hxx> #include <i18nutil/paper.hxx> -#include <comphelper/string.hxx> #include <rtl/strbuf.hxx> #include <sal/macros.h> diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx index a9f52da4397a..d70be0f230e1 100644 --- a/vcl/workben/mtfdemo.cxx +++ b/vcl/workben/mtfdemo.cxx @@ -8,7 +8,6 @@ */ #include <comphelper/processfactory.hxx> -#include <comphelper/random.hxx> #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index 2d96312be119..97084a5a4044 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/xml/sax/Parser.hpp> +#include <comphelper/storagehelper.hxx> namespace writerfilter { namespace ooxml diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index 751068d95062..6a168cfd9134 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -22,7 +22,6 @@ #include <map> #include <ooxml/OOXMLDocument.hxx> -#include <comphelper/storagehelper.hxx> #include <com/sun/star/embed/XRelationshipAccess.hpp> extern OUString customTarget; diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index fdf943d775a3..0145347cb86d 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -58,7 +58,6 @@ #include <comphelper/extract.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/propertysequence.hxx> #include <unotools/fontcvt.hxx> #include <o3tl/make_unique.hxx> #include <xmloff/fasttokenhandler.hxx> diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 84591565635d..3a7170e27860 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> +#include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/presentation/EffectNodeType.hpp> #include <com/sun/star/presentation/EffectPresetClass.hpp> @@ -67,8 +68,6 @@ #include <animations.hxx> #include <xmloff/animationexport.hxx> -#include <comphelper/storagehelper.hxx> - using namespace css; using namespace ::std; diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 037d38c2d15a..902e42171420 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/string.hxx> - #include <o3tl/make_unique.hxx> #include <unotools/syslocale.hxx> diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx index 43254fdd7873..78bff82e53d6 100644 --- a/xmlsecurity/qa/certext/SanCertExt.cxx +++ b/xmlsecurity/qa/certext/SanCertExt.cxx @@ -36,7 +36,6 @@ #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" #include <sal/types.h> -#include <comphelper/sequence.hxx> #include <rtl/ustring.hxx> #include <neon/ne_ssl.h> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index d3c6d2d6c92d..649c6e53f562 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -54,7 +54,6 @@ #include <vcl/weld.hxx> #include <unotools/configitem.hxx> -#include <comphelper/storagehelper.hxx> using namespace css::security; using namespace css::uno; diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index c10e9f0d3c50..bcbef6ad0bbd 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -41,7 +41,6 @@ #include <rtl/math.hxx> #include <rtl/ref.hxx> #include <unotools/datetime.hxx> -#include <comphelper/ofopxmlhelper.hxx> #include <sax/tools/converter.hxx> #include "ooxmlsecexporter.hxx" #include <xmlsignaturehelper2.hxx> diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index 5a23de6f2619..283c9ac45c6d 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -42,7 +42,6 @@ #include <unotools/datetime.hxx> #include <comphelper/base64.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/seqstream.hxx> using namespace css; diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index b741f5f3353f..c31041cedc03 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -26,7 +26,6 @@ #include <xmlsec/mscrypto/app.h> #include <com/sun/star/xml/crypto/SecurityEnvironment.hpp> #include <com/sun/star/xml/crypto/XMLSecurityContext.hpp> -#include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> #include <o3tl/char16_t2wchar_t.hxx> diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 45b85cb97705..4143a320dae5 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/processfactory.hxx> #include <sal/types.h> #include <rtl/bootstrap.hxx> #include <rtl/string.hxx> |