diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-24 13:09:28 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-27 08:11:49 +0000 |
| commit | 950c5ad52c489f78d2bf55c5f4232273491a4e9c (patch) | |
| tree | a31c90be806161d0168948dea0446936164ef1ff | |
| parent | 2bb00eb772c419ac2144b8cb55bfee765a82252d (diff) | |
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>
| -rw-r--r-- | toolkit/source/awt/vclxfont.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
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 ) |