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 --- basic/source/comp/loops.cxx | 4 ++-- basic/source/sbx/sbxbool.cxx | 2 +- basic/source/sbx/sbxbyte.cxx | 2 +- basic/source/sbx/sbxchar.cxx | 2 +- basic/source/sbx/sbxdate.cxx | 2 +- basic/source/sbx/sbxdbl.cxx | 2 +- basic/source/sbx/sbxdec.cxx | 2 +- basic/source/sbx/sbxint.cxx | 6 +++--- basic/source/sbx/sbxlng.cxx | 2 +- basic/source/sbx/sbxsng.cxx | 2 +- basic/source/sbx/sbxstr.cxx | 2 +- basic/source/sbx/sbxuint.cxx | 2 +- basic/source/sbx/sbxulng.cxx | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) (limited to 'basic') diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx index ec20b76e71a7..40ac10bad9fc 100644 --- a/basic/source/comp/loops.cxx +++ b/basic/source/comp/loops.cxx @@ -547,7 +547,7 @@ void SbiParser::Resume() aGen.Gen( SbiOpcode::RESUME_, 0 ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case SYMBOL: if( MayBeLabel() ) { @@ -556,7 +556,7 @@ void SbiParser::Resume() Next(); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: Error( ERRCODE_BASIC_LABEL_EXPECTED ); } diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx index 720c63378384..a8b4df040673 100644 --- a/basic/source/sbx/sbxbool.cxx +++ b/basic/source/sbx/sbxbool.cxx @@ -30,7 +30,7 @@ enum SbxBOOL ImpGetBool( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = SbxFALSE; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx index df85f5f7f1e0..b518782d4c1f 100644 --- a/basic/source/sbx/sbxbyte.cxx +++ b/basic/source/sbx/sbxbyte.cxx @@ -33,7 +33,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx index d5f34e63d297..aba2d47cb48f 100644 --- a/basic/source/sbx/sbxchar.cxx +++ b/basic/source/sbx/sbxchar.cxx @@ -33,7 +33,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index 1880ba40df78..9d9a56d2d359 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -42,7 +42,7 @@ double ImpGetDate( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx index 9ea70832a8e0..823693c3a149 100644 --- a/basic/source/sbx/sbxdbl.cxx +++ b/basic/source/sbx/sbxdbl.cxx @@ -31,7 +31,7 @@ double ImpGetDouble( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index c71b031df2be..b1f9b0dd00c0 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -413,7 +413,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: pnDecRes->setShort( 0 ); break; case SbxCHAR: diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index 7f16ef7e0013..40bc75f82d5c 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -33,7 +33,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: @@ -389,7 +389,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: @@ -649,7 +649,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx index e9398a47553e..cc832e8ed054 100644 --- a/basic/source/sbx/sbxlng.cxx +++ b/basic/source/sbx/sbxlng.cxx @@ -33,7 +33,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx index f687c930e32a..b204d25827c4 100644 --- a/basic/source/sbx/sbxsng.cxx +++ b/basic/source/sbx/sbxsng.cxx @@ -31,7 +31,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx index 96ea1fc40507..196faaea558c 100644 --- a/basic/source/sbx/sbxstr.cxx +++ b/basic/source/sbx/sbxstr.cxx @@ -40,7 +40,7 @@ OUString ImpGetString( const SbxValues* p ) { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: break; case SbxCHAR: diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index c69931d8368b..59c421715a99 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -31,7 +31,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index 3e182842515e..b78f0407af51 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -31,7 +31,7 @@ start: { case SbxNULL: SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); - SAL_FALLTHROUGH; + [[fallthrough]]; case SbxEMPTY: nRes = 0; break; case SbxCHAR: -- cgit