BaseMutex->std::mutex in canvas::CachedPrimitiveBase

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

1 files changed, 1 insertions, 4 deletions

diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx
index 652e9c900613..7aaf3d58ac5e 100644
--- a/canvas/source/tools/cachedprimitivebase.cxx
+++ b/canvas/source/tools/cachedprimitivebase.cxx
@@ -34,7 +34,6 @@ namespace canvas
 {
     CachedPrimitiveBase::CachedPrimitiveBase( rendering::ViewState                    aUsedViewState,
                                               uno::Reference< rendering::XCanvas >    xTarget ) :
-        CachedPrimitiveBase_Base( m_aMutex ),
         maUsedViewState(std::move( aUsedViewState )),
         mxTarget(std::move( xTarget ))
     {
@@ -44,10 +43,8 @@ namespace canvas
     {
     }
 
-    void SAL_CALL CachedPrimitiveBase::disposing()
+    void CachedPrimitiveBase::disposing(std::unique_lock<std::mutex>& /*rGuard*/)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         maUsedViewState.Clip.clear();
         mxTarget.clear();
     }