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>

30 files changed, 5 insertions, 40 deletions

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>