sd/source/ui/view/drviewsa.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 835bedcf8b76cad05d07fceeb44598eb97203793
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Apr 28 15:04:38 2019 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Apr 28 16:01:27 2019 +0200
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.kagan...@collabora.com>
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 );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
