fdo#54938: Replace existsValue for cppu::supportsService

As now ::comphelper::existsValue is not used anymore, we're removing this too.

Change-Id: I9bd2544a9c378f5a18746255133f5684867e0114
Reviewed-on: https://gerrit.libreoffice.org/6378
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

21 files changed, 43 insertions, 71 deletions

diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index edfb3b84361f..5c33e814b458 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -21,9 +21,9 @@
 #include "corestrings.hrc"
 #include "core_resource.hrc"
 #include "core_resource.hxx"
-#include <comphelper/sequence.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/property.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "Tools.hxx"
 #include "FormatCondition.hxx"
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -239,7 +239,7 @@ uno::Sequence< OUString > SAL_CALL OFixedLine::getSupportedServiceNames(  ) thro
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 // XReportComponent
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 7ea6f56ee0d3..fc7ea1704188 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -22,11 +22,11 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include "core_resource.hrc"
 #include "core_resource.hxx"
-#include <comphelper/sequence.hxx>
 #include "Tools.hxx"
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/property.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "FormatCondition.hxx"
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
 #include "ReportHelperImpl.hxx"
@@ -129,7 +129,7 @@ uno::Sequence< OUString > SAL_CALL OFixedText::getSupportedServiceNames(  ) thro
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL OFixedText::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 // XReportComponent
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index b17ea240b7f3..b4703494b92c 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -22,8 +22,8 @@
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <connectivity/dbtools.hxx>
-#include <comphelper/sequence.hxx>
 #include <comphelper/property.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "Tools.hxx"
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
 #include "ReportHelperImpl.hxx"
