summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:26:06 -0400
commite7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f (patch)
treea6c39d9d4cde1baa84a9d788affbce3508af89a8 /forms
parent34f591ca95c4c63be092da4c4b2294230404f336 (diff)
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. (cherry picked from commit 14cd5182c5f64c43581c82db8c958369152226ac) Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/Filter.cxx4
-rw-r--r--forms/source/component/FormattedField.cxx2
-rw-r--r--forms/source/runtime/formoperations.cxx2
-rw-r--r--forms/source/xforms/model.cxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 5cb32bd9f9c2..87b4e5823227 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -214,14 +214,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 b00f7ceb8d37..aab467b5f839 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 bdd507f05c7d..e10c29d4cb8f 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -449,7 +449,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 1a0e50bc81b3..b07c92d5517b 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -329,8 +329,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: