diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 11:47:06 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 11:47:06 +0000 |
| commit | 8ceff95c69cf9bd9ff5ab3a4b5689925b8bd6a59 (patch) | |
| tree | ca2b0cc4fba88107f5f6e740285184a061011866 /sfx2/source/doc/graphhelp.cxx | |
| parent | Adding debian version 4:24.2.3-2. (diff) | |
| download | libreoffice-8ceff95c69cf9bd9ff5ab3a4b5689925b8bd6a59.tar.xz libreoffice-8ceff95c69cf9bd9ff5ab3a4b5689925b8bd6a59.zip | |
Merging upstream version 4:24.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sfx2/source/doc/graphhelp.cxx')
| -rw-r--r-- | sfx2/source/doc/graphhelp.cxx | 41 |
1 files changed, 21 insertions, 20 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 |