summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-08 09:46:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-08 13:28:16 +0100
commitab9b67bbb001f380b3973941443bfbc59fe7141c (patch)
tree4737847b2970d2310932f115935a9454aacff6fe /svl
parent3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff)
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 <sbergman@redhat.com>
Diffstat (limited to 'svl')
-rw-r--r--svl/source/numbers/zforfind.cxx2
-rw-r--r--svl/source/numbers/zforlist.cxx2
-rw-r--r--svl/source/numbers/zformat.cxx6
-rw-r--r--svl/source/numbers/zforscan.cxx8
-rw-r--r--svl/source/svdde/ddecli.cxx2
5 files changed, 10 insertions, 10 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index ba72b005f12c..bff0e3efa449 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -885,7 +885,7 @@ int ImpSvNumberInputScan::GetSign( const OUString& rString, sal_Int32& nPos )
return 1;
case '(': // '(' similar to '-' ?!?
bNegCheck = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '-':
nPos++;
return -1;
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 955a3a593f24..747996c8d564 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2231,7 +2231,7 @@ void SvNumberFormatter::ImpAdjustFormatCodeDefault(
case i18n::KNumberFormatType::LONG :
if ( nMedium == -1 )
nDef = nElem;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
if ( nDef == -1 )
nDef = nElem;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index d9b2afc23b6e..191024238308 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -698,7 +698,7 @@ OUString SvNumberformat::ImpObtainCalendarAndNumerals( OUStringBuffer& rString,
nLang = maLocale.meLanguage = nReferenceLanguage;
}
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 0x1E : // simple Asian numerals, Chinese-PRC
case 0x1F : // financial Asian numerals, Chinese-PRC
case 0x20 : // Arabic fullwidth numerals, Chinese-PRC
@@ -2591,7 +2591,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber,
{
case '-' :
nExpSign = -1;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '+' :
++nExpStart;
break;
@@ -4469,7 +4469,7 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb
{
case NF_SYMBOLTYPE_DECSEP:
aGrouping.reset();
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_CURRENCY:
case NF_SYMBOLTYPE_PERCENT:
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 1838408d0e63..9b1378673a46 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1287,12 +1287,12 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
case NF_KEY_H: // H
case NF_KEY_HH: // HH
bIsTimeDetected = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case NF_KEY_S: // S
case NF_KEY_SS: // SS
if ( !bHaveMinute )
bIsTimeDetected = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case NF_KEY_AMPM: // AM,A,PM,P
case NF_KEY_AP:
eNewType = SvNumFormatType::TIME;
@@ -2483,7 +2483,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
break;
case NF_KEY_THAI_T :
bThaiT = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case NF_KEY_M: // M
case NF_KEY_MM: // MM
case NF_KEY_MMM: // MMM
@@ -2669,7 +2669,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
break;
case NF_KEY_THAI_T :
bThaiT = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case NF_KEY_MI: // M
case NF_KEY_MMI: // MM
case NF_KEY_H: // H
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index f5f30412c747..dfc57aea54d7 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -122,7 +122,7 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( UINT nCode, UINT nCbType,
nRet = reinterpret_cast<HDDEDATA>(DDE_FACK);
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case XTYP_REQUEST:
DdeData d;