remove some unused comphelper includes

and fix the fallout

Change-Id: I5d0c2040f57a3ac354a7e277592da31d09a5f359
Reviewed-on: https://gerrit.libreoffice.org/52894
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>

21 files changed, 8 insertions, 13 deletions

diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 0851df879d06..33de83b9e1a5 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -27,7 +27,6 @@
 
 #include "dllapi.h"
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <comphelper/uno3.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdobj.hxx>
 
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 82dd992f5686..095faf41d281 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/report/XGroup.hpp>
 #include <com/sun/star/document/XUndoManager.hpp>
 
-#include <comphelper/uno3.hxx>
 #include <comphelper/sequence.hxx>
 #include <svl/lstner.hxx>
 #include <svx/svdouno.hxx>
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index b0e8bea140cb..2929daec53af 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <comphelper/uno3.hxx>
 #include <editeng/unolingu.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/lingucfg.hxx>
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 2fcc6af56f93..db107276e48d 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -18,7 +18,6 @@
  */
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <ReportEngineJFree.hxx>
-#include <comphelper/enumhelper.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index fdb7c2f89e98..5d726a85ed97 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -22,6 +22,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFixedLine.hpp>
 #include "ReportControlModel.hxx"
+#include <comphelper/uno3.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index e72d9f93541b..b08efa10b759 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFixedText.hpp>
 #include "ReportControlModel.hxx"
+#include <comphelper/uno3.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index ca2fec4d727b..a457f7dada59 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -22,6 +22,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFormatCondition.hpp>
 #include "ReportControlModel.hxx"
+#include <comphelper/uno3.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index 227088615436..e7860983bff5 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -22,6 +22,7 @@
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFormattedField.hpp>
 #include "ReportControlModel.hxx"
+#include <comphelper/uno3.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index d4b1012ee70a..4b27adee20d1 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX
 
+#include <comphelper/uno3.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFunction.hpp>
 #include <cppuhelper/basemutex.hxx>
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index 88ffa14461b0..63ed5468efc6 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX
 
+#include <comphelper/uno3.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XImageControl.hpp>
 #include "ReportControlModel.hxx"
diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx
index b9e4f1de907d..6025d72608ef 100644
--- a/reportdesign/source/core/inc/ReportComponent.hxx
+++ b/reportdesign/source/core/inc/ReportComponent.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/report/XReportComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/weakref.hxx>
-#include <comphelper/uno3.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index b60aca183a3a..72dc147aabb3 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
-#include <comphelper/uno3.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 
 
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index a6b1e1d61683..49c6aff75396 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -25,7 +25,6 @@
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
 #include "xmlStyleImport.hxx"
-#include <comphelper/namecontainer.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/report/XShape.hpp>
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index 309a9146dddb..af1af1891d9d 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -27,7 +27,6 @@
 #include "xmlCell.hxx"
 #include "xmlStyleImport.hxx"
 #include "xmlTable.hxx"
-#include <comphelper/namecontainer.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <strings.hxx>
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index a090f952aa89..ef17c7b4748f 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -27,7 +27,6 @@
 #include <strings.hxx>
 #include "xmlStyleImport.hxx"
 #include <ucbhelper/content.hxx>
-#include <comphelper/namecontainer.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 2c11e4853c4f..808d82537b64 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -27,7 +27,6 @@
 #include "xmlHelper.hxx"
 #include "xmlEnums.hxx"
 #include <ucbhelper/content.hxx>
-#include <comphelper/namecontainer.hxx>
 #include <com/sun/star/report/GroupOn.hpp>
 #include <com/sun/star/report/KeepTogether.hpp>
 
diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx
index 1f9862a01ab2..430d9cdeee8b 100644
--- a/reportdesign/source/filter/xml/xmlRow.cxx
+++ b/reportdesign/source/filter/xml/xmlRow.cxx
@@ -25,7 +25,6 @@
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
 #include "xmlStyleImport.hxx"
-#include <comphelper/namecontainer.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include "strings.hxx"
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 7634f4f589ff..fc644f1d749b 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -26,7 +26,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <comphelper/extract.hxx>
 #include <xmloff/xmlprcon.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/XMLGraphicsDefaultStyle.hxx>
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 6d9e3c30b014..c1856bda9b97 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/util/XNumberFormatPreviewer.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/i18n/NumberFormatIndex.hpp>
-#include <comphelper/numbers.hxx>
 #include <algorithm>
 
 namespace rptui
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 96269a3cf568..778e49120121 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/property.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 82732af556f6..db8ac3eb494f 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -18,7 +18,6 @@
  */
 #include <metadata.hxx>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
-#include <comphelper/extract.hxx>
 #include <core_resource.hxx>
 #include <helpids.h>
 #include <strings.hrc>