osl::Mutex->std::mutex in BasePrimitive3D

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

7 files changed, 9 insertions, 8 deletions

diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index 5bd980012a61..c2c8cc9f7e0f 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -29,7 +29,6 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive3d
 {
         BasePrimitive3D::BasePrimitive3D()
-        :   BasePrimitive3DImplBase(m_aMutex)
         {
         }
 
@@ -76,7 +75,7 @@ namespace drawinglayer::primitive3d
 
         Primitive3DContainer BufferedDecompositionPrimitive3D::get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const
         {
-            ::osl::MutexGuard aGuard( m_aMutex );
+            std::unique_lock aGuard( m_aMutex );
 
             if(getBuffered3DDecomposition().empty())
             {
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 668f7dab4439..3e0abc582732 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -292,7 +292,7 @@ namespace drawinglayer::primitive3d
 
         Primitive3DContainer HatchTexturePrimitive3D::get3DDecomposition(const geometry::ViewInformation3D& /*rViewInformation*/) const
         {
-            ::osl::MutexGuard aGuard( m_aMutex );
+            std::unique_lock aGuard( m_aMutex );
 
             if(getBuffered3DDecomposition().empty())
             {
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 2ff7462b7a9f..955e6bd4f9ca 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -749,7 +749,7 @@ using namespace com::sun::star;
 
         Primitive3DContainer PolygonTubePrimitive3D::get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const
         {
-            ::osl::MutexGuard aGuard( m_aMutex );
+            std::unique_lock aGuard( m_aMutex );
 
             if(getLast3DDecomposition().empty())
             {
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index e223b7911185..34f4d8472284 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -376,7 +376,7 @@ namespace drawinglayer::primitive3d
             // again when no longer geometry is needed for non-visible 3D objects as it is now for chart
             if(getPolyPolygon().count() && maSlices.empty())
             {
-                ::osl::MutexGuard aGuard( m_aMutex );
+                std::unique_lock aGuard( m_aMutex );
 
                 const_cast< SdrExtrudePrimitive3D& >(*this).impCreateSlices();
             }
@@ -481,7 +481,7 @@ namespace drawinglayer::primitive3d
                     (!getBuffered3DDecomposition().empty()
                         && *mpLastRLGViewInformation != rViewInformation))
                 {
-                    ::osl::MutexGuard aGuard( m_aMutex );
+                    std::unique_lock aGuard( m_aMutex );
 
                     // conditions of last local decomposition with reduced lines have changed. Remember
                     // new one and clear current decompositiopn
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 49011f10a74a..ca6e11eec4d4 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -228,7 +228,7 @@ namespace drawinglayer::primitive3d
             // again when no longer geometry is needed for non-visible 3D objects as it is now for chart
             if(getPolyPolygon().count() && maSlices.empty())
             {
-                ::osl::MutexGuard aGuard( m_aMutex );
+                std::unique_lock aGuard( m_aMutex );
 
                 const_cast< SdrLathePrimitive3D& >(*this).impCreateSlices();
             }
@@ -339,7 +339,7 @@ namespace drawinglayer::primitive3d
                     (!getBuffered3DDecomposition().empty()
                         && *mpLastRLGViewInformation != rViewInformation))
                 {
-                    ::osl::MutexGuard aGuard( m_aMutex );
+                    std::unique_lock aGuard( m_aMutex );
 
                     // conditions of last local decomposition with reduced lines have changed. Remember
                     // new one and clear current decompositiopn
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 950613f9f917..c4c0e0ba1249 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -29,6 +29,7 @@
 #include <drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 #include <utility>
 
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index b6243243c882..85870f70cc85 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -26,6 +26,7 @@
 #include <vcl/BitmapTools.hxx>
 #include <primitive3d/hatchtextureprimitive3d.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 namespace drawinglayer::texture
 {