summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx4
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx2
-rw-r--r--svtools/source/control/valueset.cxx6
-rw-r--r--svtools/source/graphic/grfcache.cxx66
-rw-r--r--svtools/source/graphic/grfmgr2.cxx92
-rw-r--r--svtools/source/svhtml/parhtml.cxx16
-rw-r--r--svtools/source/svrtf/parrtf.cxx5
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx2
8 files changed, 97 insertions, 96 deletions
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 1f7a413b8e2f..cfd1d4798d7f 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -103,7 +103,7 @@ namespace svt
// drop down the list box
else if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
- // fall-through
+ SAL_FALLTHROUGH;
case KEY_PAGEUP:
case KEY_PAGEDOWN:
case KEY_RETURN:
@@ -183,7 +183,7 @@ namespace svt
else
if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
- // fall-through
+ SAL_FALLTHROUGH;
case KEY_PAGEUP:
case KEY_PAGEDOWN:
if (rBox.IsTravelSelect())
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 2132d8099fc5..e27f192f657a 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -469,7 +469,7 @@ namespace svt
Control::KeyInput(rEvt);
return;
}
- // fall-through
+ SAL_FALLTHROUGH;
default:
BrowseBox::KeyInput(rEvt);
}
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index f827dbfa2264..b2f58c2b0832 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1336,7 +1336,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
return;
}
nVStep *= mnVisLines;
- // intentional fall-through
+ SAL_FALLTHROUGH;
case KEY_UP:
if (nCurPos != VALUESET_ITEM_NONEITEM)
{
@@ -1373,7 +1373,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
return;
}
nVStep *= mnVisLines;
- // intentional fall-through
+ SAL_FALLTHROUGH;
case KEY_DOWN:
if (nCurPos != nLastItem)
{
@@ -1398,7 +1398,7 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent )
Select();
break;
}
- // intentional fall-through
+ SAL_FALLTHROUGH;
default:
Control::KeyInput( rKeyEvent );
return;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 10432aff3e6e..18e75d58916a 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -670,79 +670,79 @@ bool GraphicDisplayCacheEntry::IsCacheableAsBitmap( const GDIMetaFile& rMtf,
case MetaActionType::RASTEROP:
if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == ROP_OVERPAINT )
break;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIXEL:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::RECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ROUNDRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ELLIPSE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ARC:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::CHORD:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYPOLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTARRAY:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::STRETCHTEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASK:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALEPART:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::HATCH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::WALLPAPER:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::Transparent:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::EPS:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FLOATTRANSPARENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENTEX:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes that _do_ affect bitmap
// output
case MetaActionType::CLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTRECTCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTREGIONCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MOVECLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MAPMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::REFPOINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
default:
bNonBitmapActionEncountered = true;
break;
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index dca98660e3bb..145f0facf373 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1144,35 +1144,35 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
aFont.SetAverageFontWidth( aFontMetric.GetAverageFontWidth() );
pModAct = new MetaFontAction( aFont );
}
+ SAL_FALLTHROUGH;
}
- // FALLTHROUGH intended
case MetaActionType::NONE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes (which don't affect bitmap
// output)
case MetaActionType::LINECOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FILLCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTFILLCOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTALIGN:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLINECOLOR:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PUSH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POP:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LAYOUTMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTLANGUAGE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::COMMENT:
break;
@@ -1289,79 +1289,79 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
case MetaActionType::RASTEROP:
if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == ROP_OVERPAINT )
break;
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIXEL:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::LINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::RECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ROUNDRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ELLIPSE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ARC:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::PIE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::CHORD:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYLINE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::POLYPOLYGON:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTARRAY:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::STRETCHTEXT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::TEXTRECT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASK:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MASKSCALEPART:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::HATCH:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::WALLPAPER:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::Transparent:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::EPS:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::FLOATTRANSPARENT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::GRADIENTEX:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
// OutDev state changes that _do_ affect bitmap
// output
case MetaActionType::CLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTRECTCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::ISECTREGIONCLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MOVECLIPREGION:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::MAPMODE:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
case MetaActionType::REFPOINT:
- // FALLTHROUGH intended
+ SAL_FALLTHROUGH;
default:
bNonBitmapActionEncountered = true;
break;
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index e227dce6f1f4..d27cc0e992d6 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -703,7 +703,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
break;
}
// Reduce sequence of CR/LF/BLANK/TAB to a single blank
- // no break!!
+ SAL_FALLTHROUGH;
case '\t':
if( '\t'==nNextCh && bReadPRE && '>'!=cBreak )
{
@@ -711,7 +711,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
bContinue = false;
break;
}
- // no break
+ SAL_FALLTHROUGH;
case '\x0b':
if( '\x0b'==nNextCh && (bReadPRE || bReadXMP ||bReadListing) &&
'>'!=cBreak )
@@ -719,7 +719,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
break;
}
nNextCh = ' ';
- // no break;
+ SAL_FALLTHROUGH;
case ' ':
sTmpBuffer.appendUtf32( nNextCh );
if( '>'!=cBreak && (!bReadListing && !bReadXMP &&
@@ -981,7 +981,7 @@ int HTMLParser::GetNextRawToken()
}
break;
}
- // no break
+ SAL_FALLTHROUGH;
default:
// all remaining characters are appended to the buffer
sTmpBuffer.appendUtf32( nNextCh );
@@ -1328,16 +1328,16 @@ int HTMLParser::GetNextToken_()
nRet = HTML_NEWPARA;
break;
}
- // no break !
+ SAL_FALLTHROUGH;
case '\t':
if( bReadPRE )
{
nRet = HTML_TABCHAR;
break;
}
- // no break !
+ SAL_FALLTHROUGH;
case ' ':
- // no break !
+ SAL_FALLTHROUGH;
default:
scan_text:
@@ -1579,7 +1579,7 @@ int HTMLParser::FilterPRE( int nToken )
// in Netscape they only have impact in not empty paragraphs
case HTML_PARABREAK_ON:
nToken = HTML_LINEBREAK;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_LINEBREAK:
case HTML_NEWPARA:
nPre_LinePos = 0;
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 26461f600137..7edaafa4481c 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -467,8 +467,9 @@ void SvRTFParser::ScanText()
}
break;
- case sal_Unicode(EOF): eState = SVPAR_ERROR;
- // continue
+ case sal_Unicode(EOF):
+ eState = SVPAR_ERROR;
+ SAL_FALLTHROUGH;
case '{':
case '}':
bContinue = false;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 46049a417e92..f2efd758fa49 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2272,7 +2272,7 @@ namespace svt { namespace table
m_aSelectedRows[0] = i_rowIndex;
break;
}
- // fall through
+ SAL_FALLTHROUGH;
case MULTIPLE_SELECTION:
m_aSelectedRows.push_back( i_rowIndex );
generated by cgit (git 2.34.1) at 2025-02-15 12:08:09 +0000