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 /sw/source/filter/ww8/ww8par6.cxx | |
| 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 'sw/source/filter/ww8/ww8par6.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 399d8109c55b..6b20a4fa593f 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -165,7 +165,7 @@ void wwSection::SetDirection() { default: OSL_ENSURE(false, "Unknown layout type"); - //fall-through + SAL_FALLTHROUGH; case 0: meDir=FRMDIR_HORI_LEFT_TOP; break; @@ -240,7 +240,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &r break; default: OSL_ENSURE(false, "Unknown grid type"); - //fall-through + SAL_FALLTHROUGH; case 3: eType = GRID_LINES_CHARS; aGrid.SetSnapToChars(true); @@ -3274,7 +3274,8 @@ void SwWW8ImplReader::Read_Underline( sal_uInt16, const sal_uInt8* pData, short // 9 = dotdash 10 = dotdotdash 11 = wave switch( *pData ) { - case 2: bWordLine = true; // no break; + case 2: bWordLine = true; + SAL_FALLTHROUGH; case 1: eUnderline = (FontLineStyle)LINESTYLE_SINGLE; break; case 3: eUnderline = (FontLineStyle)LINESTYLE_DOUBLE; break; case 4: eUnderline = (FontLineStyle)LINESTYLE_DOTTED; break; |