[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Michael Meeks]

 vcl/source/window/toolbox2.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b57bfba7c1f331e13ca995c493c2973d67aa5021
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Feb 15 11:01:41 2017 +0000

    Simple work-around for unpleasant framework shutdown to avoid crash.
    
    http://crashreport.libreoffice.org/stats/crash_details/2de31c06-da20-4280-916a-e282a337b16b
    
    Change-Id: I0b599de9b36f62d65988c1ab698f1559134fbf7c
    Reviewed-on: https://gerrit.libreoffice.org/34294
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 2c60e02bbfde8655828a5b019642f5e85f975e61)
    Reviewed-on: https://gerrit.libreoffice.org/34297
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 37f809c..6345910 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -635,7 +635,8 @@ ToolBoxButtonSize ToolBox::GetToolboxButtonSize() const
 
 /*static*/ Size ToolBox::GetDefaultImageSize(ToolBoxButtonSize eToolBoxButtonSize)
 {
-    float fScaleFactor = Application::GetDefaultDevice()->GetDPIScaleFactor();
+    OutputDevice *pDefault = Application::GetDefaultDevice();
+    float fScaleFactor = pDefault ? pDefault->GetDPIScaleFactor() : 1.0;
 
     Size aUnscaledSize = Size(16, 16);