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 /xmloff | |
| parent | 5229726b4d4e7d76f410d221f8f8cd8abcfd5a19 (diff) | |
Fix various XServiceInfo implementations
...to match what is recorded in the .component files
Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/xmlversion.hxx | 13 | ||||
| -rw-r--r-- | xmloff/source/meta/xmlversion.cxx | 22 |
2 files changed, 33 insertions, 2 deletions
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index bb5ef953873a..fc8e8ac90ee3 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/util/RevisionTag.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> @@ -117,11 +117,20 @@ public: virtual ~XMLVersionContext(); }; -class XMLVersionListPersistence : public ::cppu::WeakImplHelper1< ::com::sun::star::document::XDocumentRevisionListPersistence > +class XMLVersionListPersistence : public ::cppu::WeakImplHelper< ::com::sun::star::document::XDocumentRevisionListPersistence, css::lang::XServiceInfo > { public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag > SAL_CALL load( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 41a525b14ba3..18885fd25081 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; @@ -426,6 +427,27 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con return aVersions; } +OUString XMLVersionListPersistence::getImplementationName() + throw (css::uno::RuntimeException, std::exception) +{ + return OUString("XMLVersionListPersistence"); +} + +sal_Bool XMLVersionListPersistence::supportsService( + OUString const & ServiceName) + throw (css::uno::RuntimeException, std::exception) +{ + return cppu::supportsService(this, ServiceName); +} + +css::uno::Sequence<OUString> +XMLVersionListPersistence::getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) +{ + return css::uno::Sequence<OUString>{ + "com.sun.star.document.DocumentRevisionListPersistence"}; +} + extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL XMLVersionListPersistence_get_implementation( css::uno::XComponentContext *, |