summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-04-28 15:04:38 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-04-28 16:01:27 +0200
commit835bedcf8b76cad05d07fceeb44598eb97203793 (patch)
tree615cbb2ecce565fa1ec8f4454b13910ba806d20e /sd/source/ui
parent3788e31b2ed3cd782180c714a764cec0e02abd3b (diff)
tdf#120703 PVS: dereference before nullptr check
V595 The 'GetActiveWindow()' pointer was utilized before it was verified against nullptr. Check lines: 544, 567. Change-Id: I1ef45fa72542168ba88f24482973a1c660bcc1a8 Reviewed-on: https://gerrit.libreoffice.org/71470 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/view/drviewsa.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 87aa3a3d650a..8b917f2962ca 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -535,7 +535,8 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
or page) with the help of the ZoomItems !!! */
if( SfxItemState::DEFAULT == rSet.GetItemState( SID_ATTR_ZOOM ) )
{
- if (GetDocSh()->IsUIActive() || (SlideShow::IsRunning(GetViewShellBase())) )
+ if (GetDocSh()->IsUIActive() || SlideShow::IsRunning(GetViewShellBase())
+ || !GetActiveWindow())
{
rSet.DisableItem( SID_ATTR_ZOOM );
}