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, 12 insertions, 12 deletions

diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index de94fa7b3d5a..1bdaaabf828a 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -28,7 +28,7 @@
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/compbase5.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -69,7 +69,7 @@ typedef ::cppu::WeakAggComponentImplHelper5<
     implements basic functionality for various Accessibility interfaces and
     the event broadcaster and contains the osl::Mutex. */
 class AccessibleBrowseBoxBase :
-    public ::comphelper::OBaseMutex,
+    public ::cppu::BaseMutex,
     public AccessibleBrowseBoxImplHelper
 {
 public:
@@ -286,7 +286,7 @@ protected:
     void ensureIsAlive() const
         throw ( css::lang::DisposedException );
 
-    /** @return  The osl::Mutex member provided by the class OBaseMutex. */
+    /** @return  The osl::Mutex member provided by the class BaseMutex. */
     inline ::osl::Mutex& getOslMutex();
 
     /** Changes the name of the object (flat assignment, no notify).
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 978baf95675a..45e771397bbd 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -26,7 +26,7 @@
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/compbase4.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -62,7 +62,7 @@ typedef ::cppu::WeakAggComponentImplHelper4<
     implements basic functionality for various Accessibility interfaces and
     the event broadcaster and contains the osl::Mutex. */
 class AccessibleGridControlBase :
-    public ::comphelper::OBaseMutex,
+    public ::cppu::BaseMutex,
     public AccessibleGridControlImplHelper
 {
 public:
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index 24e98b720d6d..c9be43d09481 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -96,7 +96,7 @@ namespace accessibility
 
     // XAccessible providing an EditBrowseBoxTableCell
     class EditBrowseBoxTableCellAccess:
-        public comphelper::OBaseMutex,
+        public cppu::BaseMutex,
         public cppu::WeakComponentImplHelper<css::accessibility::XAccessible>
     {
     protected:
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
index f1fea9fcae48..b900acfdcaa3 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/compbase8.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/accessibletexthelper.hxx>
 #include <tools/gen.hxx>
 #include <vcl/vclptr.hxx>
@@ -57,7 +57,7 @@ namespace accessibility
                                                 , css::lang::XEventListener > AccessibleIconChoiceCtrlEntry_BASE;
 
     /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
-    class AccessibleIconChoiceCtrlEntry :   public ::comphelper::OBaseMutex,
+    class AccessibleIconChoiceCtrlEntry :   public ::cppu::BaseMutex,
                                        public AccessibleIconChoiceCtrlEntry_BASE,
                                     public ::comphelper::OCommonAccessibleText
     {
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
index bfcbbfc0df19..886c27e7b7aa 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 #include <cppuhelper/compbase9.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/accessibletexthelper.hxx>
 #include <svtools/treelistentry.hxx>
 #include <tools/gen.hxx>
@@ -68,7 +68,7 @@ namespace accessibility
                                                 , css::lang::XServiceInfo > AccessibleListBoxEntry_BASE;
 
     /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
-    class AccessibleListBoxEntry:public ::comphelper::OBaseMutex
+    class AccessibleListBoxEntry:public ::cppu::BaseMutex
                                    ,public AccessibleListBoxEntry_BASE
                                 ,public ::comphelper::OCommonAccessibleText
                                 ,public ListBoxAccessibleBase
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 1a1e2f958eae..3d21be9f2e4a 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/compbase6.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <comphelper/accessibletexthelper.hxx>
 
 // forward ---------------------------------------------------------------
@@ -56,7 +56,7 @@ typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible
 
 /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
 */
-class VCLXAccessibleListItem : public ::comphelper::OBaseMutex,
+class VCLXAccessibleListItem : public ::cppu::BaseMutex,
                                public ::comphelper::OCommonAccessibleText,
                                public VCLXAccessibleListItem_BASE
 {