diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-09 18:35:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-10 12:17:36 +0200 |
| commit | d5c8684c05e33e87033d595c98fb50acd42d56a8 (patch) | |
| tree | 8f52500cf8da0afd936eccf6b0884fc78859059b /include | |
| parent | 51d8845959c75f8c8a3795e7601f947841d0fa60 (diff) | |
flatten PropertySetInfo a little
Change-Id: I46bc0dc2da9b52d5a2cb1e415328ab1f13a96ff3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120216
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/propertysetinfo.hxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx index 518b83375a3f..34717fcc6c2d 100644 --- a/include/comphelper/propertysetinfo.hxx +++ b/include/comphelper/propertysetinfo.hxx @@ -22,13 +22,12 @@ #include <sal/config.h> -#include <map> - #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/comphelperdllapi.h> #include <o3tl/typed_flags_set.hxx> -#include <memory> +#include <map> +#include <vector> enum class PropertyMoreFlags : sal_uInt8 { NONE = 0x00, @@ -77,8 +76,6 @@ struct PropertyMapEntry typedef std::map<OUString, PropertyMapEntry const *> PropertyMap; -class PropertyMapImpl; - // don't export to avoid duplicate WeakImplHelper definitions with MSVC class SAL_DLLPUBLIC_TEMPLATE PropertySetInfo_BASE : public ::cppu::WeakImplHelper< css::beans::XPropertySetInfo > @@ -90,8 +87,6 @@ class SAL_DLLPUBLIC_TEMPLATE PropertySetInfo_BASE class COMPHELPER_DLLPUBLIC PropertySetInfo final : public PropertySetInfo_BASE { -private: - std::unique_ptr<PropertyMapImpl> mpImpl; public: PropertySetInfo() noexcept; PropertySetInfo( PropertyMapEntry const * pMap ) noexcept; @@ -101,7 +96,7 @@ public: /** returns a stl map with all PropertyMapEntry pointer.<p> The key is the property name. */ - const PropertyMap& getPropertyMap() const noexcept; + const PropertyMap& getPropertyMap() const noexcept { return maPropertyMap; } /** adds an array of PropertyMapEntry to this instance.<p> The end is marked with a PropertyMapEntry where mpName equals NULL</p> @@ -114,6 +109,12 @@ public: virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override; virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override; + +private: + void addImpl(PropertyMapEntry const * pMap) noexcept; + + PropertyMap maPropertyMap; + std::vector< css::beans::Property > maProperties; }; } |