sfx2/source/doc/graphhelp.cxx | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
New commits:
commit 5582ea36163d060887ff319baaf817f8581fe0db
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Apr 26 11:11:44 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Apr 29 12:23:20 2024 +0200
WaE: C6011 Derefencing NULL pointer 'pMF'
Change-Id: I76e85e8671623f7cdf994dce779c3944b8761acf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166731
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit e5c988821db31f285cdd207e2a2ac849c0f1c099)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166832
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 7cfdf76fe60f..9d7600ae2da7 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
