diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-14 13:15:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-14 14:41:54 +0200 |
| commit | 11fd73acce5d8bff7025bb6ddcbaf99d9d70b545 (patch) | |
| tree | 1a3d4dbe24e4bbbf301eca3a277e211483b3312a /include/comphelper/ChainablePropertySet.hxx | |
| parent | a883783c2a1b0e7a8ee5b46387d1e1e3bc5e19bd (diff) | |
SolarMutex does not belong into the URE interface
...so move it from osl/mutex.hxx to its own comphelper/solarmutex.hxx. It looks
like a newbie mistake that 59e7685d8d812ee8773f57475cbe3aa2a0bdfc81 "Create an
abstract interface to be used to implement a SolarMutex" put it here in the
first place.
I do not consider this an incompatible change really, as no external URE client
code should have used SolarMutex anyway.
(Also included some clean up, like removing unused
{Clearable,Resettable}SolarGuard, and spelling out SolarGuard in the few places
it is used.)
Change-Id: I121ffb5b7cefbc19e88b5405e5a85ffc895be852
Diffstat (limited to 'include/comphelper/ChainablePropertySet.hxx')
| -rw-r--r-- | include/comphelper/ChainablePropertySet.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx index 2dfe5f3ca256..62546c0605e5 100644 --- a/include/comphelper/ChainablePropertySet.hxx +++ b/include/comphelper/ChainablePropertySet.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <comphelper/PropertyInfoHash.hxx> #include "comphelper/comphelperdllapi.h" +#include "comphelper/solarmutex.hxx" namespace comphelper { @@ -59,7 +60,7 @@ namespace comphelper friend class MasterPropertySet; protected: ChainablePropertySetInfo *mpInfo; - osl::SolarMutex* mpMutex; + SolarMutex* mpMutex; ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySetInfo > mxInfo; virtual void _preSetValues () @@ -89,7 +90,7 @@ namespace comphelper throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: - ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, osl::SolarMutex* pMutex = NULL ) + ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, SolarMutex* pMutex = NULL ) throw(); virtual ~ChainablePropertySet() throw(); |