From cd71034b26a404c8f9b763865ef6ebdd0adeebb7 Mon Sep 17 00:00:00 2001
From: Noel Grandin
Date: Fri, 1 Jul 2016 09:46:23 +0200
Subject: 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
Reviewed-by: Noel Grandin
---
include/canvas/base/bitmapcanvasbase.hxx | 2 +-
include/canvas/base/bufferedgraphicdevicebase.hxx | 2 +-
include/canvas/base/cachedprimitivebase.hxx | 4 ++--
include/canvas/base/canvasbase.hxx | 2 +-
include/canvas/base/canvascustomspritebase.hxx | 2 +-
include/canvas/base/spritecanvasbase.hxx | 2 +-
include/canvas/parametricpolypolygon.hxx | 4 ++--
include/comphelper/accessiblecontexthelper.hxx | 4 ++--
include/comphelper/accessiblewrapper.hxx | 4 ++--
include/comphelper/broadcasthelper.hxx | 9 ---------
include/comphelper/proxyaggregation.hxx | 4 ++--
include/comphelper/weakeventlistener.hxx | 4 ++--
include/connectivity/sdbcx/VColumn.hxx | 4 ++--
include/connectivity/sdbcx/VGroup.hxx | 4 ++--
include/connectivity/sdbcx/VIndex.hxx | 4 ++--
include/connectivity/sdbcx/VKey.hxx | 4 ++--
include/connectivity/sdbcx/VTable.hxx | 4 ++--
include/connectivity/sdbcx/VUser.hxx | 4 ++--
include/drawinglayer/primitive2d/baseprimitive2d.hxx | 6 +++---
include/drawinglayer/primitive3d/baseprimitive3d.hxx | 4 ++--
include/editeng/AccessibleEditableTextPara.hxx | 4 ++--
include/svtools/accessibleruler.hxx | 4 ++--
include/svtools/framestatuslistener.hxx | 4 ++--
include/svtools/popupmenucontrollerbase.hxx | 4 ++--
include/svtools/statusbarcontroller.hxx | 4 ++--
25 files changed, 44 insertions(+), 53 deletions(-)
(limited to 'include')
diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index 4bab9ee31663..7b73477b64cb 100644
--- a/include/canvas/base/bitmapcanvasbase.hxx
+++ b/include/canvas/base/bitmapcanvasbase.hxx
@@ -44,7 +44,7 @@ namespace canvas
@tpl Mutex
Lock strategy to use. Defaults to using the
- OBaseMutex-provided lock. Every time one of the methods is
+ BaseMutex-provided lock. Every time one of the methods is
entered, an object of type Mutex is created with m_aMutex as
the sole parameter, and destroyed again when the method scope
is left.
diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx
index 1f1034f742f5..fb63de688739 100644
--- a/include/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/include/canvas/base/bufferedgraphicdevicebase.hxx
@@ -59,7 +59,7 @@ namespace canvas
@tpl Mutex
Lock strategy to use. Defaults to using the
- OBaseMutex-provided lock. Every time one of the methods is
+ BaseMutex-provided lock. Every time one of the methods is
entered, an object of type Mutex is created with m_aMutex as
the sole parameter, and destroyed again when the method scope
is left.
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 7393b1dcff91..a467595202ba 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -26,7 +26,7 @@
#include
#include
#include
-#include
+#include
#include
*/
- class OWeakListenerAdapterBase : public OBaseMutex
+ class OWeakListenerAdapterBase : public cppu::BaseMutex
{
private:
css::uno::WeakReference< css::uno::XInterface >
diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index 25bc310d6a2c..1bc671d8f29d 100644
--- a/include/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.hxx
@@ -25,7 +25,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -43,7 +43,7 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OColumn :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public OColumn_BASE,
public OColumnDescriptor_BASE,
public OColumn_PROP,
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index 0fceed98af13..bb985e69c55b 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -28,7 +28,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -48,7 +48,7 @@ namespace connectivity
css::lang::XServiceInfo> OGroup_BASE;
class OOO_DLLPUBLIC_DBTOOLS OGroup :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public OGroup_BASE,
public IRefreshableUsers,
public ::comphelper::OPropertyArrayUsageHelper,
diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx
index 61cc4f31269b..2f1345f75e42 100644
--- a/include/connectivity/sdbcx/VIndex.hxx
+++ b/include/connectivity/sdbcx/VIndex.hxx
@@ -25,8 +25,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
@@ -44,7 +44,7 @@ namespace connectivity
typedef ::comphelper::OIdPropertyArrayUsageHelper OIndex_PROP;
class OOO_DLLPUBLIC_DBTOOLS OIndex :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public ODescriptor_BASE,
public IRefreshableColumns,
public OIndex_PROP,
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index 0d52f22d2ff8..d856e7399af2 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -23,13 +23,13 @@
#include
#include
-#include
#include
#include
#include
#include
#include
#include
+#include
#include
#include
@@ -60,7 +60,7 @@ namespace connectivity
class OCollection;
class OOO_DLLPUBLIC_DBTOOLS OKey :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public ODescriptor_BASE,
public IRefreshableColumns,
public ::comphelper::OIdPropertyArrayUsageHelper,
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index b855a71779ca..00be9f3746a6 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -59,7 +59,7 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OTable :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public OTable_BASE,
public OTableDescriptor_BASE,
public IRefreshableColumns,
diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index b81fed64aba8..2dcd02fdf755 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
@@ -25,8 +25,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
@@ -45,7 +45,7 @@ namespace connectivity
css::lang::XServiceInfo> OUser_BASE;
class OOO_DLLPUBLIC_DBTOOLS OUser :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public OUser_BASE,
public IRefreshableGroups,
public ::comphelper::OPropertyArrayUsageHelper,
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 9bcd17e105fc..945ebde3c9f1 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include
#include
@@ -95,7 +95,7 @@ namespace drawinglayer
instance and copying or changing values is not intended. The idea is to hold all data
needed for visualisation of this primitive in unchangeable form.
- It is derived from comphelper::OBaseMutex to have a Mutex at hand; in a base
+ It is derived from cppu::BaseMutex to have a Mutex at hand; in a base
implementation this may not be needed, but e.g. when buffering at last decomposition
in a local member, multiple threads may try to decompose at the same time, so locking
is needed to avoid race conditions seen from the UNO object implementation.
@@ -157,7 +157,7 @@ namespace drawinglayer
in their get2DDecomposition/getB2DRange implementations.
*/
class DRAWINGLAYER_DLLPUBLIC BasePrimitive2D
- : protected comphelper::OBaseMutex,
+ : protected cppu::BaseMutex,
public BasePrimitive2DImplBase
{
BasePrimitive2D(const BasePrimitive2D&) = delete;
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 0fa964e7b91a..5326d58a3252 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -23,8 +23,8 @@
#include
#include
+#include
#include
-#include
#include
@@ -93,7 +93,7 @@ namespace drawinglayer
That's all for 3D!
*/
class DRAWINGLAYER_DLLPUBLIC BasePrimitive3D
- : protected comphelper::OBaseMutex,
+ : protected cppu::BaseMutex,
public BasePrimitive3DImplBase
{
BasePrimitive3D(const BasePrimitive3D&) = delete;
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 8ac3bd69ac36..adaa80e4af34 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -38,7 +39,6 @@
#include
#include
-#include
#include
#include
#include
@@ -58,7 +58,7 @@ namespace accessibility
/** This class implements the actual text paragraphs for the EditEngine/Outliner UAA
*/
- class EDITENG_DLLPUBLIC AccessibleEditableTextPara : public ::comphelper::OBaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText
+ class EDITENG_DLLPUBLIC AccessibleEditableTextPara : public ::cppu::BaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText
{
protected:
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index f73d385faf47..b7747877bd8a 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -35,7 +35,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -60,7 +60,7 @@ typedef ::cppu::WeakAggComponentImplHelper5<
css::lang::XServiceInfo >
SvtRulerAccessible_Base;
-class SvtRulerAccessible : public ::comphelper::OBaseMutex, public SvtRulerAccessible_Base
+class SvtRulerAccessible : public ::cppu::BaseMutex, public SvtRulerAccessible_Base
{
public:
//===== internal ========================================================
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index 5597f7dfebed..1add42a7922c 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
@@ -39,7 +39,7 @@ namespace svt
class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener,
public css::frame::XFrameActionListener,
public css::lang::XComponent,
- public ::comphelper::OBaseMutex,
+ public ::cppu::BaseMutex,
public ::cppu::OWeakObject
{
public:
diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index 45258690addb..c9353f400e12 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -38,7 +38,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -55,7 +55,7 @@ namespace svt
css::frame::XDispatchProvider ,
css::frame::XDispatch > PopupMenuControllerBaseType;
- class SVT_DLLPUBLIC PopupMenuControllerBase : protected ::comphelper::OBaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
+ class SVT_DLLPUBLIC PopupMenuControllerBase : protected ::cppu::BaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
public PopupMenuControllerBaseType
{
public:
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index f7f16d9232f3..190fa24e8676 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -30,7 +30,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -39,7 +39,7 @@ namespace svt
class SVT_DLLPUBLIC StatusbarController :
public css::frame::XStatusbarController,
- public ::comphelper::OBaseMutex,
+ public ::cppu::BaseMutex,
public ::cppu::OWeakObject
{
public:
--
cgit