catch rather unlikely vcl case and don't crash

6f0af3c2 · Michael Meeks · cdd27928 · 6f0af3c2
Kaydet (Commit) 6f0af3c2 authored Ara 20, 2011 tarafından Michael Meeks
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

salgdi.cxx vcl/unx/generic/gdi/salgdi.cxx +6 -0

No files found.
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -494,6 +494,12 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
 void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // const
 {
    const SalDisplay *pDisplay = GetDisplay();
+    if (!pDisplay)
+    {
+        OSL_TRACE("Null display");
+        rDPIX = rDPIY = 96;
+        return;
+    }

    rDPIX = pDisplay->GetResolution().A();
    rDPIY = pDisplay->GetResolution().B();