summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-21 15:46:37 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-21 15:52:27 +0000
commit292ba61eae3318edd86ec0af4d8726189bc2affd (patch)
tree754f68f7b1b58d3e9b18f78e73da8fe420f1b24e /vcl
parent85771a44ccc6404bbafbd5f70eff3c39ae85e507 (diff)
coverity#1000766 Dereference before null check
Change-Id: I539cb91511fe95d004044a98736b4a6b99f24a5b
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/outdev3.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 7de3d81c0c19..093da2fc6d49 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -4212,9 +4212,8 @@ SalLayout* OutputDevice::ImplLayout(const OUString& rOrigStr,
// do glyph fallback if needed
// #105768# avoid fallback for very small font sizes
- if( aLayoutArgs.NeedFallback() )
- if( mpFontEntry && (mpFontEntry->maFontSelData.mnHeight >= 3) )
- pSalLayout = ImplGlyphFallbackLayout( pSalLayout, aLayoutArgs );
+ if (aLayoutArgs.NeedFallback() && mpFontEntry->maFontSelData.mnHeight >= 3)
+ pSalLayout = ImplGlyphFallbackLayout(pSalLayout, aLayoutArgs);
// position, justify, etc. the layout
pSalLayout->AdjustLayout( aLayoutArgs );