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 /extensions | |
| 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 'extensions')
4 files changed, 7 insertions, 6 deletions
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 { |