diff options
author | Noel Grandin <noel@peralex.com> | 2016-07-01 09:46:23 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 06:49:07 +0000 |
commit | cd71034b26a404c8f9b763865ef6ebdd0adeebb7 (patch) | |
tree | ff2aaa6a6d1849b51d883d48dfdef04b17817fcd /include | |
parent | remove deprecated Link functions from Registry (diff) | |
download | core-cd71034b26a404c8f9b763865ef6ebdd0adeebb7.tar.gz core-cd71034b26a404c8f9b763865ef6ebdd0adeebb7.zip |
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>
Diffstat (limited to 'include')
25 files changed, 44 insertions, 53 deletions
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 <com/sun/star/rendering/XCachedPrimitive.hpp> #include <com/sun/star/rendering/ViewState.hpp> #include <cppuhelper/compbase2.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <canvas/canvastoolsdllapi.h> @@ -41,7 +41,7 @@ namespace canvas the XCachedPrimitive interface. */ class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase: - public comphelper::OBaseMutex, public CachedPrimitiveBase_Base + public cppu::BaseMutex, public CachedPrimitiveBase_Base { public: diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 159478374437..5713831c3fea 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -80,7 +80,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/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx index 328900573522..4e4175c70287 100644 --- a/include/canvas/base/canvascustomspritebase.hxx +++ b/include/canvas/base/canvascustomspritebase.hxx @@ -53,7 +53,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/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx index 89a3412d1c9c..41c1c3880669 100644 --- a/include/canvas/base/spritecanvasbase.hxx +++ b/include/canvas/base/spritecanvasbase.hxx @@ -48,7 +48,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/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx index cc514f8bec4e..8e21228416ba 100644 --- a/include/canvas/parametricpolypolygon.hxx +++ b/include/canvas/parametricpolypolygon.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XParametricPolyPolygon2D.hpp> #include <cppuhelper/compbase2.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <canvas/canvastoolsdllapi.h> @@ -43,7 +43,7 @@ namespace canvas typedef ::cppu::WeakComponentImplHelper2< css::rendering::XParametricPolyPolygon2D, css::lang::XServiceInfo > ParametricPolyPolygon_Base; - class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex, + class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::cppu::BaseMutex, public ParametricPolyPolygon_Base { public: diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 3308c09cc984..69759ee1aade 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -21,10 +21,10 @@ #define INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX #include <cppuhelper/compbase2.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> #include <memory> @@ -83,7 +83,7 @@ namespace comphelper /** helper class for implementing an AccessibleContext */ class COMPHELPER_DLLPUBLIC OAccessibleContextHelper - :public ::comphelper::OBaseMutex + :public ::cppu::BaseMutex ,public OAccessibleContextHelper_Base { private: diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index f1efb09c8ca0..84479c023f2a 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -33,10 +33,10 @@ #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/sequence.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/comphelperdllapi.h> @@ -238,7 +238,7 @@ namespace comphelper > OAccessibleContextWrapper_CBase; class COMPHELPER_DLLPUBLIC OAccessibleContextWrapper - :public OBaseMutex + :public cppu::BaseMutex ,public OAccessibleContextWrapper_CBase ,public OAccessibleContextWrapperHelper { diff --git a/include/comphelper/broadcasthelper.hxx b/include/comphelper/broadcasthelper.hxx index 61e7244cb3f3..d9586ee5b4f7 100644 --- a/include/comphelper/broadcasthelper.hxx +++ b/include/comphelper/broadcasthelper.hxx @@ -44,15 +44,6 @@ namespace comphelper const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return m_aBHelper; } }; - - // base class for all classes who are derived from OPropertySet and from OComponent - // @deprecated, you should use cppu::BaseMutex instead (cppuhelper/basemutex.hxx) - - class OBaseMutex - { - protected: - mutable ::osl::Mutex m_aMutex; - }; } #endif // INCLUDED_COMPHELPER_BROADCASTHELPER_HXX diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 4b82e8b2c687..eadafbf9aefb 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -25,8 +25,8 @@ #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> -#include <comphelper/broadcasthelper.hxx> #include <cppuhelper/compbase_ex.hxx> #include <comphelper/comphelperdllapi.h> @@ -176,7 +176,7 @@ namespace comphelper //= OComponentProxyAggregation - class COMPHELPER_DLLPUBLIC OComponentProxyAggregation :public OBaseMutex + class COMPHELPER_DLLPUBLIC OComponentProxyAggregation : public cppu::BaseMutex ,public cppu::WeakComponentImplHelperBase ,public OComponentProxyAggregationHelper { diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 23952e4e268d..87884637a92f 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -21,10 +21,10 @@ #define INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX #include <cppuhelper/compbase.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <cppuhelper/weakref.hxx> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> @@ -41,7 +41,7 @@ namespace comphelper holds it's listener hard. The adapter itself knows the real listener as weak reference, thus not affecting its life time.</p> */ - 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 <cppuhelper/compbase.hxx> #include <cppuhelper/implbase1.hxx> #include <connectivity/CommonTools.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -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 <com/sun/star/container/XNamed.hpp> #include <comphelper/proparrhlp.hxx> #include <cppuhelper/compbase.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <connectivity/sdbcx/VCollection.hxx> #include <comphelper/propertycontainer.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> @@ -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<OGroup>, 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 <com/sun/star/container/XNamed.hpp> #include <comphelper/IdPropArrayHelper.hxx> #include <cppuhelper/compbase2.hxx> +#include <cppuhelper/basemutex.hxx> #include <connectivity/CommonTools.hxx> -#include <comphelper/broadcasthelper.hxx> #include <connectivity/sdbcx/VTypeDef.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> @@ -44,7 +44,7 @@ namespace connectivity typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndex> 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 <comphelper/IdPropArrayHelper.hxx> #include <connectivity/CommonTools.hxx> -#include <comphelper/broadcasthelper.hxx> #include <connectivity/sdbcx/VTypeDef.hxx> #include <com/sun/star/container/XNamed.hpp> #include <connectivity/sdbcx/IRefreshable.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <cppuhelper/implbase1.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <memory> @@ -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<OKey>, 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 <comphelper/IdPropArrayHelper.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase4.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/container/XNamed.hpp> #include <connectivity/sdbcx/IRefreshable.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> @@ -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 <com/sun/star/sdbcx/XGroupsSupplier.hpp> #include <comphelper/proparrhlp.hxx> #include <cppuhelper/compbase.hxx> +#include <cppuhelper/basemutex.hxx> #include <connectivity/CommonTools.hxx> -#include <comphelper/broadcasthelper.hxx> #include <connectivity/sdbcx/VCollection.hxx> #include <com/sun/star/container/XNamed.hpp> #include <connectivity/sdbcx/IRefreshable.hxx> @@ -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<OUser>, 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 <cppuhelper/compbase1.hxx> #include <com/sun/star/graphic/XPrimitive2D.hpp> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <basegfx/range/b2drange.hxx> @@ -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 <drawinglayer/drawinglayerdllapi.h> #include <cppuhelper/compbase1.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/graphic/XPrimitive3D.hpp> -#include <comphelper/broadcasthelper.hxx> #include <basegfx/range/b3drange.hxx> @@ -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 <tools/gen.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/compbase.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -38,7 +39,6 @@ #include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp> #include <comphelper/accessibletexthelper.hxx> -#include <comphelper/broadcasthelper.hxx> #include <editeng/AccessibleParaManager.hxx> #include <editeng/AccessibleImageBullet.hxx> #include <editeng/unoedprx.hxx> @@ -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 <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/compbase5.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase5.hxx> #include <comphelper/servicehelper.hxx> #include <vcl/vclptr.hxx> @@ -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 <com/sun/star/frame/XStatusListener.hpp> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <unordered_map> @@ -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 <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/compbase7.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> @@ -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 <com/sun/star/util/XURLTransformer.hpp> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <tools/gen.hxx> #include <unordered_map> @@ -39,7 +39,7 @@ namespace svt class SVT_DLLPUBLIC StatusbarController : public css::frame::XStatusbarController, - public ::comphelper::OBaseMutex, + public ::cppu::BaseMutex, public ::cppu::OWeakObject { public: |