diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-31 16:08:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-05 16:43:14 +0100 |
| commit | 8ec2fed7c88674258ce716e69ae31d8f9be7223c (patch) | |
| tree | e6d6a9657a247bb787fb2bc17688cef456efa288 /ucbhelper/inc | |
| parent | 1dedb15b17a8e8bf04f248809ef48db663034254 (diff) | |
fdo#46808, use service constructor for ucb::Store
Change-Id: I62719ef9d58215e287af3e1be52404993722ec67
Diffstat (limited to 'ucbhelper/inc')
| -rw-r--r-- | ucbhelper/inc/ucbhelper/macros.hxx | 13 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/providerhelper.hxx | 5 |
2 files changed, 15 insertions, 3 deletions
diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx index 924989ae6d0f..93f562f7fabb 100644 --- a/ucbhelper/inc/ucbhelper/macros.hxx +++ b/ucbhelper/inc/ucbhelper/macros.hxx @@ -742,6 +742,19 @@ Class::getSupportedServiceNames_Static() \ return aSNS; \ } +// 1 service name +#define XSERVICEINFO_IMPL_1_CTX( Class, ImplName, Service1 ) \ +XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ +XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \ + \ +com::sun::star::uno::Sequence< rtl::OUString > \ +Class::getSupportedServiceNames_Static() \ +{ \ + com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 ); \ + aSNS.getArray()[ 0 ] = Service1; \ + return aSNS; \ +} + #endif /* !_UCBHELPER_MACROS_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/inc/ucbhelper/providerhelper.hxx b/ucbhelper/inc/ucbhelper/providerhelper.hxx index 60028c3f1ead..24f63ebeef7e 100644 --- a/ucbhelper/inc/ucbhelper/providerhelper.hxx +++ b/ucbhelper/inc/ucbhelper/providerhelper.hxx @@ -76,8 +76,7 @@ class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject, protected: osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; private: UCBHELPER_DLLPRIVATE void removeContent( ContentImplHelper* pContent ); @@ -140,7 +139,7 @@ public: ContentProviderImplHelper( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& rXSMgr ); + ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~ContentProviderImplHelper(); ////////////////////////////////////////////////////////////////////// |