vcl/source/outdev/font.cxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit d57d5ac146e79864aaefe41a069e7ea35160c64b
Author: Christopher Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Thu Aug 14 23:35:09 2025 +1000
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 15 08:12:00 2025 +0200
vcl: flatten OutputDevice::ImplClearAllFontData()
Change-Id: Icf3018a62e8844d8b148382289e162dc8b082057
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189607
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 12a097fb38d8..3b505fe74b40 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -309,14 +309,14 @@ void OutputDevice::ImplClearAllFontData(bool
bNewFontLists)
pSVData->maGDIData.mxScreenFontList->Clear();
vcl::Window * pFrame = pSVData->maFrameData.mpFirstFrame;
- if ( pFrame )
+ if (!pFrame)
+ return;
+
+ if ( pFrame->GetOutDev()->AcquireGraphics() )
{
- if ( pFrame->GetOutDev()->AcquireGraphics() )
- {
- OutputDevice *pDevice = pFrame->GetOutDev();
- pDevice->mpGraphics->ClearDevFontCache();
-
pDevice->mpGraphics->GetDevFontList(pFrame->mpWindowImpl->mpFrameData->mxFontCollection.get());
- }
+ OutputDevice *pDevice = pFrame->GetOutDev();
+ pDevice->mpGraphics->ClearDevFontCache();
+
pDevice->mpGraphics->GetDevFontList(pFrame->mpWindowImpl->mpFrameData->mxFontCollection.get());
}
}
