Merging upstream version 4:24.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 32 insertions, 30 deletions

diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 7cfdf76fe6..9d7600ae2d 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -128,28 +128,29 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, co
 
                     if ( hMemory )
                     {
-                        METAFILEPICT* pMF = static_cast<METAFILEPICT*>(GlobalLock( hMemory ));
-
-                        pMF->hMF = hMeta;
-                        pMF->mm = MM_ANISOTROPIC;
-
-                        MapMode aWinMode( MapUnit::Map100thMM );
-
-                        if ( aWinMode == pGDIMeta->GetPrefMapMode() )
+                        if (METAFILEPICT* pMF = static_cast<METAFILEPICT*>(GlobalLock(hMemory)))
                         {
-                            pMF->xExt = aMetaSize.Width();
-                            pMF->yExt = aMetaSize.Height();
+                            pMF->hMF = hMeta;
+                            pMF->mm = MM_ANISOTROPIC;
+
+                            MapMode aWinMode( MapUnit::Map100thMM );
+
+                            if ( aWinMode == pGDIMeta->GetPrefMapMode() )
+                            {
+                                pMF->xExt = aMetaSize.Width();
+                                pMF->yExt = aMetaSize.Height();
+                            }
+                            else
+                            {
+                                Size aWinSize = OutputDevice::LogicToLogic( Size( aMetaSize.Width(), aMetaSize.Height() ),
+                                                                            pGDIMeta->GetPrefMapMode(),
+                                                                            aWinMode );
+                                pMF->xExt = aWinSize.Width();
+                                pMF->yExt = aWinSize.Height();
+                            }
+
+                            GlobalUnlock(hMemory);
                         }
-                        else
-                        {
-                            Size aWinSize = OutputDevice::LogicToLogic( Size( aMetaSize.Width(), aMetaSize.Height() ),
-                                                                        pGDIMeta->GetPrefMapMode(),
-                                                                        aWinMode );
-                            pMF->xExt = aWinSize.Width();
-                            pMF->yExt = aWinSize.Height();
-                        }
-
-                        GlobalUnlock( hMemory );
                         pResult = static_cast<void*>(hMemory);
                     }
                     else
diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx
index f60f459829..dce19e3625 100644
--- a/sfx2/source/doc/syspathw32.cxx
+++ b/sfx2/source/doc/syspathw32.cxx
@@ -37,17 +37,18 @@ static bool SHGetSpecialFolderW32( int nFolderID, WCHAR* pszFolder, int nSize )
 
     if( hHdl == NOERROR )
     {
-        WCHAR *lpFolder = static_cast< WCHAR* >( HeapAlloc( GetProcessHeap(), 0, 16000 ));
-
-        SHGetPathFromIDListW( pidl, lpFolder );
-        wcsncpy( pszFolder, lpFolder, nSize );
-
-        HeapFree( GetProcessHeap(), 0, lpFolder );
-        IMalloc *pMalloc;
-        if( NOERROR == SHGetMalloc(&pMalloc) )
+        if (WCHAR *lpFolder = static_cast<WCHAR*>(HeapAlloc(GetProcessHeap(), 0, 16000)))
         {
-            pMalloc->Free( pidl );
-            pMalloc->Release();
+            SHGetPathFromIDListW( pidl, lpFolder );
+            wcsncpy( pszFolder, lpFolder, nSize );
+
+            HeapFree( GetProcessHeap(), 0, lpFolder );
+            IMalloc *pMalloc;
+            if( NOERROR == SHGetMalloc(&pMalloc) )
+            {
+                pMalloc->Free( pidl );
+                pMalloc->Release();
+            }
         }
     }
     return true;