From 494b3e69fd4bef0af19627cf31da98da376019d0 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 21 Dec 2021 20:22:48 +0200
Subject: loplugin:flatten in package..reportdesign

Change-Id: I2da242fcb59709ebdd0819ec04d051d794da71e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127277
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 package/source/zippackage/zipfileaccess.cxx | 38 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'package')

diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index a02d416286f1..85a674ef6e50 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -134,34 +134,32 @@ bool OZipFileAccess::StringGoodForPattern_Impl( const OUString& aString,
 
     sal_Int32 nBeginInd = aPattern[0].getLength();
     sal_Int32 nEndInd = aString.getLength() - aPattern[nInd].getLength();
-    if ( nEndInd >= nBeginInd
-      && ( nEndInd == aString.getLength() || aString.subView( nEndInd ) == aPattern[nInd] )
-      && ( nBeginInd == 0 || aString.subView( 0, nBeginInd ) == aPattern[0] ) )
-    {
-        for ( sal_Int32 nCurInd = aPattern.getLength() - 2; nCurInd > 0; nCurInd-- )
-        {
-            if ( aPattern[nCurInd].isEmpty() )
-                continue;
+    if ( nEndInd < nBeginInd
+      || ( nEndInd != aString.getLength() && aString.subView( nEndInd ) != aPattern[nInd] )
+      || ( nBeginInd != 0 && aString.subView( 0, nBeginInd ) != aPattern[0] ) )
+          return false;
 
-            if ( nEndInd == nBeginInd )
-                return false;
+    for ( sal_Int32 nCurInd = aPattern.getLength() - 2; nCurInd > 0; nCurInd-- )
+    {
+        if ( aPattern[nCurInd].isEmpty() )
+            continue;
 
-            // check that search does not use nEndInd position
-            sal_Int32 nLastInd = aString.lastIndexOf( aPattern[nCurInd], nEndInd - 1 );
+        if ( nEndInd == nBeginInd )
+            return false;
 
-            if ( nLastInd == -1 )
-                return false;
+        // check that search does not use nEndInd position
+        sal_Int32 nLastInd = aString.lastIndexOf( aPattern[nCurInd], nEndInd - 1 );
 
-            if ( nLastInd < nBeginInd )
-                return false;
+        if ( nLastInd == -1 )
+            return false;
 
-            nEndInd = nLastInd;
-        }
+        if ( nLastInd < nBeginInd )
+            return false;
 
-        return true;
+        nEndInd = nLastInd;
     }
 
-    return false;
+    return true;
 }
 
 // XInitialization
-- 
cgit