diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-09 14:35:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-12 08:36:20 +0200 |
| commit | d4eabd5da8ea3b5ac40659c22cde19b26b3c002b (patch) | |
| tree | 63c93e0287aa5668d8b2147b756d08ced533e7fd /include | |
| parent | 089ff7a374df9870c506c36720a1b9cab3a252f6 (diff) | |
pass comphelper::PropertySetInfo around using rtl::Reference
and remove some manual ref counting
Change-Id: Ib78122fbbf914e87e0aef1f8fffe3952639e5b22
Reviewed-on: https://gerrit.libreoffice.org/38607
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/propertysethelper.hxx | 4 | ||||
| -rw-r--r-- | include/svx/unoprov.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx index f9f150cfaa9d..a7ce8870bdab 100644 --- a/include/comphelper/propertysethelper.hxx +++ b/include/comphelper/propertysethelper.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <comphelper/comphelperdllapi.h> +#include <rtl/ref.hxx> #include <memory> namespace comphelper @@ -63,8 +64,7 @@ protected: virtual css::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ); public: - PropertySetHelper( comphelper::PropertySetInfo* pInfo ) throw(); - PropertySetHelper( comphelper::PropertySetInfo* pInfo, __sal_NoAcquire ) throw(); + PropertySetHelper( rtl::Reference<comphelper::PropertySetInfo> const & xInfo ) throw(); virtual ~PropertySetHelper() throw(); // XPropertySet diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx index 38a593092498..7d2651c6bfd8 100644 --- a/include/svx/unoprov.hxx +++ b/include/svx/unoprov.hxx @@ -114,7 +114,7 @@ namespace comphelper { class PropertySetInfo; } class SvxPropertySetInfoPool { public: - SVX_DLLPUBLIC static comphelper::PropertySetInfo* getOrCreate( sal_Int32 nServiceId ) throw(); + SVX_DLLPUBLIC static rtl::Reference<comphelper::PropertySetInfo> const & getOrCreate( sal_Int32 nServiceId ) throw(); private: static rtl::Reference<comphelper::PropertySetInfo> mxInfos[SVXUNO_SERVICEID_LASTID+1]; |