diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-10-26 14:22:21 -0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-30 16:27:50 +0100 |
commit | 0865c446c2ac3facd75f03020e934e71403429e1 (patch) | |
tree | 83b56e5a2b93eaab39749d0b31c66805f9556cfa /writerperfect/source/writer/MSWorksImportFilter.cxx | |
parent | 88d87cefb61b03909b26ea3ad89e2dc7b5538a0f (diff) |
fdo#54938: Convert package, writerfilter and writerperfect
Change-Id: I5220e172bf9722ad86eef3bc557c30779f07201c
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'writerperfect/source/writer/MSWorksImportFilter.cxx')
-rw-r--r-- | writerperfect/source/writer/MSWorksImportFilter.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index f37b808e9d66..d6af1b4bb08d 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/uno/Reference.h> +#include <cppuhelper/supportsservice.hxx> #include <xmloff/attrlist.hxx> #include <ucbhelper/content.hxx> @@ -187,20 +188,13 @@ throw (RuntimeException) return OUString ( "com.sun.star.comp.Writer.MSWorksImportFilter" ); } -#define SERVICE_NAME1 "com.sun.star.document.ImportFilter" -#define SERVICE_NAME2 "com.sun.star.document.ExtendedTypeDetection" -sal_Bool SAL_CALL MSWorksImportFilter_supportsService( const OUString &ServiceName ) -throw (RuntimeException) -{ - return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 ); -} Sequence< OUString > SAL_CALL MSWorksImportFilter_getSupportedServiceNames( ) throw (RuntimeException) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString ( SERVICE_NAME1 ); - pArray[1] = OUString ( SERVICE_NAME2 ); + pArray[0] = OUString ( "com.sun.star.document.ImportFilter" ); + pArray[1] = OUString ( "com.sun.star.document.ExtendedTypeDetection" ); return aRet; } #undef SERVICE_NAME2 @@ -221,7 +215,7 @@ throw (RuntimeException) sal_Bool SAL_CALL MSWorksImportFilter::supportsService( const OUString &rServiceName ) throw (RuntimeException) { - return MSWorksImportFilter_supportsService( rServiceName ); + return cppu::supportsService( this, rServiceName ); } Sequence< OUString > SAL_CALL MSWorksImportFilter::getSupportedServiceNames( ) throw (RuntimeException) |