fdo#54938: Convert package, writerfilter and writerperfect

Change-Id: I5220e172bf9722ad86eef3bc557c30779f07201c
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

3 files changed, 11 insertions, 35 deletions

diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 784a18aef680..94a98a9f847e 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/mediadescriptor.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <oox/core/filterdetect.hxx>
 #include <dmapper/DomainMapper.hxx>
 #include <WriterFilter.hxx>
@@ -254,28 +255,14 @@ OUString WriterFilter_getImplementationName () throw (uno::RuntimeException)
    return OUString ( "com.sun.star.comp.Writer.WriterFilter" );
 }
 
-#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
-#define SERVICE_NAME2 "com.sun.star.document.ExportFilter"
-
-
-sal_Bool WriterFilter_supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
-{
-   return (ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
-}
-
-
 uno::Sequence< OUString > WriterFilter_getSupportedServiceNames(  ) throw (uno::RuntimeException)
 {
    uno::Sequence < OUString > aRet(2);
    OUString* pArray = aRet.getArray();
-   pArray[0] =  SERVICE_NAME1;
-   pArray[1] =  SERVICE_NAME2;
+   pArray[0] = "com.sun.star.document.ImportFilter";
+   pArray[1] = "com.sun.star.document.ExportFilter";
    return aRet;
 }
-#undef SERVICE_NAME1
-#undef SERVICE_NAME2
-
-
 
 uno::Reference< uno::XInterface > WriterFilter_createInstance( const uno::Reference< uno::XComponentContext >& xContext)
                 throw( uno::Exception )
@@ -293,7 +280,7 @@ OUString WriterFilter::getImplementationName(  ) throw (uno::RuntimeException)
 
 sal_Bool WriterFilter::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException)
 {
-    return WriterFilter_supportsService( rServiceName );
+    return cppu::supportsService( this, rServiceName );
 }
 
 
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 466afd672a62..ee78bf1d6ce9 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -23,6 +23,7 @@
 #include <tools/solar.h>
 #include <RtfFilter.hxx>
 #include <comphelper/mediadescriptor.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <dmapper/DomainMapper.hxx>
 #include <rtftok/RTFDocument.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -174,11 +175,9 @@ OUString RtfFilter::getImplementationName(  ) throw (uno::RuntimeException)
    return RtfFilter_getImplementationName();
 }
 
-#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
-#define SERVICE_NAME2 "com.sun.star.document.ExportFilter"
 sal_Bool RtfFilter::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException)
 {
-    return ( rServiceName == SERVICE_NAME1 || rServiceName == SERVICE_NAME2 );
+    return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > RtfFilter::getSupportedServiceNames(  ) throw (uno::RuntimeException)
@@ -187,7 +186,6 @@ uno::Sequence< OUString > RtfFilter::getSupportedServiceNames(  ) throw (uno::Ru
 }
 
 /* Helpers, used by shared lib exports. */
-
 OUString RtfFilter_getImplementationName () throw (uno::RuntimeException)
 {
    return OUString ( "com.sun.star.comp.Writer.RtfFilter" );
@@ -197,12 +195,10 @@ uno::Sequence< OUString > RtfFilter_getSupportedServiceNames(  ) throw (uno::Run
 {
    uno::Sequence < OUString > aRet(2);
    OUString* pArray = aRet.getArray();
-   pArray[0] =  SERVICE_NAME1;
-   pArray[1] =  SERVICE_NAME2;
+   pArray[0] = "com.sun.star.document.ImportFilter";
+   pArray[1] = "com.sun.star.document.ExportFilter";
    return aRet;
 }
-#undef SERVICE_NAME1
-#undef SERVICE_NAME2
 
 uno::Reference< uno::XInterface > RtfFilter_createInstance( const uno::Reference< uno::XComponentContext >& xContext)
                 throw( uno::Exception )
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 926c7c0f423f..50dcaccd24b2 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <cppuhelper/implementationentry.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <WriterFilterDetection.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -47,7 +48,6 @@ OUString WriterFilterDetection_getImplementationName () throw (uno::RuntimeExcep
    return OUString ( "com.sun.star.comp.Writer.WriterFilterDetector"  );
 }
 
-#define SERVICE_NAME1 "com.sun.star.document.ExtendedTypeDetection"
 
 
 OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& rDescriptor )
@@ -132,20 +132,13 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r
 }
 
 
-sal_Bool WriterFilterDetection_supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
-{
-   return ServiceName == SERVICE_NAME1;
-}
-
-
 uno::Sequence< OUString > WriterFilterDetection_getSupportedServiceNames(  ) throw (uno::RuntimeException)
 {
    uno::Sequence < OUString > aRet(1);
    OUString* pArray = aRet.getArray();
-   pArray[0] =  OUString ( SERVICE_NAME1  );
+   pArray[0] =  OUString ( "com.sun.star.document.ExtendedTypeDetection" );
    return aRet;
 }
-#undef SERVICE_NAME1
 
 
 uno::Reference< uno::XInterface > WriterFilterDetection_createInstance( const uno::Reference< uno::XComponentContext >& xContext)
@@ -163,7 +156,7 @@ OUString WriterFilterDetection::getImplementationName(  ) throw (uno::RuntimeExc
 
 sal_Bool WriterFilterDetection::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException)
 {
-    return WriterFilterDetection_supportsService( rServiceName );
+    return cppu::supportsService( this, rServiceName );
 }