diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-17 12:25:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-17 12:25:11 +0100 |
| commit | 3099c70b11c7e5b80fe4dbe3dc99171fb38c6fc2 (patch) | |
| tree | 63699b525800b2c6708e90b817853bb60be5f6d8 /filter | |
| parent | 5229726b4d4e7d76f410d221f8f8cd8abcfd5a19 (diff) | |
Fix various XServiceInfo implementations
...to match what is recorded in the .component files
Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 64b6dd194b84..fffedaeb33ca 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -10,13 +10,14 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> +#include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> #include <sax/tools/documenthandleradapter.hxx> #include <com/sun/star/lang/XComponent.hpp> - +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Type.hxx> @@ -53,8 +54,8 @@ namespace filter { * OdfFlatXml export and imports ODF flat XML documents by plugging a pass-through * filter implementation into XmlFilterAdaptor. */ - class OdfFlatXml : public WeakImplHelper3<XImportFilter, - XExportFilter, DocumentHandlerAdapter> + class OdfFlatXml : public WeakImplHelper<XImportFilter, + XExportFilter, DocumentHandlerAdapter, css::lang::XServiceInfo> { private: Reference< XComponentContext > m_xContext; @@ -81,6 +82,22 @@ namespace filter { throw (IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { return OUString("com.sun.star.comp.filter.OdfFlatXml"); } + + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { return cppu::supportsService(this, ServiceName); } + + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { + return css::uno::Sequence<OUString>{ + "com.sun.star.document.ImportFilter", + "com.sun.star.document.ExportFilter"}; + } + // UNO component helper methods static OUString impl_getImplementationName(); |