Replace fallthrough comments with new SAL_FALLTHROUGH macro

...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in
preparation of enabling -Wimplicit-fallthrough.  (This is only relevant for
C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.)

Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but
that would require adding back in dependencies on boost_headers to many
libraries where we carefully removed any remaining Boost dependencies only
recently.  (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its
future evolution will not have any impact on the stable URE interface.)  C++17
will have a proper [[fallthroug]], eventually removing the need for a macro
altogether.

Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca

5 files changed, 11 insertions, 11 deletions

diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index f4428173b7f9..680da5088447 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -229,7 +229,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
                 break;
             }
 
-            // otherwise call DelLeft
+            SAL_FALLTHROUGH; // otherwise call DelLeft
         case FN_SHIFT_BACKSPACE:
             rSh.DelLeft();
             break;
@@ -1852,7 +1852,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
             case FN_FRAME_WRAPTHRU_TRANSP:
                 if (aWrap.IsContour())
                     aWrap.SetContour(false);
-                // No break!!!
+                SAL_FALLTHROUGH;
             case FN_FRAME_WRAPTHRU:
                 nSurround = SURROUND_THROUGHT;
                 break;
@@ -1971,8 +1971,8 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
                     if(nInputLang != LANGUAGE_DONTKNOW && nInputLang != LANGUAGE_SYSTEM)
                         nScripts = SvtLanguageOptions::GetScriptTypeOfLanguage( nInputLang );
                 }
+                SAL_FALLTHROUGH;
             }
-            // fall-through
             case SID_ATTR_CHAR_POSTURE:
             case SID_ATTR_CHAR_WEIGHT:
             {
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index add32b40a001..6c1fc4360ab9 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -273,7 +273,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
 
         case SID_FLIP_VERTICAL:
             bMirror = false;
-            /* no break */
+            SAL_FALLTHROUGH;
         case SID_FLIP_HORIZONTAL:
             rSh.MirrorSelection( bMirror );
             break;
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 6ebd85b4f153..c06382ed289c 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -497,14 +497,14 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
 
         case FN_FRAME_UP:
             bTopParam = false;
-            /* no break */
+            SAL_FALLTHROUGH;
         case SID_FRAME_TO_TOP:
             pSh->SelectionToTop( bTopParam );
             break;
 
         case FN_FRAME_DOWN:
             bBottomParam = false;
-            /* no break */
+            SAL_FALLTHROUGH;
         case SID_FRAME_TO_BOTTOM:
             pSh->SelectionToBottom( bBottomParam );
             break;
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 91199fc84878..ef4d98abd9a7 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -744,7 +744,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 {
                     case TBLMERGE_OK:
                          bCallDone = true;
-                        //no break;
+                         SAL_FALLTHROUGH;
                     case TBLMERGE_NOSELECTION:
                         break;
                     case TBLMERGE_TOOCOMPLEX:
@@ -925,8 +925,9 @@ void SwTableShell::Execute(SfxRequest &rReq)
             }
 
             nSlot = bColumn ? FN_TABLE_INSERT_COL_DLG : FN_TABLE_INSERT_ROW_DLG;
+
+            SAL_FALLTHROUGH; // on Count = 0 appears the dialog
         }
-        // No break;  on Count = 0 appears the dialog
         case FN_TABLE_INSERT_COL_DLG:
         case FN_TABLE_INSERT_ROW_DLG:
         {
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index e105efb0d442..c56621e65f8e 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -861,7 +861,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             const sal_uInt16 nWhich = GetPool().GetWhich( nSlot );
             if ( pArgs && pArgs->GetItemState( nWhich ) == SfxItemState::SET )
                 bUseDialog = false;
-            // intentionally no break
+            SAL_FALLTHROUGH;
         }
         case SID_CHAR_DLG:
         case SID_CHAR_DLG_EFFECT:
@@ -894,8 +894,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             const sal_uInt16 nWhich = GetPool().GetWhich( nSlot );
             if ( pArgs && pArgs->GetItemState( nWhich ) == SfxItemState::SET )
                 bUseDialog = false;
-            // intentionally no break
-
+            SAL_FALLTHROUGH;
         }
         case SID_PARA_DLG:
         {