Consolidate MutexContainer GetMutex() vs. direct m_aMutex access

...at which point MutexContainer becomes all-inline and need no longer be
OOO_DLLPUBLIC_CHARTTOOLS

Change-Id: I2f9c089a1189cc8c0fe5cf1760f62e71c5bb7f51
Reviewed-on: https://gerrit.libreoffice.org/72052
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

5 files changed, 36 insertions, 36 deletions

diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index c97ff290c245..0de39f48ba0e 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -482,7 +482,7 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties
 // ____ XTitled ____
 Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject()
 {
-    MutexGuard aGuard( GetMutex() );
+    MutexGuard aGuard( m_aMutex );
     return m_xTitle;
 }
 
@@ -491,7 +491,7 @@ void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle
     Reference< util::XModifyListener > xModifyEventForwarder;
     Reference< chart2::XTitle > xOldTitle;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         xOldTitle = m_xTitle;
         xModifyEventForwarder = m_xModifyEventForwarder;
         m_xTitle = xNewTitle;
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 8402f320ce40..7b8e7ec57f94 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -303,7 +303,7 @@ Reference< beans::XPropertySet >
 
     Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         aSequences = comphelper::containerToSequence( m_aDataSequences );
     }
 
@@ -317,7 +317,7 @@ Reference< beans::XPropertySet >
     if( 0 <= nIndex && nIndex < xSeq->getData().getLength() )
     {
         {
-            MutexGuard aGuard( GetMutex() );
+            MutexGuard aGuard( m_aMutex );
             tDataPointAttributeContainer::iterator aIt( m_aAttributedDataPoints.find( nIndex ) );
             if( aIt != m_aAttributedDataPoints.end() )
                 xResult = (*aIt).second;
@@ -327,7 +327,7 @@ Reference< beans::XPropertySet >
             Reference< beans::XPropertySet > xParentProperties;
             Reference< util::XModifyListener > xModifyEventForwarder;
             {
-                MutexGuard aGuard( GetMutex() );
+                MutexGuard aGuard( m_aMutex );
                 xParentProperties = this;
                 xModifyEventForwarder = m_xModifyEventForwarder;
             }
@@ -335,7 +335,7 @@ Reference< beans::XPropertySet >
             // create a new XPropertySet for this data point
             xResult.set( new DataPoint( xParentProperties ) );
             {
-                MutexGuard aGuard( GetMutex() );
+                MutexGuard aGuard( m_aMutex );
                 m_aAttributedDataPoints[ nIndex ] = xResult;
             }
             ModifyListenerHelper::addListener( xResult, xModifyEventForwarder );
@@ -350,7 +350,7 @@ void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex )
     Reference< beans::XPropertySet > xDataPointProp;
     Reference< util::XModifyListener > xModifyEventForwarder;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         xModifyEventForwarder = m_xModifyEventForwarder;
         tDataPointAttributeContainer::iterator aIt( m_aAttributedDataPoints.find( nIndex ));
         if( aIt != m_aAttributedDataPoints.end())
@@ -374,7 +374,7 @@ void SAL_CALL DataSeries::resetAllDataPoints()
     tDataPointAttributeContainer  aOldAttributedDataPoints;
     Reference< util::XModifyListener > xModifyEventForwarder;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         xModifyEventForwarder = m_xModifyEventForwarder;
         std::swap( aOldAttributedDataPoints, m_aAttributedDataPoints );
     }
@@ -391,7 +391,7 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data:
     Reference< util::XModifyListener > xModifyEventForwarder;
     Reference< lang::XEventListener > xListener;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         xModifyEventForwarder = m_xModifyEventForwarder;
         xListener = this;
         std::swap( aOldDataSequences, m_aDataSequences );
@@ -408,7 +408,7 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data:
 // ____ XDataSource ____
 Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries::getDataSequences()
 {
-    MutexGuard aGuard( GetMutex() );
+    MutexGuard aGuard( m_aMutex );
     return comphelper::containerToSequence( m_aDataSequences );
 }
 
