return early on failure

Change-Id: Id96ba954d3056cf982701090cf84ab4b1793b40b
Reviewed-on: https://gerrit.libreoffice.org/43489Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

svx/source/accessibility/AccessibleShape.cxx

@@ -405,24 +405,21 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     AccessibleShape::getAccessibleStateSet()
 {
     ::osl::MutexGuard aGuard (maMutex);
-    Reference<XAccessibleStateSet> xStateSet;
 
-    bool bDisposed = IsDisposed();
-
-    if (bDisposed)
+    if (IsDisposed())
     {
         // Return a minimal state set that only contains the DEFUNC state.
-        xStateSet = AccessibleContextBase::getAccessibleStateSet ();
+        return AccessibleContextBase::getAccessibleStateSet ();
     }
-    else
-    {
+
     ::utl::AccessibleStateSetHelper* pStateSet =
-              static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
+          static_cast<::utl::AccessibleStateSetHelper*>(mxStateSet.get());
+
+    if (!pStateSet)
+        return Reference<XAccessibleStateSet>();
 
-        if (pStateSet != nullptr)
-        {
     // Merge current FOCUSED state from edit engine.
-            if (mpText != nullptr)
+    if (mpText)
     {
         if (mpText->HaveFocus())
             pStateSet->AddState (AccessibleStateType::FOCUSED);
@@ -439,7 +436,8 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
         {
             css::uno::Reference<XAccessibleStateSet> rState =
                 xTempAccContext->getAccessibleStateSet();
-                    if( rState.is() )           {
+            if (rState.is())
+            {
                 css::uno::Sequence<short> aStates = rState->getStates();
                 int count = aStates.getLength();
                 for( int iIndex = 0;iIndex < count;iIndex++ )
@@ -455,17 +453,18 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
             }
         }
     }
+
     // Create a copy of the state set that may be modified by the
     // caller without affecting the current state set.
-            xStateSet.set( new ::utl::AccessibleStateSetHelper (*pStateSet));
-        }
-    }
-    if (!bDisposed && xStateSet.is() && mpParent && mpParent->IsDocumentSelAll())
+    Reference<XAccessibleStateSet> xStateSet(new ::utl::AccessibleStateSetHelper(*pStateSet));
+
+    if (mpParent && mpParent->IsDocumentSelAll())
     {
-        ::utl::AccessibleStateSetHelper* pStateSet =
-            static_cast< ::utl::AccessibleStateSetHelper*>(xStateSet.get());
-        pStateSet->AddState (AccessibleStateType::SELECTED);
+        ::utl::AccessibleStateSetHelper* pCopyStateSet =
+            static_cast<::utl::AccessibleStateSetHelper*>(xStateSet.get());
+        pCopyStateSet->AddState (AccessibleStateType::SELECTED);
     }
+
     return xStateSet;
 }