diff options
author | Noel Grandin <noel@peralex.com> | 2016-07-01 09:46:23 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 06:49:07 +0000 |
commit | cd71034b26a404c8f9b763865ef6ebdd0adeebb7 (patch) | |
tree | ff2aaa6a6d1849b51d883d48dfdef04b17817fcd /svx/source/inc | |
parent | 70bfe5f71c1d45c14ce831051480a11c58ffc34d (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 'svx/source/inc')
-rw-r--r-- | svx/source/inc/GraphCtlAccessibleContext.hxx | 4 | ||||
-rw-r--r-- | svx/source/inc/formcontroller.hxx | 6 | ||||
-rw-r--r-- | svx/source/inc/svxpixelctlaccessiblecontext.hxx | 6 | ||||
-rw-r--r-- | svx/source/inc/svxrectctaccessiblecontext.hxx | 4 |
4 files changed, 10 insertions, 10 deletions
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 |