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 /ucb | |
| parent | 5229726b4d4e7d76f410d221f8f8cd8abcfd5a19 (diff) | |
Fix various XServiceInfo implementations
...to match what is recorded in the .component files
Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/core/FileAccess.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 1a5d28938109..1632cfd9d83a 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -23,7 +23,8 @@ #include <uno/mapping.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> +#include <cppuhelper/supportsservice.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> @@ -35,6 +36,7 @@ #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/ContentInfo.hpp> @@ -74,7 +76,8 @@ namespace { // Implementation XSimpleFileAccess -typedef cppu::WeakImplHelper1< XSimpleFileAccess3 > FileAccessHelper; +typedef cppu::WeakImplHelper<XSimpleFileAccess3, css::lang::XServiceInfo> + FileAccessHelper; class OCommandEnvironment; class OFileAccess : public FileAccessHelper @@ -113,6 +116,18 @@ public: virtual void SAL_CALL writeFile( const OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::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 + { return OUString(IMPLEMENTATION_NAME); } + + 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 FileAccess_getSupportedServiceNames(); } }; // Implementation XActiveDataSink |