BaseMutex->std::mutex in oglcanvas::TextLayout

Change-Id: I76b95eb8444c057d94f5653769e23047c019b139
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147964
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 4 insertions, 6 deletions

diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index ce7b1958993e..1d6467d96bc1 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -9,8 +9,7 @@
 
 #pragma once
 
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
 
 #include <com/sun/star/rendering/XTextLayout.hpp>
 
@@ -21,10 +20,9 @@
 
 namespace oglcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout > TextLayoutBaseT;
+    typedef ::comphelper::WeakComponentImplHelper< css::rendering::XTextLayout > TextLayoutBaseT;
 
-    class TextLayout : public ::cppu::BaseMutex,
-                       public TextLayoutBaseT
+    class TextLayout : public TextLayoutBaseT
     {
     public:
         TextLayout( css::rendering::StringContext               aText,
@@ -37,7 +35,7 @@ namespace oglcanvas
         const TextLayout& operator=(const TextLayout&) = delete;
 
         /// Dispose all internal references
-        virtual void SAL_CALL disposing() override;
+        virtual void disposing(std::unique_lock<std::mutex>& rGuard) override;
 
         // XTextLayout
         virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) override;