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>

2 files changed, 4 insertions, 6 deletions

diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index 98d388681ddf..90efd23e3168 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -81,9 +81,8 @@ bool getOutputStream(ProgramOptions const & options,
     {
         throw CannotDumpException(
             "cannot open " + b2u(targetSourceFileName) + " for writing");
-    } else {
-        tmpSourceFileName = file.getName();
     }
+    tmpSourceFileName = file.getName();
     file.close();
     *ppOutputStream = new std::ofstream(tmpSourceFileName.getStr(),
                                         std::ios_base::binary);
diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx
index 8156660ef735..b0b1071e209f 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -49,11 +49,10 @@ bool readOption( OUString * pValue, const sal_Char * pOpt,
         {
             throw CannotDumpException(
                 "incomplete option \"-" + aOpt + "\" given!");
-        } else {
-            SAL_INFO("unodevtools", "identified option -" << pOpt << " = " << *pValue);
-            ++(*pnIndex);
-            return true;
         }
+        SAL_INFO("unodevtools", "identified option -" << pOpt << " = " << *pValue);
+        ++(*pnIndex);
+        return true;
     } else if (aArg.indexOf(aOpt) == 1) {
         *pValue = aArg.copy(1 + aOpt.getLength());
         SAL_INFO("unodevtools", "identified option -" << pOpt << " = " << *pValue);