diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-03-29 21:50:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-29 21:52:09 +0200 |
| commit | dc6106f989f814d2e5c21943484598d456d0044a (patch) | |
| tree | adc0b97fac50234934fbea5b54d00a4d6214d82c /framework/source | |
| parent | 973dc1ebe03b0f1f0b0e167d64bac8b42c6f241c (diff) | |
framework: cid#1357163 fix the fix d5e4fe23
The branch was never taken in the old code, and re-acquiring the mutex
without releasing it first is pointless.
Change-Id: Ic865dccf2c442d2625436e175aef91be59d05325
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/fwi/classes/propertysethelper.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 1e2e12043400..6a42b67f9d72 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -151,7 +151,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); // SAFE -> - SolarMutexResettableGuard aWriteLock; + SolarMutexGuard g; PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty); if (pIt == m_lProps.end()) @@ -161,9 +161,6 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, css::uno::Any aCurrentValue = impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle); - // SAFE -> - aWriteLock.reset(); - bool bWillBeChanged = (aCurrentValue != aValue); if (! bWillBeChanged) return; |