diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 16:58:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 16:58:30 +0100 |
| commit | 36977f7404c8c3255792dc9995d213510a2cdb11 (patch) | |
| tree | 079b2c9bba8c1448dda55bb0545fda7789989d11 /cppcanvas/source/mtfrenderer | |
| parent | c63a90453b59352950bbccce93a210964ccb7c14 (diff) | |
crashtesting: more crashing on exporting fdo31814-3.emf to odg
Change-Id: I4cb359b426daed6c5d83c4ed4b85fe87de9d739a
Diffstat (limited to 'cppcanvas/source/mtfrenderer')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index a4411c22bcfe..cdead7a030ff 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1280,9 +1280,12 @@ namespace cppcanvas EMFPStringFormat *stringFormat = static_cast< EMFPStringFormat* >( aObjects[ formatId & 0xff ] ); css::rendering::FontRequest aFontRequest; - LanguageTag aLanguageTag( static_cast< LanguageType >( stringFormat->language ) ); - aFontRequest.Locale = aLanguageTag.getLocale( false ); - SAL_INFO("cppcanvas.emf", "EMF+\t\t Font locale, Country:" << aLanguageTag.getCountry() <<" Language:" << aLanguageTag.getLanguage() ); + if (stringFormat) + { + LanguageTag aLanguageTag( static_cast< LanguageType >( stringFormat->language ) ); + aFontRequest.Locale = aLanguageTag.getLocale( false ); + SAL_INFO("cppcanvas.emf", "EMF+\t\t Font locale, Country:" << aLanguageTag.getCountry() <<" Language:" << aLanguageTag.getLanguage() ); + } SAL_INFO("cppcanvas.emf", "EMF+\t\t TODO Use all string formatting attributes during drawing"); double cellSize = setFont (aFontRequest, flags & 0xff, rFactoryParms, rState); |