deduplicate MutexAndBroadcastHelper

there are two very similar classes, standardise on the one in
include/comphelper

Change-Id: If85729dcea01e65a2d095bb211fe643c783ebf1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148442
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 33 insertions, 33 deletions

diff --git a/toolkit/inc/awt/vclxprinter.hxx b/toolkit/inc/awt/vclxprinter.hxx
index 41a74044bfba..e5440f38aac4 100644
--- a/toolkit/inc/awt/vclxprinter.hxx
+++ b/toolkit/inc/awt/vclxprinter.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/awt/XInfoPrinter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <toolkit/helper/mutexandbroadcasthelper.hxx>
+#include <comphelper/broadcasthelper.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
@@ -53,7 +53,7 @@ class Printer;
 typedef ::cppu::WeakImplHelper <   css::awt::XPrinterPropertySet
                                 >   VCLXPrinterPropertySet_Base;
 class VCLXPrinterPropertySet    :public VCLXPrinterPropertySet_Base
-                                ,public MutexAndBroadcastHelper
+                                ,public comphelper::OMutexAndBroadcastHelper
                                 ,public ::cppu::OPropertySetHelper
 {
 protected:
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index c0db73db46b9..6ace06179507 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -47,7 +47,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( VCLXPrinterPropertySet, VCLXPrinterPropertySet_Ba
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXPrinterPropertySet, VCLXPrinterPropertySet_Base, ::cppu::OPropertySetHelper )
 
 VCLXPrinterPropertySet::VCLXPrinterPropertySet( const OUString& rPrinterName )
-    : OPropertySetHelper( BrdcstHelper )
+    : OPropertySetHelper( m_aBHelper )
     , mxPrinter(VclPtrInstance< Printer >(rPrinterName))
 {
     SolarMutexGuard aSolarGuard;
@@ -92,7 +92,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > VCLXPrinterPropertySet::getP
 
 sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     bool bDifferent = false;
     switch ( nHandle )
@@ -129,7 +129,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( css::uno::Any & rConv
 
 void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     switch( nHandle )
     {
@@ -152,7 +152,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle
 
 void VCLXPrinterPropertySet::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const
 {
-    ::osl::MutexGuard aGuard( const_cast<VCLXPrinterPropertySet*>(this)->Mutex );
+    ::osl::MutexGuard aGuard( const_cast<VCLXPrinterPropertySet*>(this)->m_aMutex );
 
     switch( nHandle )
     {
@@ -172,7 +172,7 @@ void VCLXPrinterPropertySet::getFastPropertyValue( css::uno::Any& rValue, sal_In
 // css::awt::XPrinterPropertySet
 void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     css::uno::Any aValue;
     aValue <<= bHorizontal;
@@ -181,7 +181,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal )
 
 css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions(  )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     const sal_uInt16 nPaperBinCount = GetPrinter()->GetPaperBinCount();
     css::uno::Sequence< OUString > aDescriptions( nPaperBinCount );
@@ -198,7 +198,7 @@ css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions(  )
 
 void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     sal_uInt16 nPaperBin = sal::static_int_cast< sal_uInt16 >(
         o3tl::toInt32(o3tl::getToken(rFormDescription, 3, ';' )));
@@ -207,7 +207,7 @@ void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription )
 
 css::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup(  )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     SvMemoryStream aMem;
     aMem.WriteUInt32( BINARYSETUPMARKER );
@@ -217,7 +217,7 @@ css::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup(  )
 
 void VCLXPrinterPropertySet::setBinarySetup( const css::uno::Sequence< sal_Int8 >& data )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     SvMemoryStream aMem( const_cast<signed char*>(data.getConstArray()), data.getLength(), StreamMode::READ );
     sal_uInt32 nMarker;
@@ -246,7 +246,7 @@ VCLXPrinter::~VCLXPrinter()
 
 sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     if (mxPrinter)
     {
@@ -259,7 +259,7 @@ sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/
 
 void VCLXPrinter::end(  )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     if (mxListener)
     {
@@ -270,14 +270,14 @@ void VCLXPrinter::end(  )
 
 void VCLXPrinter::terminate(  )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     mxListener.reset();
 }
 
 css::uno::Reference< css::awt::XDevice > VCLXPrinter::startPage(  )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     if (mxListener)
     {
@@ -288,7 +288,7 @@ css::uno::Reference< css::awt::XDevice > VCLXPrinter::startPage(  )
 
 void VCLXPrinter::endPage(  )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     if (mxListener)
     {
@@ -313,7 +313,7 @@ VCLXInfoPrinter::~VCLXInfoPrinter()
 // css::awt::XInfoPrinter
 css::uno::Reference< css::awt::XDevice > VCLXInfoPrinter::createDevice(  )
 {
-    ::osl::MutexGuard aGuard( Mutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     return GetDevice();
 }
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 99fd5df859ae..d188ab20960b 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -419,7 +419,7 @@ namespace toolkit {
         maImageSets.insert( maImageSets.begin() + i_index, i_imageURLs );
 
         // listener notification
-        lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementInserted, i_index, i_imageURLs, *this );
+        lcl_notify( aGuard, m_aBHelper, &XContainerListener::elementInserted, i_index, i_imageURLs, *this );
     }
 
 
@@ -436,7 +436,7 @@ namespace toolkit {
         maImageSets[ i_index ] = i_imageURLs;
 
         // listener notification
-        lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementReplaced, i_index, i_imageURLs, *this );
+        lcl_notify( aGuard, m_aBHelper, &XContainerListener::elementReplaced, i_index, i_imageURLs, *this );
     }
 
 
@@ -455,19 +455,19 @@ namespace toolkit {
         maImageSets.erase( removalPos );
 
         // listener notification
-        lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementRemoved, i_index, aRemovedElement, *this );
+        lcl_notify( aGuard, m_aBHelper, &XContainerListener::elementRemoved, i_index, aRemovedElement, *this );
     }
 
 
     void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener )
     {
-        BrdcstHelper.addListener( cppu::UnoType<XContainerListener>::get(), i_listener );
+        m_aBHelper.addListener( cppu::UnoType<XContainerListener>::get(), i_listener );
     }
 
 
     void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener )
     {
-        BrdcstHelper.removeListener( cppu::UnoType<XContainerListener>::get(), i_listener );
+        m_aBHelper.removeListener( cppu::UnoType<XContainerListener>::get(), i_listener );
     }
 
 }
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index 090a6738f517..69552431ff09 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <o3tl/safeint.hxx>
 #include <rtl/ref.hxx>
-#include <toolkit/helper/mutexandbroadcasthelper.hxx>
+#include <comphelper/broadcasthelper.hxx>
 #include <mutex>
 #include <utility>
 
@@ -46,7 +46,7 @@ class MutableTreeDataModel;
 typedef std::vector< rtl::Reference< MutableTreeNode > > TreeNodeVector;
 
 class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeDataModel, XServiceInfo >,
-                             public MutexAndBroadcastHelper
+                             public comphelper::OMutexAndBroadcastHelper
 {
 public:
     MutableTreeDataModel();
@@ -139,7 +139,7 @@ MutableTreeDataModel::MutableTreeDataModel()
 
 void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode )
 {
-    ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( cppu::UnoType<XTreeDataModelListener>::get() );
+    ::cppu::OInterfaceContainerHelper* pIter = m_aBHelper.getContainer( cppu::UnoType<XTreeDataModelListener>::get() );
     if( !pIter )
         return;
 
@@ -201,12 +201,12 @@ Reference< XTreeNode > SAL_CALL MutableTreeDataModel::getRoot(  )
 
 void SAL_CALL MutableTreeDataModel::addTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener )
 {
-    BrdcstHelper.addListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener );
+    m_aBHelper.addListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener );
 }
 
 void SAL_CALL MutableTreeDataModel::removeTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener )
 {
-    BrdcstHelper.removeListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener );
+    m_aBHelper.removeListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener );
 }
 
 void SAL_CALL MutableTreeDataModel::dispose()
