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

Stephan Bergmann sbergman at redhat.com
Tue Mar 29 07:25:16 UTC 2016


 framework/source/fwi/classes/propertysethelper.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit d5e4fe23b2af09a2989a0b1c37b13bb4b2ea8787
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 29 09:24:00 2016 +0200

    cid#1357163: 'Constant' variable guards dead code
    
    ...after 2f804099b7daa42aecb8fa445072a381671f3385 "loplugin:constantparam in
    framework"
    
    Change-Id: Ife3ca1da7652ffc52ae2d6057712dcaa35ba2e06

diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index 69c083c..1e2e120 100644
--- a/framework/source/fwi/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
@@ -159,14 +159,10 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
 
     css::beans::Property aPropInfo = pIt->second;
 
-    bool bLocked = true;
     css::uno::Any aCurrentValue = impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle);
 
-    if (! bLocked)
-    {
-        // SAFE ->
-        aWriteLock.reset();
-    }
+    // SAFE ->
+    aWriteLock.reset();
 
     bool bWillBeChanged = (aCurrentValue != aValue);
     if (! bWillBeChanged)


More information about the Libreoffice-commits mailing list