diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:46:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 13:28:16 +0100 |
| commit | ab9b67bbb001f380b3973941443bfbc59fe7141c (patch) | |
| tree | 4737847b2970d2310932f115935a9454aacff6fe /hwpfilter | |
| parent | 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (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 'hwpfilter')
| -rw-r--r-- | hwpfilter/source/hcode.cxx | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hwpreader.cxx | 4 | ||||
| -rw-r--r-- | hwpfilter/source/lexer.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx index ed654cc097d2..37d7045353d8 100644 --- a/hwpfilter/source/hcode.cxx +++ b/hwpfilter/source/hcode.cxx @@ -473,7 +473,7 @@ static hchar lineCharConv(hchar ch) case 0x3060 + '\'' - 31: case 0x3060 + '\"' - 31: ch--; - SAL_FALLTHROUGH; + [[fallthrough]]; case 0x3060 + '\'' - 32: case 0x3060 + '\"' - 32: case 0x3060 + '{' - 32: diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 71ee7fd40689..642a8df18707 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -1815,7 +1815,7 @@ void HwpReader::makeColumns(ColumnDef const *coldef) { case 1: /* thin line */ padd("style:width", sXML_CDATA, "0.02mm"); - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: /* dotted line */ padd("style:style", sXML_CDATA, "dotted"); padd("style:width", sXML_CDATA, "0.02mm"); @@ -3401,7 +3401,7 @@ void HwpReader::makeDateFormat(DateCode * hbox) break; case '_': padd("number:style", sXML_CDATA, "long"); - SAL_FALLTHROUGH; + [[fallthrough]]; case '6': case '^': rstartEl("number:day-of-week", mxList.get()); diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx index 4ee3c4c4a47a..d70d81a92923 100644 --- a/hwpfilter/source/lexer.cxx +++ b/hwpfilter/source/lexer.cxx @@ -1251,7 +1251,7 @@ case 23: YY_RULE_SETUP { token_debug(" ==>Ignore[\\rm]\n"); } //YY_BREAK -SAL_FALLTHROUGH; +[[fallthrough]]; case 24: YY_RULE_SETUP { yylval.str = yytext+1; token_debug(" ==>General_Iden[%s]\n",yytext+1); return GENERAL_IDEN; } @@ -1296,12 +1296,12 @@ case 34: YY_RULE_SETUP { yylval.str = yytext+1; token_debug(" ==>Space_Symbol[%s]\n",yytext+1); /*return SPACE_SYMBOL;*/ } //YY_BREAK -SAL_FALLTHROUGH; +[[fallthrough]]; case 35: YY_RULE_SETUP { yylval.str = strdup("quad"); token_debug(" ==>Space_Symbol[quad]\n"); /* return SPACE_SYMBOL;*/ } //YY_BREAK -SAL_FALLTHROUGH; +[[fallthrough]]; case 36: YY_RULE_SETUP { yylval.dval = yytext; token_debug(" ==>Digit[%s]\n",yytext); return DIGIT; } |