summaryrefslogtreecommitdiffstats
path: root/svtools
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-05-16 15:26:42 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-05-16 18:42:54 +0300
commit6280a1e3104826ccdcd71c422b149e249783d5da (patch)
treeb1ee597cce3509b64e23baa0057c7a9acfad5ce6 /svtools
parentFix for fdo#36673: corrupt date formats of cells (diff)
downloadcore-6280a1e3104826ccdcd71c422b149e249783d5da.tar.gz
core-6280a1e3104826ccdcd71c422b149e249783d5da.zip
Fix crash in WMF import - fdo#36991.
(cherry picked from commit c4361c93de2b9661d59bc4aa799dffea7ad579e2) Signed-off-by: Tor Lillqvist <tlillqvist@novell.com>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/filter.vcl/wmf/winmtf.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index b60ae0676cc9..d2a4b0ec50c2 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -37,6 +37,7 @@
#include <vcl/graphictools.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/metric.hxx>
+#include <vcl/svapp.hxx>
#include <rtl/tencinfo.h>
// ------------------------------------------------------------------------
@@ -1617,6 +1618,8 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
sal_Int32* pDX = pDXArry;
if ( !pDXArry )
{
+ SolarMutexGuard aGuard;
+
pDX = new sal_Int32[ rText.Len() ];
if ( !pVDev )
pVDev = new VirtualDevice;