summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-24 13:09:28 +0100
committerEike Rathke <erack@redhat.com>2015-07-28 15:33:29 +0000
commitf7413bed0af236e3a15a5d14ed4045f55dea6d0f (patch)
tree2ddefcc4295b331e9aa71efbec4b9dd3419007e1
parent2bf98bfc8e088a102f883039219816aef148867a (diff)
Resolves: tdf#90609 SolarMutex assert on threaded load
Change-Id: I81a784ab506d0d3ae266d7341b8ff7a163dcd8d2 (cherry picked from commit 442b788bc80e20783bdb881aa0cbbc253f1a47b0) Reviewed-on: https://gerrit.libreoffice.org/17328 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--toolkit/source/awt/vclxfont.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index d937ad47591e..150dadd4a43c 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -29,6 +29,7 @@
#include <sal/alloca.h>
#include <vcl/outdev.hxx>
+#include <vcl/svapp.hxx>
// class VCLXFont
@@ -200,6 +201,7 @@ sal_Bool VCLXFont::hasGlyphs( const OUString& aText )
throw(::com::sun::star::uno::RuntimeException, std::exception)
{
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+ SolarMutexGuard aSolarGuard;
OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( mxDevice );
if ( pOutDev )