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, 64 insertions, 68 deletions

diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index e68f614c3729..871b24520a6f 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -1034,44 +1034,42 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue(
     const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if (!pCur)
         throw UnknownPropertyException();
-    else
+
+    switch (pCur->nWID)
     {
-        switch (pCur->nWID)
-        {
-            case WID_SELECTION :                aRet <<= m_aSelection;  break;
-            case WID_RESULT_SET :               aRet <<= m_xResultSet;  break;
-            case WID_CONNECTION :               aRet <<= m_xConnection;  break;
-            case WID_MODEL :                    aRet <<= m_xModel;  break;
-            case WID_DATA_SOURCE_NAME :         aRet <<= m_aDataSourceName;  break;
-            case WID_DATA_COMMAND :             aRet <<= m_aDataCommand;  break;
-            case WID_FILTER :                   aRet <<= m_aFilter;  break;
-            case WID_DOCUMENT_URL :             aRet <<= m_aDocumentURL;  break;
-            case WID_OUTPUT_URL :               aRet <<= m_aOutputURL;  break;
-            case WID_DATA_COMMAND_TYPE :        aRet <<= m_nDataCommandType;  break;
-            case WID_OUTPUT_TYPE :              aRet <<= m_nOutputType;  break;
-            case WID_ESCAPE_PROCESSING :        aRet <<= m_bEscapeProcessing;  break;
-            case WID_SINGLE_PRINT_JOBS :        aRet <<= m_bSinglePrintJobs;  break;
-            case WID_FILE_NAME_FROM_COLUMN :    aRet <<= m_bFileNameFromColumn;  break;
-            case WID_FILE_NAME_PREFIX :         aRet <<= m_aFileNamePrefix;  break;
-            case WID_MAIL_SUBJECT:              aRet <<= m_sSubject; break;
-            case WID_ADDRESS_FROM_COLUMN:       aRet <<= m_sAddressFromColumn; break;
-            case WID_SEND_AS_HTML:              aRet <<= m_bSendAsHTML; break;
-            case WID_SEND_AS_ATTACHMENT:        aRet <<= m_bSendAsAttachment; break;
-            case WID_MAIL_BODY:                 aRet <<= m_sMailBody; break;
-            case WID_ATTACHMENT_NAME:           aRet <<= m_sAttachmentName; break;
-            case WID_ATTACHMENT_FILTER:         aRet <<= m_sAttachmentFilter;break;
-            case WID_PRINT_OPTIONS:             aRet <<= m_aPrintSettings; break;
-            case WID_SAVE_AS_SINGLE_FILE:       aRet <<= m_bSaveAsSingleFile; break;
-            case WID_SAVE_FILTER:               aRet <<= m_sSaveFilter; break;
-            case WID_SAVE_FILTER_OPTIONS:       aRet <<= m_sSaveFilterOptions; break;
-            case WID_SAVE_FILTER_DATA:          aRet <<= m_aSaveFilterData; break;
-            case WID_COPIES_TO:                 aRet <<= m_aCopiesTo; break;
-            case WID_BLIND_COPIES_TO:           aRet <<= m_aBlindCopiesTo;break;
-            case WID_IN_SERVER_PASSWORD:        aRet <<= m_sInServerPassword; break;
-            case WID_OUT_SERVER_PASSWORD:       aRet <<= m_sOutServerPassword; break;
-            default :
-                OSL_FAIL("unknown WID");
-        }
+        case WID_SELECTION :                aRet <<= m_aSelection;  break;
+        case WID_RESULT_SET :               aRet <<= m_xResultSet;  break;
+        case WID_CONNECTION :               aRet <<= m_xConnection;  break;
+        case WID_MODEL :                    aRet <<= m_xModel;  break;
+        case WID_DATA_SOURCE_NAME :         aRet <<= m_aDataSourceName;  break;
+        case WID_DATA_COMMAND :             aRet <<= m_aDataCommand;  break;
+        case WID_FILTER :                   aRet <<= m_aFilter;  break;
+        case WID_DOCUMENT_URL :             aRet <<= m_aDocumentURL;  break;
+        case WID_OUTPUT_URL :               aRet <<= m_aOutputURL;  break;
+        case WID_DATA_COMMAND_TYPE :        aRet <<= m_nDataCommandType;  break;
+        case WID_OUTPUT_TYPE :              aRet <<= m_nOutputType;  break;
+        case WID_ESCAPE_PROCESSING :        aRet <<= m_bEscapeProcessing;  break;
+        case WID_SINGLE_PRINT_JOBS :        aRet <<= m_bSinglePrintJobs;  break;
+        case WID_FILE_NAME_FROM_COLUMN :    aRet <<= m_bFileNameFromColumn;  break;
+        case WID_FILE_NAME_PREFIX :         aRet <<= m_aFileNamePrefix;  break;
+        case WID_MAIL_SUBJECT:              aRet <<= m_sSubject; break;
+        case WID_ADDRESS_FROM_COLUMN:       aRet <<= m_sAddressFromColumn; break;
+        case WID_SEND_AS_HTML:              aRet <<= m_bSendAsHTML; break;
+        case WID_SEND_AS_ATTACHMENT:        aRet <<= m_bSendAsAttachment; break;
+        case WID_MAIL_BODY:                 aRet <<= m_sMailBody; break;
+        case WID_ATTACHMENT_NAME:           aRet <<= m_sAttachmentName; break;
+        case WID_ATTACHMENT_FILTER:         aRet <<= m_sAttachmentFilter;break;
+        case WID_PRINT_OPTIONS:             aRet <<= m_aPrintSettings; break;
+        case WID_SAVE_AS_SINGLE_FILE:       aRet <<= m_bSaveAsSingleFile; break;
+        case WID_SAVE_FILTER:               aRet <<= m_sSaveFilter; break;
+        case WID_SAVE_FILTER_OPTIONS:       aRet <<= m_sSaveFilterOptions; break;
+        case WID_SAVE_FILTER_DATA:          aRet <<= m_aSaveFilterData; break;
+        case WID_COPIES_TO:                 aRet <<= m_aCopiesTo; break;
+        case WID_BLIND_COPIES_TO:           aRet <<= m_aBlindCopiesTo;break;
+        case WID_IN_SERVER_PASSWORD:        aRet <<= m_sInServerPassword; break;
+        case WID_OUT_SERVER_PASSWORD:       aRet <<= m_sOutServerPassword; break;
+        default :
+            OSL_FAIL("unknown WID");
     }
 
     return aRet;
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 3515f1f34f5e..df3b8c3a164a 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -740,40 +740,38 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue(
     const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if (!pEntry)
         throw UnknownPropertyException();
-    else
+
+    sal_Int16 nWID = pEntry->nWID;
+    switch (nWID)
     {
-        sal_Int16 nWID = pEntry->nWID;
-        switch (nWID)
+        case WID_PAGE_COUNT :
+        case WID_LINE_COUNT :
         {
-            case WID_PAGE_COUNT :
-            case WID_LINE_COUNT :
-            {
-                // format document completely in order to get meaningful
-                // values for page count and line count
-                m_pView->GetWrtShell().CalcLayout();
-
-                sal_Int32 nCount = -1;
-                if (nWID == WID_PAGE_COUNT)
-                    nCount = m_pView->GetWrtShell().GetPageCount();
-                else // WID_LINE_COUNT
-                    nCount = m_pView->GetWrtShell().GetLineCount();
-                aRet <<= nCount;
-            }
-            break;
-            case WID_IS_HIDE_SPELL_MARKS :
-                // deprecated #i91949
-            break;
-            case WID_IS_CONSTANT_SPELLCHECK :
-            {
-                const SwViewOption *pOpt = m_pView->GetWrtShell().GetViewOptions();
-                if (!pOpt)
-                    throw RuntimeException();
-                aRet <<= bool(pOpt->GetCoreOptions() & ViewOptFlags1::OnlineSpell);
-            }
-            break;
-            default :
-                OSL_FAIL("unknown WID");
+            // format document completely in order to get meaningful
+            // values for page count and line count
+            m_pView->GetWrtShell().CalcLayout();
+
+            sal_Int32 nCount = -1;
+            if (nWID == WID_PAGE_COUNT)
+                nCount = m_pView->GetWrtShell().GetPageCount();
+            else // WID_LINE_COUNT
+                nCount = m_pView->GetWrtShell().GetLineCount();
+            aRet <<= nCount;
+        }
+        break;
+        case WID_IS_HIDE_SPELL_MARKS :
+            // deprecated #i91949
+        break;
+        case WID_IS_CONSTANT_SPELLCHECK :
+        {
+            const SwViewOption *pOpt = m_pView->GetWrtShell().GetViewOptions();
+            if (!pOpt)
+                throw RuntimeException();
+            aRet <<= bool(pOpt->GetCoreOptions() & ViewOptFlags1::OnlineSpell);
         }
+        break;
+        default :
+            OSL_FAIL("unknown WID");
     }
 
     return aRet;