diff options
Diffstat (limited to 'chart2/source/inc/WrappedPropertySet.hxx')
| -rw-r--r-- | chart2/source/inc/WrappedPropertySet.hxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 639e29a7e50d..dabc6e33c5c4 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -18,8 +18,8 @@ */ #pragma once +#include <config_options.h> #include "WrappedProperty.hxx" -#include "MutexContainer.hxx" #include "charttoolsdllapi.hxx" #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> @@ -28,6 +28,7 @@ #include <cppuhelper/implbase.hxx> #include <memory> +#include <mutex> #include <vector> namespace cppu { class IPropertyArrayHelper; } @@ -36,9 +37,8 @@ namespace cppu { class OPropertyArrayHelper; } namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet : - public MutexContainer - , public ::cppu::WeakImplHelper +class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) WrappedPropertySet : + public ::cppu::WeakImplHelper < css::beans::XPropertySet , css::beans::XMultiPropertySet , css::beans::XPropertyState @@ -103,7 +103,9 @@ protected: //methods const WrappedProperty* getWrappedProperty( const OUString& rOuterName ); const WrappedProperty* getWrappedProperty( sal_Int32 nHandle ); -protected: //member + std::mutex m_aMutex; + +private: css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;//outer PropertySetInfo std::unique_ptr<::cppu::OPropertyArrayHelper> m_pPropertyArrayHelper;//holds all possible outer properties |