diff options
| author | Alexandre Vicenzi <vicenzi.alexandre@gmail.com> | 2014-01-31 04:53:17 -0200 |
|---|---|---|
| committer | Marcos Souza <marcos.souza.org@gmail.com> | 2014-02-02 17:38:09 +0000 |
| commit | 93ef9a43a53218bdfbdea2ec20fba73fef08db75 (patch) | |
| tree | 02536ba1f94b8712372f33be509ad1e68086844c /lotuswordpro/source/filter/LotusWordProImportFilter.cxx | |
| parent | Print fair message from CPPUnitTest (diff) | |
| download | core-93ef9a43a53218bdfbdea2ec20fba73fef08db75.tar.gz core-93ef9a43a53218bdfbdea2ec20fba73fef08db75.zip | |
fdo#54938 Convert bridges, editeng and others to cppu::supportsService
Change-Id: I7ff5189473c3e0831c2f1e95264d1a04f3b716a9
Reviewed-on: https://gerrit.libreoffice.org/7761
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Tested-by: Marcos Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'lotuswordpro/source/filter/LotusWordProImportFilter.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index 9e353b148920..826e1b533e55 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -17,27 +17,24 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> -#include <sal/macros.h> -#include <rtl/tencinfo.h> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/uno/Reference.hxx> #include <comphelper/processfactory.hxx> -#include <xmloff/attrlist.hxx> - -#include <ucbhelper/content.hxx> - +#include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> +#include <rtl/tencinfo.h> +#include <sal/macros.h> #include <tools/stream.hxx> - -#include "LotusWordProImportFilter.hxx" - #include <vector> +#include <ucbhelper/content.hxx> +#include <xmloff/attrlist.hxx> +#include "LotusWordProImportFilter.hxx" #include "lwpfilter.hxx" using namespace com::sun::star; @@ -327,7 +324,6 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc return sTypeName; } - // XInitialization void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) @@ -348,6 +344,7 @@ void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArgu } } } + OUString LotusWordProImportFilter_getImplementationName () throw (RuntimeException) { @@ -356,11 +353,7 @@ OUString LotusWordProImportFilter_getImplementationName () #define SERVICE_NAME1 "com.sun.star.document.ImportFilter" #define SERVICE_NAME2 "com.sun.star.document.ExtendedTypeDetection" -sal_Bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName ) - throw (RuntimeException) -{ - return ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2; -} + Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( ) throw (RuntimeException) { @@ -370,6 +363,7 @@ Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( pArray[1] = OUString ( SERVICE_NAME2 ); return aRet; } + #undef SERVICE_NAME2 #undef SERVICE_NAME1 @@ -388,7 +382,7 @@ OUString SAL_CALL LotusWordProImportFilter::getImplementationName( ) sal_Bool SAL_CALL LotusWordProImportFilter::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - return LotusWordProImportFilter_supportsService( rServiceName ); + return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL LotusWordProImportFilter::getSupportedServiceNames( ) throw (RuntimeException) |