diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:06 -0400 |
| commit | e7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f (patch) | |
| tree | a6c39d9d4cde1baa84a9d788affbce3508af89a8 /sw/source/filter/ww8/ww8atr.cxx | |
| parent | 34f591ca95c4c63be092da4c4b2294230404f336 (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 'sw/source/filter/ww8/ww8atr.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index ca7e8950a3bd..47b4e4db29f2 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2335,7 +2335,7 @@ void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rField ) default: OSL_ENSURE(rField.GetFormat() == SVX_NUM_ARABIC, "Unknown numbering type exported as default of Arabic\n"); - //fallthrough + SAL_FALLTHROUGH; case SVX_NUM_ARABIC: rStr += "\\* ARABIC "; break; @@ -3467,7 +3467,7 @@ void AttributeOutputBase::FormatBreak( const SvxFormatBreakItem& rBreak ) case SVX_BREAK_COLUMN_BEFORE: // ColumnBreak bBefore = true; - // no break; + SAL_FALLTHROUGH; case SVX_BREAK_COLUMN_AFTER: case SVX_BREAK_COLUMN_BOTH: if ( GetExport().Sections().CurrentNumberOfColumns( *GetExport().m_pDoc ) > 1 || GetExport().SupportsOneColumnBreak() ) @@ -3567,7 +3567,7 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid ) { default: OSL_FAIL("Unknown grid type"); - //fall-through + SAL_FALLTHROUGH; case GRID_NONE: nGridType = 0; break; @@ -4444,7 +4444,7 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir default: //Can't get an unknown type here OSL_FAIL("Unknown frame direction"); - //fall-through + SAL_FALLTHROUGH; case FRMDIR_HORI_LEFT_TOP: nTextFlow = 0; break; |