diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
| commit | 14cd5182c5f64c43581c82db8c958369152226ac (patch) | |
| tree | 57f150ba2707f29214eeb9b1eaad2373780d1b15 /forms/source/component | |
| parent | e4bb2b4f4875c15bd68297b5be716edd6859841e (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.
Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'forms/source/component')
| -rw-r--r-- | forms/source/component/Filter.cxx | 4 | ||||
| -rw-r--r-- | forms/source/component/FormattedField.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
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; |