diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:46:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 13:28:16 +0100 |
| commit | ab9b67bbb001f380b3973941443bfbc59fe7141c (patch) | |
| tree | 4737847b2970d2310932f115935a9454aacff6fe /forms | |
| parent | 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff) | |
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b
"HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now"
Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937
Reviewed-on: https://gerrit.libreoffice.org/64800
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/Filter.cxx | 4 | ||||
| -rw-r--r-- | forms/source/component/FormattedField.cxx | 2 | ||||
| -rw-r--r-- | forms/source/runtime/formoperations.cxx | 2 | ||||
| -rw-r--r-- | forms/source/xforms/model.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index dd3c4f989e6f..d15df8535313 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -208,13 +208,13 @@ namespace frm { Reference< XListBox > xListBox( getPeer(), UNO_QUERY_THROW ); xListBox->addItemListener( this ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case FormComponentType::COMBOBOX: { xVclWindow->setProperty(PROPERTY_AUTOCOMPLETE, makeAny( true ) ); - SAL_FALLTHROUGH; + [[fallthrough]]; } default: diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 1e2e742eaba9..53592c52ee8f 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -913,7 +913,7 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const aExternalValue <<= sString; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case TypeClass_BOOLEAN: { diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 8eaca59166d8..0ff115326e09 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -445,7 +445,7 @@ namespace frm { case RET_NO: shouldCommit = false; - SAL_FALLTHROUGH; // don't ask again! + [[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 f0051df277ba..4028996e41c3 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -302,7 +302,7 @@ 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: + [[fallthrough]]; // continue as with text node: } case NodeType_TEXT_NODE: |