toolkit/source/awt/vclxfont.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 950c5ad52c489f78d2bf55c5f4232273491a4e9c Author: Caolán McNamara <[email protected]> Date: Fri Jul 24 13:09:28 2015 +0100 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 <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 9aece8b..a4b0c73 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 )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
