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 /writerfilter/source/filter/WriterFilterDetection.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 'writerfilter/source/filter/WriterFilterDetection.cxx')
| -rw-r--r-- | writerfilter/source/filter/WriterFilterDetection.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
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 ); } |