[Libreoffice-commits] core.git: 2 commits - framework/source include/vcl

[Michael Stahl]

 framework/source/fwi/classes/propertysethelper.cxx |    5 +----
 include/vcl/svapp.hxx                              |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit dc6106f989f814d2e5c21943484598d456d0044a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 29 21:50:10 2016 +0200

    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

diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index 1e2e120..6a42b67 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;
commit 973dc1ebe03b0f1f0b0e167d64bac8b42c6f241c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 29 21:49:15 2016 +0200

    vcl: misleading copypasta in documentation
    
    Change-Id: I673940fde7484500cbf30d4a4b760a8bf4448e33

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 608a1b9..c946b35 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1555,7 +1555,7 @@ public:
         }
     }
 
-    /** Releases mutex. */
+    /** Re-acquires mutex. */
     void SAL_CALL reset()
     {
         if( m_bCleared)