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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/control/toolbarmenuimp.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/control/valueimp.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/uno/popupmenucontrollerbase.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
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 ) { |