From 18f1eb7b0c3536817572eeb481591418a7eab3da Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 21 Jan 2016 19:59:41 +0100 Subject: Clean up after ea6fdbaeeb51ad695f1c3754b796b7273eb4baad "tdf#74608 lotuswordpro: Constructor feature for LotusWordProImportFilter" Change-Id: I24179fd670bbaa92713cb69bd306930e90a8e698 --- .../source/filter/LotusWordProImportFilter.cxx | 30 +++++----------------- .../source/filter/LotusWordProImportFilter.hxx | 13 ---------- 2 files changed, 6 insertions(+), 37 deletions(-) (limited to 'lotuswordpro/source') 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(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: */ -- cgit