@@ -218,18 +218,18 @@ void SAL_CALL MutableTreeDataModel::dispose()
         mbDisposed = true;
         css::lang::EventObject aEvent;
         aEvent.Source.set( static_cast< ::cppu::OWeakObject* >( this ) );
-        BrdcstHelper.aLC.disposeAndClear( aEvent );
+        m_aBHelper.aLC.disposeAndClear( aEvent );
     }
 }
 
 void SAL_CALL MutableTreeDataModel::addEventListener( const Reference< XEventListener >& xListener )
 {
-    BrdcstHelper.addListener( cppu::UnoType<XEventListener>::get(), xListener );
+    m_aBHelper.addListener( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEventListener >& xListener )
 {
-    BrdcstHelper.removeListener( cppu::UnoType<XEventListener>::get(), xListener );
+    m_aBHelper.removeListener( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 OUString SAL_CALL MutableTreeDataModel::getImplementationName(  )
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 3147164332bd..90c61bfcb2a9 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -110,7 +110,7 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId,
 
 UnoControlModel::UnoControlModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel_Base()
-    ,OPropertySetHelper( BrdcstHelper )
+    ,OPropertySetHelper( m_aBHelper )
     ,maDisposeListeners( *this )
     ,m_xContext( rxContext )
 {
@@ -120,7 +120,7 @@ UnoControlModel::UnoControlModel( const Reference< XComponentContext >& rxContex
 
 UnoControlModel::UnoControlModel( const UnoControlModel& rModel )
     : UnoControlModel_Base()
-    , OPropertySetHelper( BrdcstHelper )
+    , OPropertySetHelper( m_aBHelper )
     , maData( rModel.maData )
     , maDisposeListeners( *this )
     , m_xContext( rModel.m_xContext )
@@ -442,7 +442,7 @@ void UnoControlModel::dispose(  )
     aEvt.Source = static_cast<css::uno::XAggregation*>(static_cast<cppu::OWeakAggObject*>(this));
     maDisposeListeners.disposeAndClear( aEvt );
 
-    BrdcstHelper.aLC.disposeAndClear( aEvt );
+    m_aBHelper.aLC.disposeAndClear( aEvt );
 
     // let the property set helper notify our property listeners
     OPropertySetHelper::disposing();