summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/inc/extended/AccessibleBrowseBoxBase.hxx6
-rw-r--r--accessibility/inc/extended/AccessibleGridControlBase.hxx4
-rw-r--r--accessibility/inc/extended/accessibleeditbrowseboxcell.hxx2
-rw-r--r--accessibility/inc/extended/accessibleiconchoicectrlentry.hxx4
-rw-r--r--accessibility/inc/extended/accessiblelistboxentry.hxx4
-rw-r--r--accessibility/inc/standard/vclxaccessiblelistitem.hxx4
-rw-r--r--canvas/source/cairo/cairo_canvasfont.hxx4
-rw-r--r--canvas/source/cairo/cairo_textlayout.hxx4
-rw-r--r--canvas/source/directx/dx_canvasfont.hxx4
-rw-r--r--canvas/source/directx/dx_textlayout.hxx4
-rw-r--r--canvas/source/opengl/ogl_canvasfont.hxx4
-rw-r--r--canvas/source/opengl/ogl_textlayout.hxx4
-rw-r--r--canvas/source/vcl/canvasfont.hxx4
-rw-r--r--canvas/source/vcl/textlayout.hxx4
-rw-r--r--connectivity/source/cpool/ZConnectionWrapper.hxx4
-rw-r--r--connectivity/source/cpool/ZPooledConnection.hxx4
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.hxx2
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.hxx4
-rw-r--r--connectivity/source/drivers/kab/KConnection.hxx4
-rw-r--r--connectivity/source/drivers/kab/KResultSet.hxx2
-rw-r--r--connectivity/source/drivers/kab/KStatement.hxx2
-rw-r--r--connectivity/source/drivers/macab/MacabResultSet.hxx3
-rw-r--r--connectivity/source/drivers/macab/MacabStatement.hxx3
-rw-r--r--connectivity/source/drivers/mork/MResultSet.hxx2
-rw-r--r--connectivity/source/drivers/mork/MStatement.hxx2
-rw-r--r--connectivity/source/inc/FDatabaseMetaDataResultSet.hxx4
-rw-r--r--connectivity/source/inc/TDatabaseMetaDataBase.hxx4
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx4
-rw-r--r--connectivity/source/inc/ado/AResultSet.hxx4
-rw-r--r--connectivity/source/inc/ado/AStatement.hxx4
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx4
-rw-r--r--connectivity/source/inc/file/FStatement.hxx4
-rw-r--r--connectivity/source/inc/hsqldb/HConnection.hxx3
-rw-r--r--connectivity/source/inc/hsqldb/HDriver.hxx4
-rw-r--r--connectivity/source/inc/java/sql/JStatement.hxx4
-rw-r--r--connectivity/source/inc/java/sql/ResultSet.hxx2
-rw-r--r--connectivity/source/inc/mysql/YDriver.hxx4
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx4
-rw-r--r--connectivity/source/inc/odbc/OResultSet.hxx2
-rw-r--r--connectivity/source/inc/odbc/OStatement.hxx4
-rw-r--r--connectivity/workben/skeleton/SResultSet.hxx2
-rw-r--r--cui/source/dialogs/colorpicker.cxx4
-rw-r--r--dbaccess/source/core/api/RowSet.hxx5
-rw-r--r--dbaccess/source/core/api/resultset.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/SharedConnection.hxx3
-rw-r--r--dbaccess/source/core/dataaccess/connection.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx2
-rw-r--r--dbaccess/source/core/inc/ContainerMediator.hxx4
-rw-r--r--dbaccess/source/core/inc/ContentHelper.hxx4
-rw-r--r--dbaccess/source/core/inc/PropertyForward.hxx3
-rw-r--r--dbaccess/source/core/inc/TableDeco.hxx2
-rw-r--r--dbaccess/source/core/inc/column.hxx4
-rw-r--r--dbaccess/source/core/inc/querycomposer.hxx4
-rw-r--r--dbaccess/source/core/inc/statement.hxx7
-rw-r--r--drawinglayer/source/processor2d/vclhelperbufferdevice.cxx4
-rw-r--r--extensions/source/bibliography/formcontrolcontainer.cxx1
-rw-r--r--extensions/source/bibliography/formcontrolcontainer.hxx4
-rw-r--r--extensions/source/propctrlr/commoncontrol.hxx4
-rw-r--r--extensions/source/propctrlr/propertycomposer.hxx4
-rw-r--r--forms/source/component/Columns.hxx4
-rw-r--r--forms/source/richtext/featuredispatcher.hxx4
-rw-r--r--fpicker/source/office/commonpicker.hxx4
-rw-r--r--framework/inc/uielement/buttontoolbarcontroller.hxx4
-rw-r--r--include/canvas/base/bitmapcanvasbase.hxx2
-rw-r--r--include/canvas/base/bufferedgraphicdevicebase.hxx2
-rw-r--r--include/canvas/base/cachedprimitivebase.hxx4
-rw-r--r--include/canvas/base/canvasbase.hxx2
-rw-r--r--include/canvas/base/canvascustomspritebase.hxx2
-rw-r--r--include/canvas/base/spritecanvasbase.hxx2
-rw-r--r--include/canvas/parametricpolypolygon.hxx4
-rw-r--r--include/comphelper/accessiblecontexthelper.hxx4
-rw-r--r--include/comphelper/accessiblewrapper.hxx4
-rw-r--r--include/comphelper/broadcasthelper.hxx9
-rw-r--r--include/comphelper/proxyaggregation.hxx4
-rw-r--r--include/comphelper/weakeventlistener.hxx4
-rw-r--r--include/connectivity/sdbcx/VColumn.hxx4
-rw-r--r--include/connectivity/sdbcx/VGroup.hxx4
-rw-r--r--include/connectivity/sdbcx/VIndex.hxx4
-rw-r--r--include/connectivity/sdbcx/VKey.hxx4
-rw-r--r--include/connectivity/sdbcx/VTable.hxx4
-rw-r--r--include/connectivity/sdbcx/VUser.hxx4
-rw-r--r--include/drawinglayer/primitive2d/baseprimitive2d.hxx6
-rw-r--r--include/drawinglayer/primitive3d/baseprimitive3d.hxx4
-rw-r--r--include/editeng/AccessibleEditableTextPara.hxx4
-rw-r--r--include/svtools/accessibleruler.hxx4
-rw-r--r--include/svtools/framestatuslistener.hxx4
-rw-r--r--include/svtools/popupmenucontrollerbase.hxx4
-rw-r--r--include/svtools/statusbarcontroller.hxx4
-rw-r--r--reportdesign/source/core/inc/FixedLine.hxx4
-rw-r--r--reportdesign/source/core/inc/FixedText.hxx4
-rw-r--r--reportdesign/source/core/inc/FormatCondition.hxx4
-rw-r--r--reportdesign/source/core/inc/FormattedField.hxx6
-rw-r--r--reportdesign/source/core/inc/Functions.hxx4
-rw-r--r--reportdesign/source/core/inc/Groups.hxx4
-rw-r--r--reportdesign/source/core/inc/ImageControl.hxx4
-rw-r--r--reportdesign/source/core/inc/Shape.hxx4
-rw-r--r--sc/inc/chartuno.hxx2
-rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx4
-rw-r--r--sc/source/ui/inc/ChartRangeSelectionListener.hxx4
-rw-r--r--sc/source/ui/unoobj/celllistsource.hxx4
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.hxx4
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.hxx4
-rw-r--r--sfx2/source/control/thumbnailviewacc.hxx4
-rw-r--r--slideshow/test/demoshow.cxx6
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx6
-rw-r--r--svtools/source/control/valueimp.hxx4
-rw-r--r--svtools/source/uno/popupmenucontrollerbase.cxx2
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx4
-rw-r--r--svx/source/inc/formcontroller.hxx6
-rw-r--r--svx/source/inc/svxpixelctlaccessiblecontext.hxx6
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx4
-rw-r--r--svx/source/sdr/primitive2d/primitivefactory2d.cxx2
-rw-r--r--svx/source/table/tablemodel.hxx4
-rw-r--r--vcl/win/gdi/salbmp.cxx4
114 files changed, 215 insertions, 216 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
{
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 80604b579910..1fdeba085f6d 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/geometry/Matrix2D.hpp>
@@ -43,7 +43,7 @@ namespace cairocanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont,
css::lang::XServiceInfo > CanvasFont_Base;
- class CanvasFont : public ::comphelper::OBaseMutex,
+ class CanvasFont : public ::cppu::BaseMutex,
public CanvasFont_Base
{
public:
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index ce8a71adec05..1e4eafacf018 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/XTextLayout.hpp>
@@ -41,7 +41,7 @@ namespace cairocanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout,
css::lang::XServiceInfo > TextLayout_Base;
- class TextLayout : public ::comphelper::OBaseMutex,
+ class TextLayout : public ::cppu::BaseMutex,
public TextLayout_Base
{
public:
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index 1f96f7c2d45b..4083ea479b11 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
@@ -45,7 +45,7 @@ namespace dxcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont,
css::lang::XServiceInfo > CanvasFont_Base;
- class CanvasFont : public ::comphelper::OBaseMutex,
+ class CanvasFont : public ::cppu::BaseMutex,
public CanvasFont_Base
{
public:
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index 8aad3a8328f8..8de490b7f9f5 100644
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -41,7 +41,7 @@ namespace dxcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout,
css::lang::XServiceInfo > TextLayout_Base;
- class TextLayout : public ::comphelper::OBaseMutex,
+ class TextLayout : public ::cppu::BaseMutex,
public TextLayout_Base
{
public:
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index c070973b9375..3d9c1fe343e9 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XCanvasFont.hpp>
@@ -27,7 +27,7 @@ namespace oglcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont > CanvasFontBaseT;
- class CanvasFont : public ::comphelper::OBaseMutex,
+ class CanvasFont : public ::cppu::BaseMutex,
public CanvasFontBaseT
{
public:
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index 9b4638716776..168282adb1ff 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/rendering/XTextLayout.hpp>
@@ -26,7 +26,7 @@ namespace oglcanvas
{
typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout > TextLayoutBaseT;
- class TextLayout : public ::comphelper::OBaseMutex,
+ class TextLayout : public ::cppu::BaseMutex,
public TextLayoutBaseT
{
public:
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index 2057b0bb32d2..b17126222b7d 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/geometry/Matrix2D.hpp>
@@ -44,7 +44,7 @@ namespace vclcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont,
css::lang::XServiceInfo > CanvasFont_Base;
- class CanvasFont : public ::comphelper::OBaseMutex,
+ class CanvasFont : public ::cppu::BaseMutex,
public CanvasFont_Base
{
public:
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index 706338fdf6a8..713397045644 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/StringContext.hpp>
@@ -40,7 +40,7 @@ namespace vclcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout,
css::lang::XServiceInfo > TextLayout_Base;
- class TextLayout : public ::comphelper::OBaseMutex,
+ class TextLayout : public ::cppu::BaseMutex,
public TextLayout_Base
{
public:
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 668d1fda7706..08053d064dc2 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/ConnectionWrapper.hxx>
@@ -35,7 +35,7 @@ namespace connectivity
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XConnection > OConnectionWeakWrapper_BASE;
- class OConnectionWeakWrapper : public ::comphelper::OBaseMutex
+ class OConnectionWeakWrapper : public ::cppu::BaseMutex
, public OConnectionWeakWrapper_BASE
, public OConnectionWrapper
{
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index 6b6c7456e182..ff108088efa0 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -20,9 +20,9 @@
#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/sdbc/XPooledConnection.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
-#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/reflection/XProxyFactory.hpp>
@@ -35,7 +35,7 @@ namespace connectivity
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XPooledConnection
,css::lang::XEventListener> OPooledConnection_Base;
- class OPooledConnection : public ::comphelper::OBaseMutex
+ class OPooledConnection : public ::cppu::BaseMutex
,public OPooledConnection_Base
{
css::uno::Reference< css::sdbc::XConnection > m_xRealConnection; // the connection fom driver
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index efec457c6e30..6031b3e26797 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -74,7 +74,7 @@ namespace connectivity
> OResultSet_BASE;
- class OEvoabResultSet :public comphelper::OBaseMutex
+ class OEvoabResultSet :public cppu::BaseMutex
,public OResultSet_BASE
,public ::comphelper::OPropertyContainer
,public ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet>
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index 4356b352c089..f54f37725d5d 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -27,10 +27,10 @@
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/broadcasthelper.hxx>
#include <connectivity/sqliterator.hxx>
#include <connectivity/sqlparse.hxx>
#include <connectivity/FValue.hxx>
@@ -137,7 +137,7 @@ namespace connectivity
class OCommonStatement;
typedef OSubComponent< OCommonStatement, OCommonStatement_IBase > OStatement_CBase;
- class OCommonStatement :public comphelper::OBaseMutex
+ class OCommonStatement :public cppu::BaseMutex
,public OCommonStatement_IBase
,public ::comphelper::OPropertyContainer
,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement >
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index 52fb2c6cfa14..a9c67fe4ceee 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <shell/kde_headers.h>
@@ -54,7 +54,7 @@ namespace connectivity
typedef OMetaConnection_BASE KabConnection_BASE; // implements basics and text encoding
typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray;
- class KabConnection : public comphelper::OBaseMutex,
+ class KabConnection : public cppu::BaseMutex,
public KabConnection_BASE,
public OSubComponent<KabConnection, KabConnection_BASE>
{
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index 51a3278dbf0c..9b82ff8f575d 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -52,7 +52,7 @@ namespace connectivity
css::sdbc::XColumnLocate,
css::lang::XServiceInfo> KabResultSet_BASE;
- class KabResultSet : public comphelper::OBaseMutex,
+ class KabResultSet : public cppu::BaseMutex,
public KabResultSet_BASE,
public ::cppu::OPropertySetHelper,
public comphelper::OPropertyArrayUsageHelper<KabResultSet>
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index 0218d9d7fc55..1cac8d4495d1 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -43,7 +43,7 @@ namespace connectivity
// Class KabCommonStatement
// is a base class for the normal statement and for the prepared statement
- class KabCommonStatement : public comphelper::OBaseMutex,
+ class KabCommonStatement : public cppu::BaseMutex,
public KabCommonStatement_BASE,
public ::cppu::OPropertySetHelper,
public comphelper::OPropertyArrayUsageHelper<KabCommonStatement>
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 5e45859ad72d..940115baf121 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
@@ -30,6 +30,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
namespace connectivity
{
@@ -52,7 +53,7 @@ namespace connectivity
css::lang::XServiceInfo> MacabResultSet_BASE;
class MacabRecords;
- class MacabResultSet : public comphelper::OBaseMutex,
+ class MacabResultSet : public cppu::BaseMutex,
public MacabResultSet_BASE,
public ::cppu::OPropertySetHelper,
public comphelper::OPropertyArrayUsageHelper<MacabResultSet>
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 41937dd1fb7b..8ba3d2c6dce6 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -29,6 +29,7 @@
#include <com/sun/star/util/XCancellable.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
namespace connectivity
@@ -44,7 +45,7 @@ namespace connectivity
// Class MacabCommonStatement
// is a base class for the normal statement and for the prepared statement
- class MacabCommonStatement : public comphelper::OBaseMutex,
+ class MacabCommonStatement : public cppu::BaseMutex,
public MacabCommonStatement_BASE,
public ::cppu::OPropertySetHelper,
public comphelper::OPropertyArrayUsageHelper<MacabCommonStatement>
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index a80e87a8e02b..6ccc04ade875 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -67,7 +67,7 @@ namespace connectivity
typedef ::std::allocator< TVoidPtr > TVoidAlloc;
typedef ::std::vector<TVoidPtr> TVoidVector;
- class OResultSet : public comphelper::OBaseMutex,
+ class OResultSet : public cppu::BaseMutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index 4f5d375104b1..76f9f1f88095 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -45,7 +45,7 @@ namespace connectivity
class OCommonStatement;
typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE > OCommonStatement_SBASE;
- class OCommonStatement :public comphelper::OBaseMutex
+ class OCommonStatement :public cppu::BaseMutex
,public OCommonStatement_IBASE
,public ::cppu::OPropertySetHelper
,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement >
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 56c78cc484ff..006266c78e5d 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -36,12 +36,12 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/propertycontainer.hxx>
#include <connectivity/FValue.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <salhelper/simplereferenceobject.hxx>
namespace connectivity
@@ -60,7 +60,7 @@ namespace connectivity
// typedef ORefVector<ORow> ORows;
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSet :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index d556bdf35aa2..466b123cf50c 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/sdbc/XDatabaseMetaData2.hpp>
#include <cppuhelper/implbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XEventListener.hpp>
#include "FDatabaseMetaDataResultSet.hxx"
#include <functional>
@@ -31,7 +31,7 @@
namespace connectivity
{
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData2,
css::lang::XEventListener>
{
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 5dda03d317dd..0657f29d4bcc 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -30,9 +30,9 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include "ado/AStatement.hxx"
-#include <comphelper/broadcasthelper.hxx>
#include <connectivity/StdTypeDefs.hxx>
namespace connectivity
@@ -50,7 +50,7 @@ namespace connectivity
css::sdbc::XCloseable,
css::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
- class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex,
+ class ODatabaseMetaDataResultSet : public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index ac1a532fcca4..91c74652fc87 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -34,7 +34,7 @@
#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include "ado/AStatement.hxx"
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
namespace connectivity
@@ -57,7 +57,7 @@ namespace connectivity
css::sdbcx::XDeleteRows,
css::lang::XServiceInfo> OResultSet_BASE;
- class OResultSet : public comphelper::OBaseMutex,
+ class OResultSet : public cppu::BaseMutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 1dd2fbce2311..a2fe5df6d3f8 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -28,9 +28,9 @@
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include "ado/AConnection.hxx"
#include <list>
#include "ado/Awrapado.hxx"
@@ -49,7 +49,7 @@ namespace connectivity
//************ Class: java.sql.Statement
- class OStatement_Base : public comphelper::OBaseMutex,
+ class OStatement_Base : public cppu::BaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>,
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index ea2a6daf1528..f6b0c210d0c8 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -30,6 +30,7 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include "file/FStatement.hxx"
#include <connectivity/CommonTools.hxx>
@@ -37,7 +38,6 @@
#include "file/fanalyzer.hxx"
#include "file/FTable.hxx"
#include "file/filedllapi.hxx"
-#include <comphelper/broadcasthelper.hxx>
#include <connectivity/StdTypeDefs.hxx>
#include "TSortIndex.hxx"
#include "TSkipDeletedSet.hxx"
@@ -61,7 +61,7 @@ namespace connectivity
css::lang::XUnoTunnel> OResultSet_BASE;
class OOO_DLLPUBLIC_FILE OResultSet :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public ::connectivity::IResultSetHelper,
public OResultSet_BASE,
public ::comphelper::OPropertyContainer,
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 8e6c9fb9ffb1..81ebaca16f0c 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -30,6 +30,7 @@
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include "file/FConnection.hxx"
@@ -38,7 +39,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/propertycontainer.hxx>
#include "file/fanalyzer.hxx"
-#include <comphelper/broadcasthelper.hxx>
#include "TSortIndex.hxx"
namespace connectivity
@@ -55,7 +55,7 @@ namespace connectivity
//************ Class: java.sql.Statement
class OOO_DLLPUBLIC_FILE OStatement_Base :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public OStatement_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 26d8a8e6dfc9..2cffd40677e4 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/interfacecontainer2.hxx>
@@ -51,7 +52,7 @@ namespace connectivity
, css::sdb::application::XTableUIProvider
> OHsqlConnection_BASE;
- class OHsqlConnection :public ::comphelper::OBaseMutex
+ class OHsqlConnection :public cppu::BaseMutex
,public OHsqlConnection_BASE
,public OConnectionWrapper
,public IMethodGuardAccess
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 90a467033e16..21bc04459b93 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -27,8 +27,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <connectivity/CommonTools.hxx>
@@ -57,7 +57,7 @@ namespace connectivity
/** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer.
*/
- class ODriverDelegator : public ::comphelper::OBaseMutex
+ class ODriverDelegator : public ::cppu::BaseMutex
,public ODriverDelegator_BASE
{
TWeakPairVector m_aConnections; // vector containing a list
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index e8292e47f2ea..fe7ff029f349 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -29,11 +29,11 @@
#include <com/sun/star/sdbc/XGeneratedResultSet.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/OSubComponent.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/broadcasthelper.hxx>
#include <java/sql/Connection.hxx>
#include "java/sql/ConnectionLog.hxx"
@@ -50,7 +50,7 @@ namespace connectivity
//************ Class: java.sql.Statement
- class java_sql_Statement_Base : public comphelper::OBaseMutex,
+ class java_sql_Statement_Base : public cppu::BaseMutex,
public java_sql_Statement_BASE,
public java_lang_Object,
public ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 5a3613b374d5..975352c53f1c 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
@@ -54,7 +54,7 @@ namespace connectivity
css::lang::XServiceInfo> java_sql_ResultSet_BASE;
class java_sql_Connection;
- class java_sql_ResultSet : public comphelper::OBaseMutex,
+ class java_sql_ResultSet : public cppu::BaseMutex,
public java_sql_ResultSet_BASE,
public java_lang_Object,
public ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index d0a9aeab214d..805abe8cb526 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -29,8 +29,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <connectivity/CommonTools.hxx>
@@ -57,7 +57,7 @@ namespace connectivity
/** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer.
*/
- class ODriverDelegator : public ::comphelper::OBaseMutex
+ class ODriverDelegator : public ::cppu::BaseMutex
,public ODriverDelegator_BASE
{
TJDBCDrivers m_aJdbcDrivers; // all jdbc drivers
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 574714430115..8bd1d116fdcf 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -33,11 +33,11 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include "odbc/OStatement.hxx"
#include "odbc/ODatabaseMetaData.hxx"
#include "odbc/odbcbasedllapi.hxx"
-#include <comphelper/broadcasthelper.hxx>
#include <connectivity/StdTypeDefs.hxx>
namespace connectivity
@@ -56,7 +56,7 @@ namespace connectivity
css::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 3185738504db..3d827fe4c184 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -105,7 +105,7 @@ namespace connectivity
typedef ::std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap;
class OOO_DLLPUBLIC_ODBCBASE OResultSet :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public ::connectivity::IResultSetHelper,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 3138a27b3f1e..5a068eb8f991 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -30,6 +30,7 @@
#include <com/sun/star/util/XCancellable.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include "odbc/OFunctions.hxx"
@@ -37,7 +38,6 @@
#include "odbc/odbcbasedllapi.hxx"
#include <list>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/broadcasthelper.hxx>
namespace connectivity
{
@@ -56,7 +56,7 @@ namespace connectivity
//************ Class: java.sql.Statement
class OOO_DLLPUBLIC_ODBCBASE OStatement_Base :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx
index d2deda1aad14..416a9cfd3cbd 100644
--- a/connectivity/workben/skeleton/SResultSet.hxx
+++ b/connectivity/workben/skeleton/SResultSet.hxx
@@ -62,7 +62,7 @@ namespace connectivity
typedef ::std::allocator< TVoidPtr > TVoidAlloc;
typedef ::std::vector<TVoidPtr> TVoidVector;
- class OResultSet : public comphelper::OBaseMutex,
+ class OResultSet : public cppu::BaseMutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 1cc7782477bd..f7b3dbe8ef1d 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -27,7 +27,7 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
@@ -1403,7 +1403,7 @@ void ColorPickerDialog::setColorComponent( sal_uInt16 nComp, double dValue )
typedef ::cppu::WeakComponentImplHelper< XServiceInfo, XExecutableDialog, XInitialization, XPropertyAccess > ColorPickerBase;
-class ColorPicker : protected ::comphelper::OBaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
+class ColorPicker : protected ::cppu::BaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
public ColorPickerBase
{
public:
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 058b85dfb6f1..205cc194bc42 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -42,6 +42,7 @@
#include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp>
#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <connectivity/paramwrapper.hxx>
#include <connectivity/FValue.hxx>
@@ -64,7 +65,7 @@ namespace dbaccess
> ORowSet_BASE1;
class OTableContainer;
- class ORowSet : public comphelper::OBaseMutex
+ class ORowSet : public cppu::BaseMutex
, public ORowSet_BASE1
, public ORowSetBase
, public ::comphelper::OPropertyArrayUsageHelper<ORowSet>
@@ -444,7 +445,7 @@ namespace dbaccess
// ORowSetClone
- class ORowSetClone : public comphelper::OBaseMutex
+ class ORowSetClone : public cppu::BaseMutex
,public OSubComponent
,public ORowSetBase
,public ::comphelper::OPropertyArrayUsageHelper < ORowSetClone >
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index b0653ad1a516..67a71ccbd856 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -40,7 +40,7 @@
#include <comphelper/proparrhlp.hxx>
#include <osl/diagnose.h>
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
namespace dbaccess
{
@@ -58,7 +58,7 @@ namespace dbaccess
// OResultSet
- class OResultSet : public comphelper::OBaseMutex,
+ class OResultSet : public cppu::BaseMutex,
public OResultSetBase,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OResultSet >
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index 5367c777b948..4ebe8d053a27 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -23,6 +23,7 @@
#include <cppuhelper/component.hxx>
#include <connectivity/CommonTools.hxx>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
@@ -44,7 +45,7 @@ namespace dbaccess
> OSharedConnection_BASE;
typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2;
- class OSharedConnection : public ::comphelper::OBaseMutex
+ class OSharedConnection : public ::cppu::BaseMutex
, public OSharedConnection_BASE
, public OSharedConnection_BASE2
{
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 6b6508e1abf1..e06186cd91e5 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -68,7 +68,7 @@ typedef cppu::ImplHelper13 < css::container::XChild
class ODatabaseSource;
// OConnection
-class OConnection :public ::comphelper::OBaseMutex
+class OConnection :public ::cppu::BaseMutex
,public OSubComponent
,public ::connectivity::OConnectionWrapper
,public OConnection_Base
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 1ebbb6802578..6af9365ceb0a 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -159,7 +159,7 @@ namespace dbaccess
// OEmbedObjectHolder
typedef ::cppu::WeakComponentImplHelper< embed::XStateChangeListener > TEmbedObjectHolder;
- class OEmbedObjectHolder : public ::comphelper::OBaseMutex
+ class OEmbedObjectHolder : public ::cppu::BaseMutex
,public TEmbedObjectHolder
{
Reference< XEmbeddedObject > m_xBroadCaster;
diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx
index 04d097637d51..ad49d889b232 100644
--- a/dbaccess/source/core/inc/ContainerMediator.hxx
+++ b/dbaccess/source/core/inc/ContainerMediator.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
@@ -35,7 +35,7 @@ namespace dbaccess
class OPropertyForward;
- class OContainerMediator : public ::comphelper::OBaseMutex
+ class OContainerMediator : public ::cppu::BaseMutex
,public ::cppu::WeakImplHelper< css::container::XContainerListener >
{
private:
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 59f768bcae59..c83001fe05e3 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -32,8 +32,8 @@
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/container/XChild.hpp>
@@ -80,7 +80,7 @@ namespace dbaccess
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer;
- typedef ::comphelper::OBaseMutex OContentHelper_MBASE;
+ typedef ::cppu::BaseMutex OContentHelper_MBASE;
typedef ::cppu::WeakComponentImplHelper< css::ucb::XContent
, css::ucb::XCommandProcessor
, css::lang::XServiceInfo
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index 755246cc62bf..f5756853cce0 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <vector>
@@ -34,7 +35,7 @@ namespace dbaccess
// OPropertyForward
typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener
> OPropertyForward_Base;
- class OPropertyForward :public ::comphelper::OBaseMutex
+ class OPropertyForward :public ::cppu::BaseMutex
,public OPropertyForward_Base
{
css::uno::Reference< css::beans::XPropertySet > m_xSource;
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index d95e185562b5..2391d7f7b114 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -55,7 +55,7 @@ namespace dbaccess
class ODBTableDecorator;
typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator > ODBTableDecorator_PROP;
- class ODBTableDecorator :public comphelper::OBaseMutex
+ class ODBTableDecorator :public cppu::BaseMutex
,public OTableDescriptor_BASE
,public ODataSettings //ODataSettings_Base
,public IColumnFactory
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index e62c377d9432..cad2ff8e5714 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -39,13 +39,13 @@
#include <com/sun/star/sdbcx/XDrop.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/FValue.hxx>
#include <connectivity/TColumnsHelper.hxx>
#include <connectivity/sdbcx/IRefreshable.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/propshlp.hxx>
@@ -61,7 +61,7 @@ namespace dbaccess
css::container::XNamed
> OColumnBase;
- class OColumn :public comphelper::OBaseMutex
+ class OColumn :public cppu::BaseMutex
,public OColumnBase
,public ::comphelper::OPropertyContainer
,public IPropertyContainer // convenience for the derived class which also derive from OColumnSettings
diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx
index 9d7f688b637c..32d6087c7662 100644
--- a/dbaccess/source/core/inc/querycomposer.hxx
+++ b/dbaccess/source/core/inc/querycomposer.hxx
@@ -27,10 +27,10 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <connectivity/sqliterator.hxx>
#include <connectivity/sqlparse.hxx>
#include "apitools.hxx"
-#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
@@ -42,7 +42,7 @@ namespace dbaccess
css::sdbcx::XColumnsSupplier,
css::lang::XServiceInfo > OQueryComposer_BASE;
- class OQueryComposer : public ::comphelper::OBaseMutex,
+ class OQueryComposer : public ::cppu::BaseMutex,
public OSubComponent,
public OQueryComposer_BASE
{
diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx
index 926f02c77872..06c7def65cda 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.hxx
@@ -32,15 +32,14 @@
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <cppuhelper/propshlp.hxx>
#include <comphelper/proparrhlp.hxx>
-#include "apitools.hxx"
-#include <comphelper/broadcasthelper.hxx>
-
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase3.hxx>
+#include "apitools.hxx"
// OStatementBase
-class OStatementBase : public comphelper::OBaseMutex,
+class OStatementBase : public cppu::BaseMutex,
public OSubComponent,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OStatementBase >,
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index a49eb596e64c..dacc58b953ac 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -29,7 +29,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <tools/stream.hxx>
#include <vcl/timer.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <vcl/lazydelete.hxx>
#include <vcl/dibtools.hxx>
@@ -40,7 +40,7 @@ namespace
{
typedef ::std::vector< VclPtr<VirtualDevice> > aBuffers;
- class VDevBuffer : public Timer, protected comphelper::OBaseMutex
+ class VDevBuffer : public Timer, protected cppu::BaseMutex
{
private:
// available buffers
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index b042a66c4a6d..9d71877ede83 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -19,6 +19,7 @@
#include "formcontrolcontainer.hxx"
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <algorithm>
#include <functional>
diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx
index e5ce19c0682f..f67ee4a09c63 100644
--- a/extensions/source/bibliography/formcontrolcontainer.hxx
+++ b/extensions/source/bibliography/formcontrolcontainer.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FORMCONTROLCONTAINER_HXX
#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FORMCONTROLCONTAINER_HXX
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include "loadlisteneradapter.hxx"
#include <com/sun/star/awt/XControlContainer.hpp>
@@ -29,7 +29,7 @@ namespace bib
{
class FormControlContainer
- :public ::comphelper::OBaseMutex
+ :public ::cppu::BaseMutex
,public ::bib::OLoadListener
{
private:
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index 4b1612795ed4..f8c18336177d 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/inspection/XPropertyControl.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <tools/link.hxx>
#include <vcl/window.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -107,7 +107,7 @@ namespace pcr
a class which is derived from vcl::Window
*/
template < class TControlInterface, class TControlWindow >
- class CommonBehaviourControl :public ::comphelper::OBaseMutex
+ class CommonBehaviourControl :public ::cppu::BaseMutex
,public ::cppu::WeakComponentImplHelper< TControlInterface >
,public CommonBehaviourControlHelper
{
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index 5d86adc8e502..f38870e9006d 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <com/sun/star/beans/PropertyVetoException.hpp>
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/listenernotification.hxx>
#include <vector>
@@ -49,7 +49,7 @@ namespace pcr
/** implements an <type>XPropertyHandler</type> which composes its information
from a set of other property handlers
*/
- class PropertyComposer :public ::comphelper::OBaseMutex
+ class PropertyComposer :public ::cppu::BaseMutex
,public PropertyComposer_Base
,public IPropertyExistenceCheck
{
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 9a2e9028251e..ee769e67eab6 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -28,10 +28,10 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propagg.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/component.hxx>
@@ -43,7 +43,7 @@ namespace frm
typedef ::cppu::WeakAggComponentImplHelper2 < css::lang::XUnoTunnel
, css::util::XCloneable > OGridColumn_BASE;
-class OGridColumn :public ::comphelper::OBaseMutex
+class OGridColumn :public ::cppu::BaseMutex
,public OGridColumn_BASE
,public OPropertySetAggregationHelper
,public OCloneableAggregation
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index b36a563c9d0f..a15558cb5455 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/implbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
class EditView;
@@ -34,7 +34,7 @@ namespace frm
typedef ::cppu::WeakImplHelper < css::frame::XDispatch
> ORichTextFeatureDispatcher_Base;
- class ORichTextFeatureDispatcher :public ::comphelper::OBaseMutex
+ class ORichTextFeatureDispatcher :public ::cppu::BaseMutex
,public ORichTextFeatureDispatcher_Base
{
private:
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 6e61216a4fd2..9e0c4a484105 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/ui/dialogs/XControlInformation.hpp>
#include <com/sun/star/ui/dialogs/XControlAccess.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -28,7 +29,6 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
@@ -52,7 +52,7 @@ namespace svt
/** implements common functionality for the 2 UNO picker components
*/
class OCommonPicker
- :public ::comphelper::OBaseMutex
+ :public ::cppu::BaseMutex
,public OCommonPicker_Base
,public ::comphelper::OPropertyContainer
,public ::comphelper::OPropertyArrayUsageHelper< OCommonPicker >
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 01ffc853d27f..a935839e605c 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/frame/XToolbarController.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/weak.hxx>
#include <vcl/vclptr.hxx>
@@ -46,7 +46,7 @@ class ButtonToolbarController : public css::frame::XStatusListener,
public css::lang::XInitialization,
public css::util::XUpdatable,
public css::lang::XComponent,
- public ::comphelper::OBaseMutex,
+ public ::cppu::BaseMutex,
public ::cppu::OWeakObject
{
public:
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:
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
{
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 77e1bd053a36..c11c70efcb92 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -113,7 +113,7 @@ typedef ::cppu::WeakComponentImplHelper<
typedef ::comphelper::OPropertyContainer ScChartObj_PBase;
typedef ::comphelper::OPropertyArrayUsageHelper< ScChartObj > ScChartObj_PABase;
-class ScChartObj : public ::comphelper::OBaseMutex
+class ScChartObj : public ::cppu::BaseMutex
,public ScChartObj_Base
,public ScChartObj_PBase
,public ScChartObj_PABase
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index c1503eee740c..3740cba2d5ff 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -36,10 +36,10 @@
#include <cppuhelper/interfacecontainer.h>
#include <svl/lstner.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase5.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/servicehelper.hxx>
-#include <comphelper/broadcasthelper.hxx>
class Rectangle;
@@ -61,7 +61,7 @@ typedef cppu::ImplHelper1<
> ScAccessibleContextBaseImplEvent;
class ScAccessibleContextBase
- : public comphelper::OBaseMutex,
+ : public cppu::BaseMutex,
public ScAccessibleContextBaseWeakImpl,
public ScAccessibleContextBaseImplEvent,
public SfxListener
diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
index e4f5c7d5a822..0970a9f1352b 100644
--- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx
+++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SC_SOURCE_UI_INC_CHARTRANGESELECTIONLISTENER_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -32,7 +32,7 @@ typedef ::cppu::WeakComponentImplHelper<
ScChartRangeSelectionListener_Base;
class ScChartRangeSelectionListener :
- public comphelper::OBaseMutex,
+ public cppu::BaseMutex,
public ScChartRangeSelectionListener_Base
{
public:
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index 2cc076bd34e9..917513358d54 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -22,10 +22,10 @@
#include <com/sun/star/form/binding/XListEntrySource.hpp>
#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/proparrhlp.hxx>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
@@ -53,7 +53,7 @@ namespace calc
typedef ::comphelper::OPropertyArrayUsageHelper< OCellListSource >
OCellListSource_PABase;
- class OCellListSource :public ::comphelper::OBaseMutex
+ class OCellListSource :public ::cppu::BaseMutex
,public OCellListSource_Base // order matters! before OCellListSource_PBase, so rBHelper gets initialized
,public OCellListSource_PBase
,public OCellListSource_PABase
diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx
index 94c8e63a170c..7550b486163b 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.hxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx
@@ -23,10 +23,10 @@
#include <com/sun/star/form/binding/XValueBinding.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/proparrhlp.hxx>
#include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/table/CellAddress.hpp>
@@ -55,7 +55,7 @@ namespace calc
typedef ::comphelper::OPropertyArrayUsageHelper< OCellValueBinding >
OCellValueBinding_PABase;
- class OCellValueBinding :public ::comphelper::OBaseMutex
+ class OCellValueBinding :public ::cppu::BaseMutex
,public OCellValueBinding_Base // order matters! before OCellValueBinding_PBase, so rBHelper gets initialized
,public OCellValueBinding_PBase
,public OCellValueBinding_PABase
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 369017a0b380..2242fa4ee1b0 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWVIEWIMPL_HXX
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/listenernotification.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
@@ -163,7 +163,7 @@ typedef ::cppu::WeakComponentImplHelper< css::presentation::XSlideShowView,
css::awt::XMouseListener,
css::awt::XMouseMotionListener > SlideShowView_Base;
-class SlideShowView : public ::comphelper::OBaseMutex,
+class SlideShowView : public ::cppu::BaseMutex,
public SlideShowView_Base
{
public:
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index c891bc757c3b..4b2f3953aadb 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -23,7 +23,7 @@
#include <osl/mutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -49,7 +49,7 @@ typedef ::cppu::WeakComponentImplHelper<
ValueSetAccComponentBase;
class ThumbnailViewAcc :
- public ::comphelper::OBaseMutex,
+ public ::cppu::BaseMutex,
public ValueSetAccComponentBase
{
public:
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 1183c7d3e27e..e187d78eb8ba 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -24,9 +24,9 @@
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
@@ -66,7 +66,7 @@ using namespace ::com::sun::star;
namespace {
typedef ::cppu::WeakComponentImplHelper< presentation::XSlideShowView > ViewBase;
-class View : public ::comphelper::OBaseMutex,
+class View : public ::cppu::BaseMutex,
public ViewBase
{
public:
@@ -202,7 +202,7 @@ private:
typedef ::cppu::WeakComponentImplHelper< drawing::XDrawPage,
beans::XPropertySet > SlideBase;
-class DummySlide : public ::comphelper::OBaseMutex,
+class DummySlide : public ::cppu::BaseMutex,
public SlideBase
{
public:
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 8576eb3377e8..0138884a140e 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -25,7 +25,7 @@
#include <vcl/menu.hxx>
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -107,7 +107,7 @@ typedef ::cppu::WeakComponentImplHelper<
ToolbarMenuAccComponentBase;
class ToolbarMenuAcc :
- public ::comphelper::OBaseMutex,
+ public ::cppu::BaseMutex,
public ToolbarMenuAccComponentBase
{
public:
@@ -188,7 +188,7 @@ typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible,
css::accessibility::XAccessibleContext,
css::accessibility::XAccessibleComponent > ToolbarMenuEntryAccBase;
-class ToolbarMenuEntryAcc : public ::comphelper::OBaseMutex,
+class ToolbarMenuEntryAcc : public ::cppu::BaseMutex,
public ToolbarMenuEntryAccBase
{
public:
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 5599c770a070..c3d2339181de 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -25,7 +25,7 @@
#include <vcl/image.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/compbase.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -78,7 +78,7 @@ typedef ::cppu::WeakComponentImplHelper<
ValueSetAccComponentBase;
class ValueSetAcc :
- public ::comphelper::OBaseMutex,
+ public ::cppu::BaseMutex,
public ValueSetAccComponentBase
{
public:
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 2405ad3076d5..527ad0591f08 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -54,7 +54,7 @@ struct PopupMenuControllerBaseDispatchInfo
};
PopupMenuControllerBase::PopupMenuControllerBase( const Reference< XComponentContext >& xContext ) :
- ::comphelper::OBaseMutex(),
+ ::cppu::BaseMutex(),
PopupMenuControllerBaseType(m_aMutex),
m_bInitialized( false )
{
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
{
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index e134abaf519e..67b1a1ccbb51 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -26,7 +26,7 @@
#include <win/salbmp.h>
#include <string.h>
#include <vcl/timer.hxx>
-#include <comphelper/broadcasthelper.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <map>
#if defined _MSC_VER
@@ -73,7 +73,7 @@ struct Comparator
typedef ::std::map< WinSalBitmap*, sal_uInt32, Comparator > EntryMap;
static const sal_uInt32 nDefaultCycles(60);
-class GdiPlusBuffer : protected comphelper::OBaseMutex, public Timer
+class GdiPlusBuffer : protected cppu::BaseMutex, public Timer
{
private:
EntryMap maEntries;