@@ -418,7 +418,7 @@ void SAL_CALL DataSeries::addRegressionCurve(
 {
     Reference< util::XModifyListener > xModifyEventForwarder;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         xModifyEventForwarder = m_xModifyEventForwarder;
         if( std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve )
             != m_aRegressionCurves.end())
@@ -437,7 +437,7 @@ void SAL_CALL DataSeries::removeRegressionCurve(
 
     Reference< util::XModifyListener > xModifyEventForwarder;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         xModifyEventForwarder = m_xModifyEventForwarder;
         tRegressionCurveContainerType::iterator aIt(
             std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) );
@@ -454,7 +454,7 @@ void SAL_CALL DataSeries::removeRegressionCurve(
 
 uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries::getRegressionCurves()
 {
-    MutexGuard aGuard( GetMutex() );
+    MutexGuard aGuard( m_aMutex );
     return comphelper::containerToSequence( m_aRegressionCurves );
 }
 
@@ -465,7 +465,7 @@ void SAL_CALL DataSeries::setRegressionCurves(
     tRegressionCurveContainerType aNewCurves( ContainerHelper::SequenceToVector( aRegressionCurves ) );
     Reference< util::XModifyListener > xModifyEventForwarder;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         xModifyEventForwarder = m_xModifyEventForwarder;
         std::swap( aOldCurves, m_aRegressionCurves );
         m_aRegressionCurves = aNewCurves;
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index b8ff4d65bd52..5c6e34bf0c38 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -336,7 +336,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall()
     uno::Reference< beans::XPropertySet > xRet;
     bool bAddListener = false;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         if( !m_xWall.is() )
         {
             m_xWall.set( new Wall() );
@@ -354,7 +354,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor()
     uno::Reference< beans::XPropertySet > xRet;
     bool bAddListener = false;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         if( !m_xFloor.is() )
         {
             m_xFloor.set( new Wall() );
@@ -369,7 +369,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor()
 
 uno::Reference< chart2::XLegend > SAL_CALL Diagram::getLegend()
 {
-    MutexGuard aGuard( GetMutex() );
+    MutexGuard aGuard( m_aMutex );
     return m_xLegend;
 }
 
@@ -377,7 +377,7 @@ void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewL
 {
     Reference< chart2::XLegend > xOldLegend;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         if( m_xLegend == xNewLegend )
             return;
         xOldLegend = m_xLegend;
@@ -394,14 +394,14 @@ Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme()
 {
     Reference< chart2::XColorScheme > xRet;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         xRet = m_xColorScheme;
     }
 
     if( !xRet.is())
     {
         xRet.set( createConfigColorScheme( m_xContext ));
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         m_xColorScheme = xRet;
     }
     return xRet;
@@ -410,7 +410,7 @@ Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme()
 void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorScheme >& xColorScheme )
 {
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         m_xColorScheme.set( xColorScheme );
     }
     fireModifyEvent();
@@ -434,7 +434,7 @@ void SAL_CALL Diagram::setDiagramData(
 // ____ XTitled ____
 uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject()
 {
-    MutexGuard aGuard( GetMutex() );
+    MutexGuard aGuard( m_aMutex );
     return m_xTitle;
 }
 
@@ -442,7 +442,7 @@ void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& x
 {
     Reference< chart2::XTitle > xOldTitle;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         if( m_xTitle == xNewTitle )
             return;
         xOldTitle = m_xTitle;
@@ -476,7 +476,7 @@ void SAL_CALL Diagram::addCoordinateSystem(
     const uno::Reference< chart2::XCoordinateSystem >& aCoordSys )
 {
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         if( std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys )
             != m_aCoordSystems.end())
             throw lang::IllegalArgumentException();
@@ -496,7 +496,7 @@ void SAL_CALL Diagram::removeCoordinateSystem(
     const uno::Reference< chart2::XCoordinateSystem >& aCoordSys )
 {
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         std::vector< uno::Reference< chart2::XCoordinateSystem > >::iterator
               aIt( std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys ));
         if( aIt == m_aCoordSystems.end())
@@ -511,7 +511,7 @@ void SAL_CALL Diagram::removeCoordinateSystem(
 
 uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::getCoordinateSystems()
 {
-    MutexGuard aGuard( GetMutex() );
+    MutexGuard aGuard( m_aMutex );
     return comphelper::containerToSequence( m_aCoordSystems );
 }
 
@@ -526,7 +526,7 @@ void SAL_CALL Diagram::setCoordinateSystems(
         aNew.push_back( aCoordinateSystems[0] );
     }
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         std::swap( aOld, m_aCoordSystems );
         m_aCoordSystems = aNew;
     }
@@ -538,7 +538,7 @@ void SAL_CALL Diagram::setCoordinateSystems(
 // ____ XCloneable ____
 Reference< util::XCloneable > SAL_CALL Diagram::createClone()
 {
-    MutexGuard aGuard( GetMutex() );
+    MutexGuard aGuard( m_aMutex );
     return Reference< util::XCloneable >( new Diagram( *this ));
 }
 
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 3c5f5a0cb0a0..f7d34282137b 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -124,14 +124,14 @@ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone()
 // ____ XFormattedString ____
 OUString SAL_CALL FormattedString::getString()
 {
-    MutexGuard aGuard( GetMutex());
+    MutexGuard aGuard( m_aMutex);
     return m_aString;
 }
 
 void SAL_CALL FormattedString::setString( const OUString& String )
 {
     {
-        MutexGuard aGuard( GetMutex());
+        MutexGuard aGuard( m_aMutex);
         m_aString = String;
     }
     //don't keep the mutex locked while calling out
@@ -142,7 +142,7 @@ void SAL_CALL FormattedString::setString( const OUString& String )
 // ____ XDataPointCustomLabelField ____
 css::chart2::DataPointCustomLabelFieldType SAL_CALL FormattedString::getFieldType()
 {
-    MutexGuard aGuard(GetMutex());
+    MutexGuard aGuard(m_aMutex);
     return m_aType;
 }
 
@@ -150,7 +150,7 @@ void SAL_CALL
 FormattedString::setFieldType(const css::chart2::DataPointCustomLabelFieldType Type)
 {
     {
-        MutexGuard aGuard(GetMutex());
+        MutexGuard aGuard(m_aMutex);
         m_aType = Type;
     }
     //don't keep the mutex locked while calling out
@@ -159,14 +159,14 @@ FormattedString::setFieldType(const css::chart2::DataPointCustomLabelFieldType T
 
 OUString SAL_CALL FormattedString::getGuid()
 {
-    MutexGuard aGuard( GetMutex());
+    MutexGuard aGuard( m_aMutex);
     return m_aGuid;
 }
 
 void SAL_CALL FormattedString::setGuid( const OUString& guid )
 {
     {
-        MutexGuard aGuard( GetMutex());
+        MutexGuard aGuard( m_aMutex);
         m_aGuid= guid;
     }
     //don't keep the mutex locked while calling out
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 8a02fab86dff..e203fec8316b 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -259,7 +259,7 @@ uno::Reference< util::XCloneable > SAL_CALL Title::createClone()
 // ____ XTitle ____
 uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL Title::getText()
 {
-    MutexGuard aGuard( GetMutex() );
+    MutexGuard aGuard( m_aMutex );
     return m_aStrings;
 }
 
@@ -267,7 +267,7 @@ void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XForm
 {
     uno::Sequence< uno::Reference< chart2::XFormattedString > > aOldStrings;
     {
-        MutexGuard aGuard( GetMutex() );
+        MutexGuard aGuard( m_aMutex );
         std::swap( m_aStrings, aOldStrings );
         m_aStrings = rNewStrings;
     }