summaryrefslogtreecommitdiff
path: root/editeng
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 /editeng
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 'editeng')
-rw-r--r--editeng/source/editeng/eehtml.cxx4
-rw-r--r--editeng/source/items/frmitems.cxx8
-rw-r--r--editeng/source/items/numitem.cxx4
-rw-r--r--editeng/source/items/textitem.cxx2
-rw-r--r--editeng/source/rtf/rtfitem.cxx10
-rw-r--r--editeng/source/rtf/svxrtf.cxx6
-rw-r--r--editeng/source/uno/unotext.cxx2
7 files changed, 18 insertions, 18 deletions
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index c9f16b6772df..36a186c3df71 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -287,7 +287,7 @@ void EditHTMLParser::NextToken( HtmlTokenId nToken )
case HtmlTokenId::TABLEHEADER_ON:
case HtmlTokenId::TABLEDATA_ON:
nInCell++;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case HtmlTokenId::BLOCKQUOTE_ON:
case HtmlTokenId::BLOCKQUOTE_OFF:
case HtmlTokenId::BLOCKQUOTE30_ON:
@@ -311,7 +311,7 @@ void EditHTMLParser::NextToken( HtmlTokenId nToken )
{
if ( nInCell )
nInCell--;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case HtmlTokenId::LISTHEADER_OFF:
case HtmlTokenId::LI_OFF:
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index f21950827dd7..622e557a0517 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1649,28 +1649,28 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
case LEFT_BORDER_DISTANCE:
bDistMember = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case LEFT_BORDER:
case MID_LEFT_BORDER:
nLine = SvxBoxItemLine::LEFT;
break;
case RIGHT_BORDER_DISTANCE:
bDistMember = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RIGHT_BORDER:
case MID_RIGHT_BORDER:
nLine = SvxBoxItemLine::RIGHT;
break;
case BOTTOM_BORDER_DISTANCE:
bDistMember = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case BOTTOM_BORDER:
case MID_BOTTOM_BORDER:
nLine = SvxBoxItemLine::BOTTOM;
break;
case TOP_BORDER_DISTANCE:
bDistMember = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case TOP_BORDER:
case MID_TOP_BORDER:
nLine = SvxBoxItemLine::TOP;
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index f50d98d5522a..e9598a33aabc 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -525,8 +525,8 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper )
}
switch( nNumber )
{
- case 3: { sRet.append(*cRomanArr); SAL_FALLTHROUGH; }
- case 2: { sRet.append(*cRomanArr); SAL_FALLTHROUGH; }
+ case 3: { sRet.append(*cRomanArr); [[fallthrough]]; }
+ case 2: { sRet.append(*cRomanArr); [[fallthrough]]; }
case 1: { sRet.append(*cRomanArr); }
break;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 69246c19d3aa..902b26bc66aa 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2925,7 +2925,7 @@ void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
{
default:
SAL_WARN( "editeng.items", "wrong SlotId for class SvxScriptSetItem" );
- SAL_FALLTHROUGH; // default to font - Id Range !!
+ [[fallthrough]]; // default to font - Id Range !!
case SID_ATTR_CHAR_FONT:
rLatin = SID_ATTR_CHAR_FONT;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index bf1f40585bf3..8685259b2753 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1348,17 +1348,17 @@ static void SetBorderLine( int nBorderTyp, SvxBoxItem& rItem,
rItem.SetLine( &rBorder, SvxBoxItemLine::TOP );
if( RTF_BOX != nBorderTyp )
return;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RTF_BRDRB:
rItem.SetLine( &rBorder, SvxBoxItemLine::BOTTOM );
if( RTF_BOX != nBorderTyp )
return;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RTF_BRDRL:
rItem.SetLine( &rBorder, SvxBoxItemLine::LEFT );
if( RTF_BOX != nBorderTyp )
return;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RTF_BRDRR:
rItem.SetLine( &rBorder, SvxBoxItemLine::RIGHT );
if( RTF_BOX != nBorderTyp )
@@ -1799,7 +1799,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
{
case RTF_ADEFF:
bIsLeftToRightDef = false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RTF_DEFF:
{
if( -1 == nValue )
@@ -1815,7 +1815,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
case RTF_ADEFLANG:
bIsLeftToRightDef = false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RTF_DEFLANG:
// store default Language
if( -1 != nValue )
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 78d726b86d51..c3bafbf24db8 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -170,7 +170,7 @@ void SvxRTFParser::NextToken( int nToken )
case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR;
INSINGLECHAR:
aToken = OUString(cCh);
- SAL_FALLTHROUGH; // aToken is set as Text
+ [[fallthrough]]; // aToken is set as Text
case RTF_TEXTTOKEN:
{
InsertText();
@@ -412,7 +412,7 @@ void SvxRTFParser::ReadColorTable()
: -1 == aToken.indexOf( ";" ) )
break; // At least the ';' must be found
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case ';':
if( IsParserWorking() )
@@ -503,7 +503,7 @@ void SvxRTFParser::ReadFontTable()
// for technical/symbolic font of the rtl_TextEncoding is changed!
case RTF_FTECH:
pFont->SetCharSet( RTL_TEXTENCODING_SYMBOL );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RTF_FNIL:
pFont->SetFamily( FAMILY_DONTKNOW );
break;
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 68858043cca3..0449957b127c 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1838,7 +1838,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
return;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
default:
throw lang::IllegalArgumentException();