diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-09 17:26:28 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-09 17:39:14 +0200 |
| commit | e966e9fae635afe6237738a83658baf7c86eea93 (patch) | |
| tree | 095ed17f497aecfcebe54bb0015450289e920477 /svx/source/sdr | |
| parent | 8ced97caa409d6dc8f69230145e9c9f281fb84fe (diff) | |
More CppunitTest_sw_uiwriter fixes
1) Guard against nDPI == 0 in ImplLogicToPixel(), it's the caller's
responsibility to ensure that the DPI value is in the expected range.
2) pOut in sdr::overlay::impCheckPossibleOverlayType() is seen as 0.
Change-Id: Iab5ff10aa7953993161dcad2d49d99d80c588e01
Diffstat (limited to 'svx/source/sdr')
| -rw-r--r-- | svx/source/sdr/overlay/overlayselection.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index f230ff88c051..3c308af8ea09 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -72,9 +72,8 @@ namespace sdr // not possible when switched off by user return OVERLAY_INVERT; } - else + else if (const OutputDevice* pOut = Application::GetDefaultDevice()) { - const OutputDevice *pOut = Application::GetDefaultDevice(); if(pOut->GetSettings().GetStyleSettings().GetHighContrastMode()) { |