diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-01-30 11:28:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-30 11:35:13 +0000 |
| commit | 9a5140befbd7b9ae4118c5899ed8595d5abb65f8 (patch) | |
| tree | 9df0ce39448814cacc3c71220d1fdc153bde6b31 | |
| parent | 8310642c6c404ea501b8be5ae4d12860e1562ac9 (diff) | |
coverity#1428736 Dereference null return value
and
coverity#1428737 Dereference null return value
Change-Id: Ia743107e194a7945be1eb3ab521ef7fe1a168ab3
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 20 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvs2.cxx | 20 |
2 files changed, 18 insertions, 22 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index c6c29dbce508..9271c6fd0574 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -882,20 +882,18 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); - if (pArgs && pArgs->Count () == 1 ) + const SfxUInt16Item* pScale = (pArgs && pArgs->Count () == 1) ? + rReq.GetArg<SfxUInt16Item>(SID_ATTR_ZOOMSLIDER) : nullptr; + if (pScale && CHECK_RANGE (5, pScale->GetValue (), 3000)) { - const SfxUInt16Item* pScale = rReq.GetArg<SfxUInt16Item>(SID_ATTR_ZOOMSLIDER); - if (CHECK_RANGE (5, pScale->GetValue (), 3000)) - { - SetZoom (pScale->GetValue ()); + SetZoom (pScale->GetValue ()); - SfxBindings& rBindings = GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_ATTR_ZOOM ); - rBindings.Invalidate( SID_ZOOM_IN ); - rBindings.Invalidate( SID_ZOOM_OUT ); - rBindings.Invalidate( SID_ATTR_ZOOMSLIDER ); + SfxBindings& rBindings = GetViewFrame()->GetBindings(); + rBindings.Invalidate( SID_ATTR_ZOOM ); + rBindings.Invalidate( SID_ZOOM_IN ); + rBindings.Invalidate( SID_ZOOM_OUT ); + rBindings.Invalidate( SID_ATTR_ZOOMSLIDER ); - } } Cancel(); diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index ff5c9767d478..9400154d44a2 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -117,20 +117,18 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); - if (pArgs && pArgs->Count () == 1 ) + const SfxUInt16Item* pScale = (pArgs && pArgs->Count () == 1) ? + rReq.GetArg<SfxUInt16Item>(SID_ATTR_ZOOMSLIDER) : nullptr; + if (pScale && CHECK_RANGE (5, pScale->GetValue (), 3000)) { - const SfxUInt16Item* pScale = rReq.GetArg<SfxUInt16Item>(SID_ATTR_ZOOMSLIDER); - if (CHECK_RANGE (5, pScale->GetValue (), 3000)) - { - SetZoom (pScale->GetValue ()); + SetZoom (pScale->GetValue ()); - SfxBindings& rBindings = GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_ATTR_ZOOM ); - rBindings.Invalidate( SID_ZOOM_IN ); - rBindings.Invalidate( SID_ZOOM_OUT ); - rBindings.Invalidate( SID_ATTR_ZOOMSLIDER ); + SfxBindings& rBindings = GetViewFrame()->GetBindings(); + rBindings.Invalidate( SID_ATTR_ZOOM ); + rBindings.Invalidate( SID_ZOOM_IN ); + rBindings.Invalidate( SID_ZOOM_OUT ); + rBindings.Invalidate( SID_ATTR_ZOOMSLIDER ); - } } Cancel(); |