1 files changed, 24 insertions, 47 deletions

diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index fa069a631870..176eadafe8b1 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -26,8 +26,7 @@
 #include <algorithm>
 #include <strings.hrc>
 #include <ResId.hxx>
-#include <com/sun/star/chart2/XInternalDataProvider.hpp>
-#include <tools/diagnose_ex.h>
+#include <utility>
 
 using namespace ::com::sun::star;
 
@@ -37,12 +36,11 @@ using ::com::sun::star::uno::Any;
 using ::osl::MutexGuard;
 
 // necessary for MS compiler
-using ::comphelper::OPropertyContainer;
 using ::chart::impl::UncachedDataSequence_Base;
 
 namespace
 {
-constexpr OUStringLiteral lcl_aServiceName = u"com.sun.star.comp.chart.UncachedDataSequence";
+constexpr OUString lcl_aServiceName = u"com.sun.star.comp.chart.UncachedDataSequence"_ustr;
 
 enum
 {
@@ -56,37 +54,32 @@ namespace chart
 {
 
 UncachedDataSequence::UncachedDataSequence(
-    const rtl::Reference< InternalDataProvider > & xIntDataProv,
-    const OUString & rRangeRepresentation )
-        : OPropertyContainer( GetBroadcastHelper()),
-          UncachedDataSequence_Base( GetMutex()),
-          m_nNumberFormatKey(0),
-          m_xDataProvider( xIntDataProv ),
-          m_aSourceRepresentation( rRangeRepresentation ),
+    rtl::Reference< InternalDataProvider > xIntDataProv,
+    OUString aRangeRepresentation )
+        : m_nNumberFormatKey(0),
+          m_xDataProvider(std::move( xIntDataProv )),
+          m_aSourceRepresentation(std::move( aRangeRepresentation )),
           m_xModifyEventForwarder( new ModifyEventForwarder() )
 {
     registerProperties();
 }
 
 UncachedDataSequence::UncachedDataSequence(
-    const rtl::Reference< InternalDataProvider > & xIntDataProv,
-    const OUString & rRangeRepresentation,
+    rtl::Reference< InternalDataProvider > xIntDataProv,
+    OUString aRangeRepresentation,
     const OUString & rRole )
-        : OPropertyContainer( GetBroadcastHelper()),
-          UncachedDataSequence_Base( GetMutex()),
-          m_nNumberFormatKey(0),
-          m_xDataProvider( xIntDataProv ),
-          m_aSourceRepresentation( rRangeRepresentation ),
+        : m_nNumberFormatKey(0),
+          m_xDataProvider(std::move( xIntDataProv )),
+          m_aSourceRepresentation(std::move( aRangeRepresentation )),
           m_xModifyEventForwarder( new ModifyEventForwarder() )
 {
     registerProperties();
-    setFastPropertyValue_NoBroadcast( PROP_PROPOSED_ROLE, uno::Any( rRole ));
+    std::unique_lock<std::mutex> aGuard;
+    setFastPropertyValue_NoBroadcast( aGuard, PROP_PROPOSED_ROLE, uno::Any( rRole ));
 }
 
 UncachedDataSequence::UncachedDataSequence( const UncachedDataSequence & rSource )
-        : OPropertyContainer( GetBroadcastHelper()),
-          UncachedDataSequence_Base( GetMutex()),
-          m_nNumberFormatKey( rSource.m_nNumberFormatKey ),
+        : m_nNumberFormatKey( rSource.m_nNumberFormatKey ),
           m_sRole( rSource.m_sRole ),
           m_xDataProvider( rSource.m_xDataProvider ),
           m_aSourceRepresentation( rSource.m_aSourceRepresentation ),
@@ -119,8 +112,8 @@ void UncachedDataSequence::registerProperties()
                       cppu::UnoType<decltype(m_aXMLRange)>::get() );
 }
 
-IMPLEMENT_FORWARD_XINTERFACE2( UncachedDataSequence, UncachedDataSequence_Base, OPropertyContainer )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Base, OPropertyContainer )
+IMPLEMENT_FORWARD_XINTERFACE2( UncachedDataSequence, UncachedDataSequence_Base, comphelper::OPropertyContainer2 )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Base, comphelper::OPropertyContainer2 )
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertySetInfo()
@@ -168,7 +161,7 @@ css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServic
 Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
 {
     Sequence< double > aResult;
-    MutexGuard aGuard( GetMutex() );
+    std::unique_lock<std::mutex> aGuard;
     if( m_xDataProvider.is())
     {
         const Sequence< uno::Any > aValues( m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation ));
@@ -183,7 +176,7 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
 Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
 {
     Sequence< OUString > aResult;
-    MutexGuard aGuard( GetMutex() );
+    std::unique_lock<std::mutex> aGuard;
     if( m_xDataProvider.is())
     {
         const Sequence< uno::Any > aValues( m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation ));
@@ -197,7 +190,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
 // ________ XDataSequence  ________
 Sequence< Any > SAL_CALL UncachedDataSequence::getData()
 {
-    MutexGuard aGuard( GetMutex() );
+    std::unique_lock<std::mutex> aGuard;
     if( m_xDataProvider.is())
         return m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation );
     return Sequence< Any >();
@@ -213,7 +206,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data:
     // auto-generated label
     sal_Int32 nSeries = m_aSourceRepresentation.toInt32() + 1;
     OUString aResString(::chart::SchResId(STR_DATA_UNNAMED_SERIES_WITH_INDEX));
-    static const OUStringLiteral aReplacementStr(u"%NUMBER");
+    static constexpr OUString aReplacementStr(u"%NUMBER"_ustr);
     sal_Int32 nIndex = aResString.indexOf(aReplacementStr);
     OUString aName;
     if( nIndex != -1 )
@@ -229,7 +222,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data:
 // ____ XIndexReplace ____
 void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
-    MutexGuard aGuard( GetMutex() );
+    std::unique_lock<std::mutex> aGuard;
     Sequence< Any > aData( getData());
     if( Index < aData.getLength() &&
         m_xDataProvider.is() )
@@ -298,28 +291,12 @@ void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified )
 // ____ XModifyBroadcaster (base of XModifiable) ____
 void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener )
 {
-    try
-    {
-        Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
-        xBroadcaster->addModifyListener( aListener );
-    }
-    catch( const uno::Exception & )
-    {
-        DBG_UNHANDLED_EXCEPTION("chart2");
-    }
+    m_xModifyEventForwarder->addModifyListener( aListener );
 }
 
 void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener )
 {
-    try
-    {
-        Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
-        xBroadcaster->removeModifyListener( aListener );
-    }
-    catch( const uno::Exception & )
-    {
-        DBG_UNHANDLED_EXCEPTION("chart2");
-    }
+    m_xModifyEventForwarder->removeModifyListener( aListener );
 }
 
 void UncachedDataSequence::fireModifyEvent()