summaryrefslogtreecommitdiff
path: root/editeng/source/items
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
commit14cd5182c5f64c43581c82db8c958369152226ac (patch)
tree57f150ba2707f29214eeb9b1eaad2373780d1b15 /editeng/source/items
parente4bb2b4f4875c15bd68297b5be716edd6859841e (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 'editeng/source/items')
-rw-r--r--editeng/source/items/frmitems.cxx8
-rw-r--r--editeng/source/items/textitem.cxx2
2 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 63cca0627491..00a41e259c68 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1867,28 +1867,28 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
case LEFT_BORDER_DISTANCE:
bDistMember = true;
- //fall-through
+ SAL_FALLTHROUGH;
case LEFT_BORDER:
case MID_LEFT_BORDER:
nLine = SvxBoxItemLine::LEFT;
break;
case RIGHT_BORDER_DISTANCE:
bDistMember = true;
- //fall-through
+ SAL_FALLTHROUGH;
case RIGHT_BORDER:
case MID_RIGHT_BORDER:
nLine = SvxBoxItemLine::RIGHT;
break;
case BOTTOM_BORDER_DISTANCE:
bDistMember = true;
- //fall-through
+ SAL_FALLTHROUGH;
case BOTTOM_BORDER:
case MID_BOTTOM_BORDER:
nLine = SvxBoxItemLine::BOTTOM;
break;
case TOP_BORDER_DISTANCE:
bDistMember = true;
- //fall-through
+ SAL_FALLTHROUGH;
case TOP_BORDER:
case MID_TOP_BORDER:
nLine = SvxBoxItemLine::TOP;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 68e6abebc5d3..23243aa85d56 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3332,7 +3332,7 @@ void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
{
default:
DBG_ASSERT( false, "wrong SlotId for class SvxScriptSetItem" );
- // no break - default to font - Id Range !!
+ SAL_FALLTHROUGH; // default to font - Id Range !!
case SID_ATTR_CHAR_FONT:
rLatin = SID_ATTR_CHAR_FONT;