summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:26:06 -0400
commite7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f (patch)
treea6c39d9d4cde1baa84a9d788affbce3508af89a8 /svl
parent34f591ca95c4c63be092da4c4b2294230404f336 (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 'svl')
-rw-r--r--svl/source/numbers/zforfind.cxx2
-rw-r--r--svl/source/numbers/zforlist.cxx2
-rw-r--r--svl/source/numbers/zformat.cxx4
-rw-r--r--svl/source/numbers/zforscan.cxx4
4 files changed, 6 insertions, 6 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index da04cfca494e..b2ad644f1072 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -854,7 +854,7 @@ int ImpSvNumberInputScan::GetSign( const OUString& rString, sal_Int32& nPos )
return 1;
case '(': // '(' similar to '-' ?!?
nNegCheck = 1;
- //! fallthru
+ SAL_FALLTHROUGH;
case '-':
nPos++;
return -1;
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 277754719a9e..48dfe92e6d05 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2182,7 +2182,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
case i18n::KNumberFormatType::LONG :
if ( nMedium == -1 )
nDef = nElem;
- // fallthru
+ SAL_FALLTHROUGH;
default:
if ( nDef == -1 )
nDef = nElem;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 90175f9fadc7..6050716e710e 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2351,7 +2351,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber,
{
case '-' :
nExpSign = -1;
- // fall through
+ SAL_FALLTHROUGH;
case '+' :
++nExpStart;
break;
@@ -4145,7 +4145,7 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb
{
case NF_SYMBOLTYPE_DECSEP:
aGrouping.reset();
- // fall through
+ SAL_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 aeff7d110964..8dd7ba30865c 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -2268,7 +2268,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
break;
case NF_KEY_THAI_T :
bThaiT = true;
- // fall through
+ SAL_FALLTHROUGH;
case NF_KEY_M: // M
case NF_KEY_MM: // MM
case NF_KEY_MMM: // MMM
@@ -2424,7 +2424,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
break;
case NF_KEY_THAI_T :
bThaiT = true;
- // fall through
+ SAL_FALLTHROUGH;
case NF_KEY_MI: // M
case NF_KEY_MMI: // MM
case NF_KEY_H: // H