comphelper::OBaseMutex -> cppu::BaseMutex

convert usage of deprecated class, and remove the old class

Change-Id: I19fb9271090d19e5531622b58492e1a848d306e2
Reviewed-on: https://gerrit.libreoffice.org/26843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

6 files changed, 13 insertions, 13 deletions

diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index b7f7040e16e8..a87d6f3ea50a 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <osl/mutex.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <svl/lstner.hxx>
 
 #include <set>
@@ -78,7 +78,7 @@ typedef ::cppu::WeakAggComponentImplHelper7<
                 SvxGraphCtrlAccessibleContext_Base;
 
 class SvxGraphCtrlAccessibleContext:
-    private comphelper::OBaseMutex, public SvxGraphCtrlAccessibleContext_Base,
+    private cppu::BaseMutex, public SvxGraphCtrlAccessibleContext_Base,
     public SfxListener, public accessibility::IAccessibleViewForwarder
 {
 public:
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 64802ad16f7f..6db2813a6961 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -71,10 +71,10 @@
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 
-#include <comphelper/broadcasthelper.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/propshlp.hxx>
 #include <comphelper/interfacecontainer2.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/propshlp.hxx>
 #include <rtl/ref.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
@@ -126,7 +126,7 @@ namespace svxform
                                                     >   FormController_BASE;
 
     class ColumnInfoCache;
-    class FormController :public ::comphelper::OBaseMutex
+    class FormController :public ::cppu::BaseMutex
                                         ,public FormController_BASE
                                         ,public ::cppu::OPropertySetHelper
                                         ,public DispatchInterceptor
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 35ab8e744e68..b9a572065967 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -38,7 +38,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/compbase6.hxx>
 #include <cppuhelper/compbase5.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/servicehelper.hxx>
 
 #include <svx/rectenum.hxx>
@@ -63,7 +63,7 @@ typedef ::cppu::WeakAggComponentImplHelper5<
             SvxPixelCtlAccessibleChild_BASE;
 
 class SvxPixelCtlAccessibleChild :
-    public ::comphelper::OBaseMutex,
+    public ::cppu::BaseMutex,
     public SvxPixelCtlAccessibleChild_BASE
 {
     SvxPixelCtl& mrParentWindow;
@@ -162,7 +162,7 @@ typedef ::cppu::WeakAggComponentImplHelper6<
             SvxPixelCtlAccessible_BASE;
 
 class SvxPixelCtlAccessible :
-    public ::comphelper::OBaseMutex,
+    public ::cppu::BaseMutex,
     public SvxPixelCtlAccessible_BASE
 {
     SvxPixelCtl& mrPixelCtl;
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 4726f5ca6c03..2f3d072b3e82 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -41,7 +41,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/compbase6.hxx>
 #include <cppuhelper/compbase7.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <svx/rectenum.hxx>
 #include <vcl/vclptr.hxx>
@@ -68,7 +68,7 @@ typedef ::cppu::WeakAggComponentImplHelper6<
             css::lang::XServiceInfo >
             SvxRectCtlAccessibleContext_Base;
 
-class SvxRectCtlAccessibleContext : public ::comphelper::OBaseMutex, public SvxRectCtlAccessibleContext_Base
+class SvxRectCtlAccessibleContext : public ::cppu::BaseMutex, public SvxRectCtlAccessibleContext_Base
 {
 public:
     // internal
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 006cdd5b458f..41235cd76a2c 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -38,7 +38,7 @@ typedef cppu::WeakComponentImplHelper< css::graphic::XPrimitiveFactory2D, css::l
 
 // base class for C++ implementation of css::graphic::XPrimitiveFactory2D
 class PrimitiveFactory2D
-    :   protected comphelper::OBaseMutex,
+    :   protected cppu::BaseMutex,
         public PrimitiveFactory2DImplBase
 {
 public:
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index 411bf2f97c59..3f6f82b6f697 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -26,7 +26,7 @@
 #include <basegfx/range/b2irectangle.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/listenernotification.hxx>
 #include "celltypes.hxx"
 
@@ -51,7 +51,7 @@ protected:
 
 typedef ::cppu::WeakComponentImplHelper< css::table::XTable, css::util::XBroadcaster > TableModelBase;
 
-class TableModel : public ::comphelper::OBaseMutex,
+class TableModel : public ::cppu::BaseMutex,
                    public TableModelBase,
                    public ICellRange
 {