From 58ee01bd00449fd4e49674440c6c1d89610e8970 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 24 Jul 2015 13:09:28 +0100
Subject: Resolves: tdf#90609 SolarMutex assert on threaded load

Change-Id: I81a784ab506d0d3ae266d7341b8ff7a163dcd8d2
(cherry picked from commit 442b788bc80e20783bdb881aa0cbbc253f1a47b0)
Reviewed-on: https://gerrit.libreoffice.org/17327
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 toolkit/source/awt/vclxfont.cxx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'toolkit')

diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 9aece8bc85c6..a4b0c73a2d2a 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 )
-- 
cgit v1.2.3