summaryrefslogtreecommitdiff
path: root/svtools
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 /svtools
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 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox2.cxx6
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx8
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx2
-rw-r--r--svtools/source/control/valueset.cxx12
-rw-r--r--svtools/source/svhtml/parhtml.cxx20
-rw-r--r--svtools/source/svrtf/parrtf.cxx2
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx2
8 files changed, 27 insertions, 27 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index e06e3746a55e..b599a701f679 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1642,7 +1642,7 @@ bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
case KEY_TAB:
if ( !bColumnCursor )
break;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case KEY_RIGHT: nId = BROWSER_CURSORRIGHT; break;
case KEY_LEFT: nId = BROWSER_CURSORLEFT; break;
case KEY_SPACE: nId = BROWSER_SELECT; break;
@@ -1777,7 +1777,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
nNewId != HandleColumnId && GoToColumnId( nNewId );
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case BROWSER_CURSORENDOFFILE:
GoToRow( nRowCount - 1, false );
break;
@@ -1817,7 +1817,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
}
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case BROWSER_CURSORTOPOFFILE:
GoToRow( 0, false );
break;
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 7aad65c5d480..aafa43cf8bdf 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -103,13 +103,13 @@ namespace svt
// drop down the list box
else if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case KEY_PAGEUP:
case KEY_PAGEDOWN:
case KEY_RETURN:
if (rBox.IsInDropDown())
return false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
return true;
}
@@ -184,12 +184,12 @@ namespace svt
else
if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case KEY_PAGEUP:
case KEY_PAGEDOWN:
if (rBox.IsTravelSelect())
return false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
return true;
}
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index f0004b05d190..43d1aad6516e 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -416,7 +416,7 @@ namespace svt
Control::KeyInput(rEvt);
return;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
BrowseBox::KeyInput(rEvt);
}
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 14d4a0b2e5b2..ad4816518f06 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1044,7 +1044,7 @@ FileViewResult SvtFileView::Initialize(
case eStillRunning:
OSL_ENSURE( pAsyncDescriptor, "SvtFileView::Initialize: we told it to read synchronously!" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case eSuccess:
return eResult;
}
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 7d89298a2e6e..a02c8258c6c4 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1202,7 +1202,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
return;
}
nVStep *= mnVisLines;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case KEY_UP:
if (nCurPos != VALUESET_ITEM_NONEITEM)
{
@@ -1239,7 +1239,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
return;
}
nVStep *= mnVisLines;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case KEY_DOWN:
if (nCurPos != nLastItem)
{
@@ -1264,7 +1264,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
Select();
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
Control::KeyInput( rKeyEvent );
return;
@@ -2478,7 +2478,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent )
return CustomWidgetController::KeyInput(rKeyEvent);
}
nVStep *= mnVisLines;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case KEY_UP:
if (nCurPos != VALUESET_ITEM_NONEITEM)
{
@@ -2514,7 +2514,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent )
return CustomWidgetController::KeyInput(rKeyEvent);
}
nVStep *= mnVisLines;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case KEY_DOWN:
if (nCurPos != nLastItem)
{
@@ -2539,7 +2539,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent )
Select();
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
return CustomWidgetController::KeyInput(rKeyEvent);
}
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index ab174dd713a2..1274be0c06ee 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -700,7 +700,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak )
break;
}
// Reduce sequence of CR/LF/BLANK/TAB to a single blank
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '\t':
if( '\t'==nNextCh && bReadPRE && '>'!=cBreak )
{
@@ -708,7 +708,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak )
bContinue = false;
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '\x0b':
if( '\x0b'==nNextCh && (bReadPRE || bReadXMP ||bReadListing) &&
'>'!=cBreak )
@@ -716,7 +716,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak )
break;
}
nNextCh = ' ';
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case ' ':
sTmpBuffer.appendUtf32( nNextCh );
if( '>'!=cBreak && (!bReadListing && !bReadXMP &&
@@ -987,7 +987,7 @@ HtmlTokenId HTMLParser::GetNextRawToken()
}
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
// all remaining characters are appended to the buffer
sTmpBuffer.appendUtf32( nNextCh );
@@ -1355,16 +1355,16 @@ HtmlTokenId HTMLParser::GetNextToken_()
nRet = HtmlTokenId::NEWPARA;
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '\t':
if( bReadPRE )
{
nRet = HtmlTokenId::TABCHAR;
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case ' ':
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
scan_text:
@@ -1605,7 +1605,7 @@ HtmlTokenId HTMLParser::FilterPRE( HtmlTokenId nToken )
// in Netscape they only have impact in not empty paragraphs
case HtmlTokenId::PARABREAK_ON:
nToken = HtmlTokenId::LINEBREAK;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case HtmlTokenId::LINEBREAK:
case HtmlTokenId::NEWPARA:
nPre_LinePos = 0;
@@ -1786,7 +1786,7 @@ HtmlTokenId HTMLParser::FilterXMP( HtmlTokenId nToken )
case HtmlTokenId::NEWPARA:
if( bPre_IgnoreNewPara )
nToken = HtmlTokenId::NONE;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case HtmlTokenId::TEXTTOKEN:
case HtmlTokenId::NONBREAKSPACE:
case HtmlTokenId::SOFTHYPH:
@@ -1827,7 +1827,7 @@ HtmlTokenId HTMLParser::FilterListing( HtmlTokenId nToken )
case HtmlTokenId::NEWPARA:
if( bPre_IgnoreNewPara )
nToken = HtmlTokenId::NONE;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case HtmlTokenId::TEXTTOKEN:
case HtmlTokenId::NONBREAKSPACE:
case HtmlTokenId::SOFTHYPH:
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index bd8568b1194c..c97625d67d58 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -488,7 +488,7 @@ void SvRTFParser::ScanText()
case sal_Unicode(EOF):
eState = SvParserState::Error;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '{':
case '}':
bContinue = false;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index eefe226838d4..9dda651250c9 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2240,7 +2240,7 @@ namespace svt { namespace table
m_aSelectedRows[0] = i_rowIndex;
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SelectionMode::Multiple:
m_aSelectedRows.push_back( i_rowIndex );