summaryrefslogtreecommitdiff
path: root/canvas/source/opengl/ogl_canvasfont.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-02-24 14:03:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-02-24 19:39:49 +0000
commitc55d7540efdd33618950c93cabcb680e8e26c894 (patch)
tree9da0a1b5a6fe9ef760422f349d21994a9427616f /canvas/source/opengl/ogl_canvasfont.cxx
parentdb295ca04a6a7ffa9525c43af80609801d22fb62 (diff)
BaseMutex->std::mutex in oglcanvas::CanvasFont
Change-Id: I74c3132bae4076915e1e41525d7cd7e709195197 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147632 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas/source/opengl/ogl_canvasfont.cxx')
-rw-r--r--canvas/source/opengl/ogl_canvasfont.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx
index 7309b9acd279..213dbe92b0e5 100644
--- a/canvas/source/opengl/ogl_canvasfont.cxx
+++ b/canvas/source/opengl/ogl_canvasfont.cxx
@@ -23,7 +23,6 @@ namespace oglcanvas
CanvasFont::CanvasFont( rendering::FontRequest aFontRequest,
const uno::Sequence< beans::PropertyValue >& extraFontProperties,
const geometry::Matrix2D& fontMatrix ) :
- CanvasFontBaseT( m_aMutex ),
maFontRequest(std::move( aFontRequest )),
mnEmphasisMark(0),
maFontMatrix( fontMatrix )
@@ -35,7 +34,7 @@ namespace oglcanvas
sal_Int8 nDirection,
sal_Int64 nRandomSeed )
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) );
}
@@ -54,7 +53,7 @@ namespace oglcanvas
rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( )
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return maFontRequest;
}