@@ -88,7 +88,7 @@ uno::Sequence< OUString > SAL_CALL OFormatCondition::getSupportedServiceNames(
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL OFormatCondition::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormatCondition::getPropertySetInfo(  ) throw(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 61428aaa6106..670413acab85 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -22,11 +22,11 @@
 #include "corestrings.hrc"
 #include "core_resource.hrc"
 #include "core_resource.hxx"
-#include <comphelper/sequence.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/property.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "Tools.hxx"
 #include "FormatCondition.hxx"
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
@@ -132,7 +132,7 @@ uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames(  )
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL OFormattedField::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 // XReportComponent
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 38868973be49..422e365db025 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -21,8 +21,8 @@
 #include "corestrings.hrc"
 #include <tools/debug.hxx>
 #include <connectivity/dbtools.hxx>
-#include <comphelper/sequence.hxx>
 #include <comphelper/property.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "Tools.hxx"
 // =============================================================================
 namespace reportdesign
@@ -88,7 +88,7 @@ uno::Sequence< OUString > SAL_CALL OFunction::getSupportedServiceNames(  ) throw
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL OFunction::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OFunction::getPropertySetInfo(  ) throw(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index ef6e015b9118..2bbd6ca87b5f 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -27,6 +27,7 @@
 #include "Tools.hxx"
 #include <tools/debug.hxx>
 #include <comphelper/property.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "Functions.hxx"
 
 // =============================================================================
@@ -97,7 +98,7 @@ uno::Sequence< OUString> SAL_CALL OGroup::getSupportedServiceNames() throw(uno::
 // -----------------------------------------------------------------------------
 sal_Bool SAL_CALL OGroup::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
 {
-    return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, _rServiceName);
 }
 // -----------------------------------------------------------------------------
 void SAL_CALL OGroup::dispose() throw(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index b159e6ce3bdf..0b3f6575e2bd 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -22,11 +22,11 @@
 #include "corestrings.hrc"
 #include "core_resource.hrc"
 #include "core_resource.hxx"
-#include <comphelper/sequence.hxx>
 #include "Tools.hxx"
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/property.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "FormatCondition.hxx"
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
@@ -203,7 +203,7 @@ uno::Sequence< OUString > SAL_CALL OImageControl::getSupportedServiceNames(  ) t
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL OImageControl::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 // XReportComponent
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index b2f90da302cb..0c82b1884d2e 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -22,10 +22,10 @@
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <connectivity/dbtools.hxx>
-#include <comphelper/sequence.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/string.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -119,7 +119,7 @@ uno::Sequence< OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames(
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL OReportEngineJFree::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 // XReportEngine
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 5cf4a655f482..3787f0a1094d 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -19,6 +19,7 @@
 #include "Section.hxx"
 #include <comphelper/enumhelper.hxx>
 #include <connectivity/dbtools.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/report/XReportComponent.hpp>
 #include <com/sun/star/report/ForceNewPage.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -194,7 +195,7 @@ uno::Sequence< OUString> SAL_CALL OSection::getSupportedServiceNames() throw(uno
 // -----------------------------------------------------------------------------
 sal_Bool SAL_CALL OSection::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
 {
-    return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, _rServiceName);
 }
 // -----------------------------------------------------------------------------
 void OSection::init()
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index 262c623f2340..47270d43bce7 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
 #include <comphelper/property.hxx>
-#include <comphelper/sequence.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <svx/unoshape.hxx>
@@ -151,7 +151,7 @@ uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames(  ) throw(un
 sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
 
-    return m_sServiceName == ServiceName || ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 // XReportComponent
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index 477fa617daeb..c6503093cbeb 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -18,8 +18,8 @@
  */
 #include "dbloader2.hxx"
 #include <tools/urlobj.hxx>
-#include <comphelper/sequence.hxx>
-// -------------------------------------------------------------------------
+#include <cppuhelper/supportsservice.hxx>
+
 namespace rptxml
 {
 
@@ -94,7 +94,7 @@ OUString SAL_CALL ORptTypeDetection::getImplementationName() throw(  )
 // XServiceInfo
 sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName) throw(  )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -------------------------------------------------------------------------
 // XServiceInfo
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 567743238999..c76a4e34e200 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -20,13 +20,13 @@
 #include "xmlExport.hxx"
 #include "xmlAutoStyle.hxx"
 #include <xmloff/ProgressBarHelper.hxx>
-#include <comphelper/sequence.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <comphelper/types.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "xmlEnums.hxx"
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/numehelp.hxx>
@@ -336,7 +336,7 @@ uno::Sequence< OUString > SAL_CALL ORptExport::getSupportedServiceNames(  ) thro
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL ORptExport::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 void ORptExport::exportFunctions(const Reference<XIndexAccess>& _xFunctions)
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index f98ab74f9b23..7f796e34d015 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -22,9 +22,9 @@
 #include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp>
 #include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
 #include <com/sun/star/reflection/ProxyFactory.hpp>
-#include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/documentconstants.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlement.hxx>
@@ -99,13 +99,11 @@ OUString SAL_CALL ExportDocumentHandler::getImplementationName(  ) throw(uno::Ru
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------
 sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
+    return cppu::supportsService(this, ServiceName);
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSupported;
@@ -114,7 +112,6 @@ uno::Sequence< OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNam
     return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported);
 }
 
-//------------------------------------------------------------------------
 OUString ExportDocumentHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.ExportDocumentHandler");
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 65cbca5e25ab..fca9c328719c 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -25,10 +25,10 @@
 #include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/reflection/ProxyFactory.hpp>
-#include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/namedvaluecollection.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlement.hxx>
@@ -70,13 +70,11 @@ OUString SAL_CALL ImportDocumentHandler::getImplementationName(  ) throw(uno::Ru
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------
 sal_Bool SAL_CALL ImportDocumentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
+    return cppu::supportsService(this, ServiceName);
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSupported;
@@ -85,13 +83,11 @@ uno::Sequence< OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNam
     return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported);
 }
 
-//------------------------------------------------------------------------
 OUString ImportDocumentHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.ImportDocumentHandler");
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSupported(1);
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 819ee644284f..a7109c23096f 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -41,6 +41,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/mediadescriptor.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -428,7 +429,7 @@ uno::Sequence< OUString > SAL_CALL ORptFilter::getSupportedServiceNames(  ) thro
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL ORptFilter::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor )
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 31cdab6db475..a9245cf44562 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -19,9 +19,9 @@
 #include "DataProviderHandler.hxx"
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/namedvaluecollection.hxx>
-#include <comphelper/sequence.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include "uistrings.hrc"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/syslocale.hxx>
@@ -72,31 +72,26 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext
     }
 }
 
-//------------------------------------------------------------------------
 OUString SAL_CALL DataProviderHandler::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------
 sal_Bool SAL_CALL DataProviderHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
+    return cppu::supportsService(this, ServiceName);
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
 
-//------------------------------------------------------------------------
 OUString DataProviderHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.DataProviderHandler");
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > DataProviderHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSupported(1);
@@ -104,7 +99,6 @@ uno::Sequence< OUString > DataProviderHandler::getSupportedServiceNames_static(
     return aSupported;
 }
 
-//------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL DataProviderHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext )
 {
     return *(new DataProviderHandler( _rxContext ));
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 860bf6eb02ee..50fe32a6d9b3 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "DefaultInspection.hxx"
-#include <comphelper/sequence.hxx>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <RptResId.hrc>
 #include "ModuleHelper.hxx"
 #include "helpids.hrc"
 #include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
@@ -64,37 +64,31 @@ namespace rptui
         DBG_CTOR(DefaultComponentInspectorModel,NULL);
     }
 
