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 /include/drawinglayer | |
| 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 'include/drawinglayer')
| -rw-r--r-- | include/drawinglayer/primitive2d/baseprimitive2d.hxx | 6 | ||||
| -rw-r--r-- | include/drawinglayer/primitive3d/baseprimitive3d.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
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; |