1 files changed, 13 insertions, 12 deletions
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index bcf92741f4b5..dd042698cc8e 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -40,23 +40,25 @@ using ::cppu::OPropertySetHelper;
 namespace property
 {
 
-OPropertySet::OPropertySet( ::osl::Mutex & par_rMutex ) :
-        OBroadcastHelper( par_rMutex ),
+OPropertySet::OPropertySet( ) :
+        OBroadcastHelper( m_aMutex ),
         // the following causes a warning; there seems to be no way to avoid it
         OPropertySetHelper( static_cast< OBroadcastHelper & >( *this )),
-        m_rMutex( par_rMutex ),
         m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault(false)
 {
 }
 
-OPropertySet::OPropertySet( const OPropertySet & rOther, ::osl::Mutex & par_rMutex ) :
-        OBroadcastHelper( par_rMutex ),
+OPropertySet::OPropertySet( const OPropertySet & rOther ) :
+        OBroadcastHelper( m_aMutex ),
         // the following causes a warning; there seems to be no way to avoid it
         OPropertySetHelper( static_cast< OBroadcastHelper & >( *this )),
-        m_rMutex( par_rMutex ),
+        css::lang::XTypeProvider(),
+        css::beans::XPropertyState(),
+        css::beans::XMultiPropertyStates(),
+        css::style::XStyleSupplier(),
         m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault(false)
 {
-    MutexGuard aGuard( m_rMutex );
+    MutexGuard aGuard( m_aMutex );
 
     m_aProperties = rOther.m_aProperties;
 
@@ -64,7 +66,7 @@ OPropertySet::OPropertySet( const OPropertySet & rOther, ::osl::Mutex & par_rMut
     for(auto& rProp : m_aProperties)
     {
         if( rProp.second.hasValue() &&
-            rProp.second.getValueType().getTypeClass() == uno::TypeClass_INTERFACE )
+            rProp.second.getValueTypeClass() == uno::TypeClass_INTERFACE )
         {
             Reference< util::XCloneable > xCloneable;
             if( rProp.second >>= xCloneable )
@@ -264,7 +266,6 @@ void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast
     {
         aDefault.clear();
     }
-    SetPropertyValueByHandle( nHandle, rValue );
     if( !m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault && aDefault.hasValue() && aDefault == rValue ) //#i98893# don't export defaults to file
         SetPropertyToDefault( nHandle );
     else
@@ -363,7 +364,7 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle )
 {
     if( ! SetStyle( xStyle ))
         throw lang::IllegalArgumentException(
-            "Empty Style",
+            u"Empty Style"_ustr,
             static_cast< beans::XPropertySet * >( this ),
             0 );
 }
@@ -406,7 +407,7 @@ Sequence< beans::PropertyState > OPropertySet::GetPropertyStatesByHandle(
 
 void OPropertySet::SetPropertyToDefault( sal_Int32 nHandle )
 {
-    tPropertyMap::iterator aFoundIter( m_aProperties.find( nHandle ) );
+    auto aFoundIter( m_aProperties.find( nHandle ) );
 
     if( m_aProperties.end() != aFoundIter )
     {
@@ -432,7 +433,7 @@ bool OPropertySet::GetPropertyValueByHandle(
 {
     bool bResult = false;
 
-    tPropertyMap::const_iterator aFoundIter( m_aProperties.find( nHandle ) );
+    auto aFoundIter( m_aProperties.find( nHandle ) );
 
     if( m_aProperties.end() != aFoundIter )
     {