coverity#705872 Dereference before null check

Change-Id: Ia964362f757372862b3f2e5a0a9581171616251b

coverity#705872 Dereference before null check
Change-Id: Ia964362f757372862b3f2e5a0a9581171616251b
40c78e72 · Caolán McNamara · 50d5bd90 · 40c78e72
Kaydet (Commit) 40c78e72 authored Ock 28, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

PresentationViewShellBase.cxx sd/source/ui/view/PresentationViewShellBase.cxx +7 -10

No files found.
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -69,18 +69,15 @@ PresentationViewShellBase::PresentationViewShellBase (
    : ViewShellBase (_pFrame, pOldShell)
 {
    // Hide the automatic (non-context sensitive) tool bars.
-    if (_pFrame!=NULL)
+    Reference<beans::XPropertySet> xFrameSet (
+        _pFrame->GetFrame().GetFrameInterface(),
+        UNO_QUERY);
+    if (xFrameSet.is())
    {
-        Reference<beans::XPropertySet> xFrameSet (
+        Reference<beans::XPropertySet> xLayouterSet(xFrameSet->getPropertyValue("LayoutManager"), UNO_QUERY);
-            _pFrame->GetFrame().GetFrameInterface(),
+        if (xLayouterSet.is())
-            UNO_QUERY);
-        if (xFrameSet.is())
        {
-            Reference<beans::XPropertySet> xLayouterSet(xFrameSet->getPropertyValue("LayoutManager"), UNO_QUERY);
+            xLayouterSet->setPropertyValue("AutomaticToolbars", makeAny(sal_False));
-            if (xLayouterSet.is())
-            {
-                xLayouterSet->setPropertyValue("AutomaticToolbars", makeAny(sal_False));
-            }
        }
    }
 }