From 14cd5182c5f64c43581c82db8c958369152226ac Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 10 May 2016 16:42:16 +0200
Subject: 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
---
 forms/source/component/Filter.cxx         | 4 ++--
 forms/source/component/FormattedField.cxx | 2 +-
 forms/source/runtime/formoperations.cxx   | 2 +-
 forms/source/xforms/model.cxx             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'forms')

diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 805edef48a25..acafec2712ff 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -211,14 +211,14 @@ namespace frm
                 {
                     Reference< XListBox >  xListBox( getPeer(), UNO_QUERY_THROW );
                     xListBox->addItemListener( this );
+                    SAL_FALLTHROUGH;
                 }
-                // no break
 
                 case FormComponentType::COMBOBOX:
                 {
                     xVclWindow->setProperty(PROPERTY_AUTOCOMPLETE, makeAny( true ) );
+                    SAL_FALLTHROUGH;
                 }
-                // no break
 
                 default:
                 {
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index d0ac79437f38..c027352e4c5c 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -943,8 +943,8 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const
             aExternalValue <<= sString;
             break;
         }
+        SAL_FALLTHROUGH;
     }
-    // NO break here!
     case TypeClass_BOOLEAN:
     {
         double fValue = 0;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index fa3d42870172..744a11b77ac3 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -448,7 +448,7 @@ namespace frm
                 {
                 case RET_NO:
                     shouldCommit = false;
-                    // no break on purpose: don't ask again!
+                    SAL_FALLTHROUGH; // don't ask again!
                 case RET_YES:
                     needConfirmation = false;
                     return true;
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 9d996f876713..746cce894b97 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -323,8 +323,8 @@ bool Model::setSimpleContent( const XNode_t& xConstNode,
             OSL_ENSURE( xNode.is() &&
                         xNode->getNodeType() == NodeType_TEXT_NODE,
                         "text node creation failed?" );
+            SAL_FALLTHROUGH; // continue as with text node:
         }
-        // no break; continue as with text node:
 
         case NodeType_TEXT_NODE:
         case NodeType_ATTRIBUTE_NODE:
-- 
cgit