diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 12:16:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-23 13:48:37 +0200 |
| commit | 93449eee17d88532cb8679496a523ded9cd03b0a (patch) | |
| tree | 2cda72577449d17af20039bee928406d92b17fcf /include/comphelper/ChainablePropertySet.hxx | |
| parent | f586c7ec352b3b7b23dba0e1e774d85b1c14e2b7 (diff) | |
merge comphelper::ChainablePropertySet with comphelper::ChainableHelperNoState
Change-Id: I8fb93665b2a2f46019306f473882a7f3d7aece87
Reviewed-on: https://gerrit.libreoffice.org/36787
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/comphelper/ChainablePropertySet.hxx')
| -rw-r--r-- | include/comphelper/ChainablePropertySet.hxx | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx index bef7efaf5ae2..6926f6b902e2 100644 --- a/include/comphelper/ChainablePropertySet.hxx +++ b/include/comphelper/ChainablePropertySet.hxx @@ -23,9 +23,11 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/PropertyInfoHash.hxx> #include <comphelper/comphelperdllapi.h> #include <comphelper/solarmutex.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> namespace comphelper @@ -54,9 +56,15 @@ namespace comphelper namespace comphelper { - class COMPHELPER_DLLPUBLIC ChainablePropertySet : public css::beans::XPropertySet, - public css::beans::XPropertyState, - public css::beans::XMultiPropertySet + typedef cppu::WeakImplHelper + < + css::beans::XPropertySet, + css::beans::XMultiPropertySet, + css::lang::XServiceInfo + > + ChainablePropertySetBase; + class COMPHELPER_DLLPUBLIC ChainablePropertySet : public ChainablePropertySetBase, + public css::beans::XPropertyState { friend class MasterPropertySet; protected: @@ -102,7 +110,14 @@ namespace comphelper ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, SolarMutex* pMutex = nullptr ) throw(); virtual ~ChainablePropertySet() - throw(); + throw() override; + + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override + { return ChainablePropertySetBase::queryInterface( aType ); } + void SAL_CALL acquire( ) throw () override + { ChainablePropertySetBase::acquire( ); } + void SAL_CALL release( ) throw () override + { ChainablePropertySetBase::release( ); } // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; |