summaryrefslogtreecommitdiff
path: root/forms/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-01 09:46:23 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-04 06:49:07 +0000
commitcd71034b26a404c8f9b763865ef6ebdd0adeebb7 (patch)
treeff2aaa6a6d1849b51d883d48dfdef04b17817fcd /forms/source
parent70bfe5f71c1d45c14ce831051480a11c58ffc34d (diff)
comphelper::OBaseMutex -> cppu::BaseMutex
convert usage of deprecated class, and remove the old class Change-Id: I19fb9271090d19e5531622b58492e1a848d306e2 Reviewed-on: https://gerrit.libreoffice.org/26843 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'forms/source')
-rw-r--r--forms/source/component/Columns.hxx4
-rw-r--r--forms/source/richtext/featuredispatcher.hxx4
2 files changed, 4 insertions, 4 deletions
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: