loplugin:flatten in pyuno..sc

Change-Id: I7ddc0b76532d26910f78642200750459508c2861
Reviewed-on: https://gerrit.libreoffice.org/42617
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 11 insertions, 13 deletions

diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index d6eb02a1eb4d..3cf9a3261cd9 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -442,13 +442,12 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = lcl_GetDPObject( pDocShell, nTab, aName );
-    if (pDPObj && pDocShell)
-    {
-        ScDBDocFunc aFunc(*pDocShell);
-        aFunc.RemovePivotTable(*pDPObj, true, true);  // remove - incl. undo etc.
-    }
-    else
+    if (!pDPObj || !pDocShell)
         throw RuntimeException();       // no other exceptions specified
+
+    ScDBDocFunc aFunc(*pDocShell);
+    aFunc.RemovePivotTable(*pDPObj, true, true);  // remove - incl. undo etc.
+
 }
 
 // XEnumerationAccess
@@ -3379,14 +3378,13 @@ void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyNam
                     else if ( aPropertyName == SC_UNONAME_POS )
                     {
                         sal_Int32 nNewPos = 0;
-                        if ( ( aValue >>= nNewPos ) && nNewPos >= 0 && nNewPos < nCount )
-                        {
-                            pDim->SetMemberPosition( sName, nNewPos );
-                            // get new effective index (depends on sorting mode, which isn't modified)
-                            bGetNewIndex = true;
-                        }
-                        else
+                        if ( !( aValue >>= nNewPos ) || nNewPos < 0 || nNewPos >= nCount )
                             throw IllegalArgumentException();
+
+                        pDim->SetMemberPosition( sName, nNewPos );
+                        // get new effective index (depends on sorting mode, which isn't modified)
+                        bGetNewIndex = true;
+
                     }
                     SetDPObject( pDPObj );