diff options
-rw-r--r-- | lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 30 | ||||
-rw-r--r-- | lotuswordpro/source/filter/LotusWordProImportFilter.hxx | 13 | ||||
-rw-r--r-- | lotuswordpro/util/lwpfilter.component | 2 |
3 files changed, 7 insertions, 38 deletions
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index 7fe4cc90d787..90017a5a3c71 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -189,33 +189,11 @@ void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArgu } } -OUString LotusWordProImportFilter_getImplementationName () - throw (RuntimeException) -{ - return OUString ( "com.sun.star.comp.Writer.LotusWordProImportFilter" ); -} - -Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( ) - throw (RuntimeException) -{ - Sequence < OUString > aRet(2); - OUString* pArray = aRet.getArray(); - pArray[0] = "com.sun.star.document.ImportFilter"; - pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; - return aRet; -} - -uno::Reference< XInterface > SAL_CALL LotusWordProImportFilter_createInstance( const uno::Reference< XMultiServiceFactory > & rSMgr) - throw( Exception ) -{ - return static_cast<cppu::OWeakObject*>(new LotusWordProImportFilter( comphelper::getComponentContext(rSMgr) )); -} - // XServiceInfo OUString SAL_CALL LotusWordProImportFilter::getImplementationName( ) throw (RuntimeException, std::exception) { - return LotusWordProImportFilter_getImplementationName(); + return OUString ( "com.sun.star.comp.Writer.LotusWordProImportFilter" ); } sal_Bool SAL_CALL LotusWordProImportFilter::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) @@ -225,7 +203,11 @@ sal_Bool SAL_CALL LotusWordProImportFilter::supportsService( const OUString& rSe Sequence< OUString > SAL_CALL LotusWordProImportFilter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - return LotusWordProImportFilter_getSupportedServiceNames(); + Sequence < OUString > aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; + return aRet; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx index 0babf8123f45..ae7a60811a6e 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx @@ -87,19 +87,6 @@ public: }; -OUString LotusWordProImportFilter_getImplementationName() - throw ( css::uno::RuntimeException ); - -bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName ) - throw ( css::uno::RuntimeException ); - -css::uno::Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL LotusWordProImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( css::uno::Exception ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/util/lwpfilter.component b/lotuswordpro/util/lwpfilter.component index bd007fb135e9..b4424048a4d9 100644 --- a/lotuswordpro/util/lwpfilter.component +++ b/lotuswordpro/util/lwpfilter.component @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="lotuswordpro" xmlns="http://openoffice.org/2010/uno-components"> + xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Writer.LotusWordProImportFilter" constructor="LotusWordProImportFilter_get_implementation"> <service name="com.sun.star.document.ImportFilter"/> |