From b63609ba5478ed9b020c113f5704f7ea8447dec8 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 21 Sep 2017 15:42:49 +0200
Subject: loplugin:flatten in framework..package

Change-Id: Ide8a97eae6e2fdc7d2dcccba1480ac55a9b555bc
Reviewed-on: https://gerrit.libreoffice.org/42593
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 package/source/zippackage/ZipPackage.cxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'package/source/zippackage/ZipPackage.cxx')

diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index d91c0785304c..cfdfde131120 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -809,13 +809,11 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
         sTemp = aName.copy ( nOldIndex, nIndex - nOldIndex );
         if ( nIndex == nOldIndex )
             break;
-        if ( pCurrent->hasByName( sTemp ) )
-        {
-            pPrevious = pCurrent;
-            pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
-        }
-        else
+        if ( !pCurrent->hasByName( sTemp ) )
             throw NoSuchElementException(THROW_WHERE );
+
+        pPrevious = pCurrent;
+        pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
         nOldIndex = nIndex+1;
     }
 
-- 
cgit