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>

8 files changed, 18 insertions, 16 deletions

diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index 7143c3483b34..4d60701ff66b 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/report/XFixedLine.hpp>
 #include "ReportControlModel.hxx"
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
 
@@ -38,7 +38,7 @@ namespace reportdesign
      * \ingroup reportdesign_api
      *
      */
-    class OFixedLine :  public comphelper::OBaseMutex,
+    class OFixedLine :  public cppu::BaseMutex,
                             public FixedLineBase,
                             public FixedLinePropertySet
     {
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index f5f514161e21..df6566c1ea09 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/report/XFixedText.hpp>
 #include "ReportControlModel.hxx"
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
 
@@ -39,7 +39,7 @@ namespace reportdesign
      * \ingroup reportdesign_api
      *
      */
-    class OFixedText :  public comphelper::OBaseMutex,
+    class OFixedText :  public cppu::BaseMutex,
                             public FixedTextBase,
                             public FixedTextPropertySet
     {
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index 99c3db4d468d..d9c2ab5caa7b 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/report/XFormatCondition.hpp>
 #include "ReportControlModel.hxx"
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
 
@@ -37,7 +37,7 @@ namespace reportdesign
      * \ingroup reportdesign_api
      *
      */
-    class OFormatCondition :    public comphelper::OBaseMutex,
+    class OFormatCondition :    public cppu::BaseMutex,
                             public FormatConditionBase,
                             public FormatConditionPropertySet
     {
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index 3b0b49754ddf..62227177693d 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -24,9 +24,11 @@
 #include <com/sun/star/report/Function.hpp>
 #include "ReportControlModel.hxx"
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
+
+
 namespace reportdesign
 {
     typedef ::cppu::PropertySetMixin<        css::report::XFormattedField    > FormattedFieldPropertySet;
@@ -37,7 +39,7 @@ namespace reportdesign
      * \ingroup reportdesign_api
      *
      */
-    class OFormattedField : public comphelper::OBaseMutex,
+    class OFormattedField : public cppu::BaseMutex,
                             public FormattedFieldBase,
                             public FormattedFieldPropertySet
     {
diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx
index 355a328759fd..23f28b19e5ae 100644
--- a/reportdesign/source/core/inc/Functions.hxx
+++ b/reportdesign/source/core/inc/Functions.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/report/XFunctionsSupplier.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <list>
 
@@ -35,7 +35,7 @@ namespace reportdesign
      * \ingroup reportdesign_api
      *
      */
-    class OFunctions : public comphelper::OBaseMutex,
+    class OFunctions : public cppu::BaseMutex,
                     public FunctionsBase
     {
         typedef ::std::list< css::uno::Reference< css::report::XFunction > >  TFunctions;
diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx
index 88920da6849a..b80125217360 100644
--- a/reportdesign/source/core/inc/Groups.hxx
+++ b/reportdesign/source/core/inc/Groups.hxx
@@ -21,8 +21,8 @@
 
 #include <com/sun/star/report/XGroups.hpp>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/interfacecontainer2.hxx>
-#include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <list>
 
@@ -34,7 +34,7 @@ namespace reportdesign
      * \ingroup reportdesign_api
      *
      */
-    class OGroups : public comphelper::OBaseMutex,
+    class OGroups : public cppu::BaseMutex,
                     public GroupsBase
     {
         typedef ::std::list< css::uno::Reference< css::report::XGroup > > TGroups;
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index a80e9d597406..8ce365c425be 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/report/XImageControl.hpp>
 #include "ReportControlModel.hxx"
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
 
@@ -37,7 +37,7 @@ namespace reportdesign
      * \ingroup reportdesign_api
      *
      */
-    class OImageControl :   public comphelper::OBaseMutex,
+    class OImageControl :   public cppu::BaseMutex,
                             public ImageControlBase,
                             public ImageControlPropertySet
     {
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index 45248919345b..7d70b1ce6d7d 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/report/XShape.hpp>
 #include "ReportControlModel.hxx"
 #include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ReportHelperDefines.hxx"
 #include <comphelper/propagg.hxx>
@@ -39,7 +39,7 @@ namespace reportdesign
      * \ingroup reportdesign_api
      *
      */
-    class OShape :  public comphelper::OBaseMutex,
+    class OShape :  public cppu::BaseMutex,
                     public ShapeBase,
                     public ShapePropertySet
     {