-    //------------------------------------------------------------------------
     DefaultComponentInspectorModel::~DefaultComponentInspectorModel()
     {
         DBG_DTOR(DefaultComponentInspectorModel,NULL);
     }
 
-    //------------------------------------------------------------------------
     OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
 
-    //------------------------------------------------------------------------
     sal_Bool SAL_CALL DefaultComponentInspectorModel::supportsService( const OUString& ServiceName ) throw(RuntimeException)
     {
-        return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
+        return cppu::supportsService(this, ServiceName);
     }
 
-    //------------------------------------------------------------------------
     Sequence< OUString > SAL_CALL DefaultComponentInspectorModel::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //------------------------------------------------------------------------
     OUString DefaultComponentInspectorModel::getImplementationName_Static(  ) throw(RuntimeException)
     {
         return OUString("com.sun.star.comp.report.DefaultComponentInspectorModel");
     }
 
-    //------------------------------------------------------------------------
     Sequence< OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -102,7 +96,6 @@ namespace rptui
         return aSupported;
     }
 
-    //------------------------------------------------------------------------
     Reference< XInterface > SAL_CALL DefaultComponentInspectorModel::create( const Reference< XComponentContext >& _rxContext )
     {
         return *(new DefaultComponentInspectorModel( _rxContext ));
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index c53a077f4da1..10f3141f81e8 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -18,10 +18,10 @@
  */
 #include "GeometryHandler.hxx"
 
-#include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/mimeconfighelper.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 #include "uistrings.hrc"
 #include "reportformula.hxx"
@@ -257,25 +257,21 @@ OUString SAL_CALL GeometryHandler::getImplementationName(  ) throw(uno::RuntimeE
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------
 sal_Bool SAL_CALL GeometryHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
+    return cppu::supportsService(this, ServiceName);
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
 
-//------------------------------------------------------------------------
 OUString GeometryHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.GeometryHandler");
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSupported(1);
@@ -283,7 +279,6 @@ uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static(  ) t
     return aSupported;
 }
 
-//------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL GeometryHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext )
 {
     return *(new GeometryHandler( _rxContext ));
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index 2aa83e75a77a..295e7870e545 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -18,9 +18,9 @@
  */
 #include "ReportComponentHandler.hxx"
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <comphelper/sequence.hxx>
 #include "uistrings.hrc"
 #include <comphelper/types.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/syslocale.hxx>
 #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
@@ -53,31 +53,26 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo
     }
 }
 
-//------------------------------------------------------------------------
 OUString SAL_CALL ReportComponentHandler::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------
 sal_Bool SAL_CALL ReportComponentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
+    return cppu::supportsService(this, ServiceName);
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
 
-//------------------------------------------------------------------------
 OUString ReportComponentHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.ReportComponentHandler");
 }
 
-//------------------------------------------------------------------------
 uno::Sequence< OUString > ReportComponentHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSupported(1);
@@ -85,7 +80,6 @@ uno::Sequence< OUString > ReportComponentHandler::getSupportedServiceNames_stati
     return aSupported;
 }
 
-//------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL ReportComponentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext )
 {
     return *(new ReportComponentHandler( _rxContext ));
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index e86169ab7266..85e186cc9956 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -19,6 +19,7 @@
 
 #include "statusbarcontroller.hxx"
 
+#include <cppuhelper/supportsservice.hxx>
 #include <svx/zoomsliderctrl.hxx>
 #include <svx/zoomctrl.hxx>
 #include <svx/svxids.hrc>
@@ -44,7 +45,6 @@ OUString SAL_CALL OStatusbarController::getImplementationName() throw( RuntimeEx
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------------
 OUString OStatusbarController::getImplementationName_Static() throw( RuntimeException )
 {
     return OUString("com.sun.star.report.comp.StatusbarController");
@@ -59,7 +59,7 @@ Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static(void)
 // -----------------------------------------------------------------------------
 ::sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& ServiceName ) throw (RuntimeException)
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 //-------------------------------------------------------------------------
 Sequence< OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() throw(RuntimeException)
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index bfc6c65cef79..627be80ba9ec 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -41,7 +41,7 @@
 #include <editeng/colritem.hxx>
 #include <svx/tbxcustomshapes.hxx>
 
-#include <comphelper/sequence.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 #include <memory>
 
@@ -76,7 +76,7 @@ Sequence< OUString> OToolboxController::getSupportedServiceNames_Static(void) th
 // -----------------------------------------------------------------------------
 ::sal_Bool SAL_CALL OToolboxController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
 {
-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
+    return cppu::supportsService(this, ServiceName);
 }
 //-------------------------------------------------------------------------
 Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames() throw(RuntimeException)