[Libreoffice-commits] .: Branch 'libreoffice-3-4' - svtools/source

Tor Lillqvist tml at kemper.freedesktop.org
Mon May 16 08:44:54 PDT 2011


 svtools/source/filter.vcl/wmf/winmtf.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b9859b83c5d5bd4da3acd9d0abf08b0b2ac5bdf0
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon May 16 15:26:42 2011 +0200

    Fix crash in WMF import - fdo#36991.
    
    (cherry picked from commit c4361c93de2b9661d59bc4aa799dffea7ad579e2)
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>

diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index 91c0d2f..8b5739c 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;


More information about the Libreoffice-commits mailing list