From ab9b67bbb001f380b3973941443bfbc59fe7141c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 8 Dec 2018 09:46:01 +0100 Subject: 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 --- sax/source/fastparser/fastparser.cxx | 2 +- sax/source/tools/converter.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sax') diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 215bef0f27f0..ff2d0080794b 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -1002,7 +1002,7 @@ bool FastSaxParserImpl::consume(EventList& rEventList) return false; case CallbackType::EXCEPTION: rEntity.throwException( mxDocumentLocator, false ); - SAL_FALLTHROUGH; // avoid unreachable code warning with some compilers + [[fallthrough]]; // avoid unreachable code warning with some compilers default: assert(false); return false; diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 27ffbdde8c77..e1dbac1355e5 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -302,7 +302,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, case MeasureUnit::MM_100TH: case MeasureUnit::MM_10TH: OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,"output unit not supported for twip values" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case MeasureUnit::MM: // 0.01mm = 0.57twip (exactly) nMul = 25400; // 25.4 * 1000 @@ -359,7 +359,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, case MeasureUnit::MM_10TH: OSL_ENSURE( MeasureUnit::INCH == nTargetUnit, "output unit not supported for 1/100mm values" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case MeasureUnit::MM: // 0.01mm = 1 mm/100 (exactly) nMul = 10; -- cgit