[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - extensions/source

[Libreoffice Gerrit user]

 extensions/source/propctrlr/propertyhandler.hxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9fe444b407f2bdcf1956ac3498c7443b571159de
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 22 15:14:57 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Oct 23 10:41:49 2018 +0200

    pvs-studio: V670 The uninitialized class member 'm_aMutex' is used
    
    Change-Id: I7ac2662afe77e6e9170b004b335635f97ae03692
    Reviewed-on: https://gerrit.libreoffice.org/62185
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index faad4b062f47..37ad084fcbe4 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <osl/interlck.h>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/uno3.hxx>
@@ -68,7 +69,8 @@ namespace pcr
                                                 >   PropertyHandler_Base;
     /** the base class for property handlers
     */
-    class PropertyHandler : public PropertyHandler_Base
+    class PropertyHandler : public ::cppu::BaseMutex
+                          , public PropertyHandler_Base
     {
     private:
         /// cache for getSupportedProperties
@@ -81,7 +83,6 @@ namespace pcr
         PropertyChangeListeners                               m_aPropertyListeners;
 
     protected:
-        mutable ::osl::Mutex                                  m_aMutex;
         /// the context in which the instance was created
         css::uno::Reference< css::uno::XComponentContext >    m_xContext;
         /// the component we're inspecting