loplugin:flatten check for throw in then clause

also make the plugin ignore the case where we have var decl's in the
clause we want to flatten, which could lead to problematic extension of
variable lifetime

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

1 files changed, 2 insertions, 6 deletions

diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 83c6e2ca1a9c..04bf98cce9c0 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -571,9 +571,7 @@ namespace fileaccess {
             excep.Message = "the name contained invalid characters";
             if(isHandled)
                 throw excep;
-            else {
-                cancelCommandExecution( Any(excep), xEnv );
-            }
+            cancelCommandExecution( Any(excep), xEnv );
 //              ioErrorCode = IOErrorCode_INVALID_CHARACTER;
 //              cancelCommandExecution(
 //                  ioErrorCode,
@@ -591,9 +589,7 @@ namespace fileaccess {
             excep.Message = "folder exists and overwrite forbidden";
             if(isHandled)
                 throw excep;
-            else {
-                cancelCommandExecution( Any(excep), xEnv );
-            }
+            cancelCommandExecution( Any(excep), xEnv );
 //              ioErrorCode = IOErrorCode_ALREADY_EXISTING;
 //              cancelCommandExecution(
 //                  ioErrorCode,