summaryrefslogtreecommitdiffstats
path: root/filter
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 /filter
parentcrashtesting: doubly deleted reloadtimer (diff)
downloadcore-ab9b67bbb001f380b3973941443bfbc59fe7141c.tar.gz
core-ab9b67bbb001f380b3973941443bfbc59fe7141c.zip
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 'filter')
-rw-r--r--filter/source/flash/swfwriter1.cxx4
-rw-r--r--filter/source/graphicfilter/idxf/dxfentrd.cxx2
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx72
-rw-r--r--filter/source/graphicfilter/ipbm/ipbm.cxx6
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx6
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/msfilter/svdfppt.cxx12
-rw-r--r--filter/source/msfilter/util.cxx2
-rw-r--r--filter/source/pdf/pdfexport.cxx2
-rw-r--r--filter/source/svg/svgexport.cxx2
10 files changed, 55 insertions, 55 deletions
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 7f51c6ddc9db..44d40c9453df 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1695,7 +1695,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction);
clipRect = pA->GetRect();
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case MetaActionType::CLIPREGION:
case MetaActionType::ISECTREGIONCLIPREGION:
@@ -1708,7 +1708,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
case MetaActionType::MAPMODE:
{
bMap++;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case MetaActionType::REFPOINT:
case MetaActionType::LINECOLOR:
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx
index 0f30ba60f1bc..a830ce0c8fee 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx
@@ -695,7 +695,7 @@ void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR )
case 92:
nCurrentBoundaryPathIndex++;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
{
bool bExecutingGroupCode = false;
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 182c948a8cf0..61c6bde360ec 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -731,11 +731,11 @@ void OS2METReader::SetPen( const Color& rColor, sal_uInt16 nLineWidth, PenStyle
break;
case PEN_DASHDOT :
nDashCount++;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case PEN_DOT :
nDotCount++;
nDashCount--;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case PEN_DASH :
nDashCount++;
aLineInfo.SetDotCount( nDotCount );
@@ -1706,7 +1706,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
case GOrdStkPop: PopAttr(); break;
case GOrdPIvAtr: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSIvAtr: {
sal_uInt8 nA, nP, nFlags, nMix;
Color aCol;
@@ -1781,7 +1781,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPIxCol: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSIxCol: {
sal_uInt8 nFlags;
Color aCol;
@@ -1808,7 +1808,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
case GOrdPColor:
case GOrdPXtCol: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSColor:
case GOrdSXtCol: {
sal_uInt8 nbyte;
@@ -1837,7 +1837,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPBgCol: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSBgCol: {
sal_uInt16 nVal;
Color aCol;
@@ -1860,7 +1860,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPBxCol: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSBxCol: {
sal_uInt8 nFlags;
Color aCol;
@@ -1886,7 +1886,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPMixMd: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSMixMd: {
sal_uInt8 nMix;
pOS2MET->ReadUChar( nMix );
@@ -1904,7 +1904,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPBgMix: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSBgMix: {
sal_uInt8 nMix;
pOS2MET->ReadUChar( nMix );
@@ -1922,12 +1922,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPPtSet: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSPtSet: SAL_INFO("filter.os2met","GOrdSPtSet");
break;
case GOrdPPtSym: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSPtSym: {
sal_uInt8 nPatt;
pOS2MET->ReadUChar( nPatt );
@@ -1936,22 +1936,22 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPPtRef: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSPtRef: SAL_INFO("filter.os2met","GOrdSPtRef");
break;
case GOrdPLnEnd: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSLnEnd:
break;
case GOrdPLnJoi: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSLnJoi:
break;
case GOrdPLnTyp: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSLnTyp: {
sal_uInt8 nType;
pOS2MET->ReadUChar( nType );
@@ -1966,7 +1966,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPLnWdt: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSLnWdt: {
sal_uInt8 nbyte;
pOS2MET->ReadUChar( nbyte );
@@ -1975,12 +1975,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPFrLWd: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSFrLWd:
break;
case GOrdPStLWd: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSStLWd :
{
sal_uInt8 nFlags;
@@ -1999,24 +1999,24 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPChDir: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSChDir:
break;
case GOrdPChPrc: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSChPrc:
break;
case GOrdPChSet: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSChSet: {
sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte );
aAttr.nChrSet=static_cast<sal_uInt32>(nbyte)&0xff;
break;
}
case GOrdPChAng: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSChAng: {
sal_Int32 nX = ReadCoord(bCoord32);
sal_Int32 nY = ReadCoord(bCoord32);
@@ -2029,12 +2029,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPChBrx: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSChBrx:
break;
case GOrdPChCel: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSChCel: {
sal_uInt8 nbyte;
sal_uInt16 nLen=nOrderLen;
@@ -2056,22 +2056,22 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPChXtr: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSChXtr:
break;
case GOrdPChShr: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSChShr:
break;
case GOrdPTxAlg: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSTxAlg: SAL_INFO("filter.os2met","GOrdSTxAlg");
break;
case GOrdPMkPrc: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSMkPrc: {
sal_uInt8 nbyte;
pOS2MET->ReadUChar( nbyte );
@@ -2081,7 +2081,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPMkSet: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSMkSet: {
sal_uInt8 nbyte;
pOS2MET->ReadUChar( nbyte );
@@ -2091,7 +2091,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPMkSym: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSMkSym: {
sal_uInt8 nbyte;
pOS2MET->ReadUChar( nbyte );
@@ -2101,7 +2101,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPMkCel: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSMkCel: {
sal_uInt8 nbyte;
sal_uInt16 nLen=nOrderLen;
@@ -2117,7 +2117,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPArcPa: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSArcPa:
aAttr.nArcP=ReadCoord(bCoord32);
aAttr.nArcQ=ReadCoord(bCoord32);
@@ -2126,18 +2126,18 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
case GOrdPCrPos: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSCrPos:
aAttr.aCurPos=ReadPoint();
break;
case GOrdPMdTrn: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSMdTrn: SAL_INFO("filter.os2met","GOrdSMdTrn");
break;
case GOrdPPkIdn: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSPkIdn: SAL_INFO("filter.os2met","GOrdSPkIdn");
break;
@@ -2145,7 +2145,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
case GOrdPVwWin: PushAttr(nOrderID);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GOrdSVwWin: SAL_INFO("filter.os2met","GOrdSVwWin");
break;
default: SAL_INFO("filter.os2met","Unknown order: " << nOrderID);
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 00d641aebb9b..f192c847ab5e 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -147,7 +147,7 @@ bool PBMReader::ImplReadHeader()
{
case '1' :
mbRaw = false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '4' :
mnMode = 0;
nMax = 2; // number of parameters in Header
@@ -155,14 +155,14 @@ bool PBMReader::ImplReadHeader()
break;
case '2' :
mbRaw = false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '5' :
mnMode = 1;
nMax = 3;
break;
case '3' :
mbRaw = false;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case '6' :
mnMode = 2;
nMax = 3;
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 6decd58d4cb4..44a765fe569d 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -181,7 +181,7 @@ bool PSDReader::ImplReadHeader()
{
case 5 :
mbTransparent = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 4 :
mnDestBitDepth = 24;
break;
@@ -198,7 +198,7 @@ bool PSDReader::ImplReadHeader()
break;
case 4 :
mbTransparent = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 3 :
mnDestBitDepth = 24;
break;
@@ -227,7 +227,7 @@ bool PSDReader::ImplReadHeader()
case PSD_DUOTONE : // we'll handle the duotone color like a normal grayscale picture
m_rPSD.SeekRel( nColorLength );
nColorLength = 0;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case PSD_GRAYSCALE :
{
if ( nColorLength )
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index f3dc9d2b697b..9cf10f14acbf 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1085,7 +1085,7 @@ void EscherPropertyContainer::CreateLineProperties(
AddOpt( ESCHER_Prop_lineDashing, eDash );
}
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case drawing::LineStyle_SOLID :
default:
{
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 42807c8585bc..99430c9abc0f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -774,11 +774,11 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
switch ( aPlaceholderAtom.nPlaceholderId )
{
case PptPlaceholder::MASTERSLIDENUMBER : nHeaderFooterInstance++;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case PptPlaceholder::MASTERFOOTER : nHeaderFooterInstance++;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case PptPlaceholder::MASTERHEADER : nHeaderFooterInstance++;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case PptPlaceholder::MASTERDATE : nHeaderFooterInstance++; break;
default: break;
@@ -6426,13 +6426,13 @@ void PPTFieldEntry::GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateForm
break;
case 7:
eDateFormat = SvxDateFormat::A;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 9:
eTimeFormat = SvxTimeFormat::HH24_MM;
break;
case 8:
eDateFormat = SvxDateFormat::A;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 11:
eTimeFormat = SvxTimeFormat::HH12_MM;
break;
@@ -6539,7 +6539,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
{
case PPT_NOTEPAGE :
nInstance++;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case PPT_MASTERPAGE :
nInstance++;
break;
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index cab2424a2083..0b7b1bcc5c3c 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -469,7 +469,7 @@ static EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam)
break;
}
(void)rReadParam.SkipToNextToken();
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case -2:
{
if ( rReadParam.GetResult().startsWithIgnoreAsciiCase("(") )
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 2f788b9b3539..ff5141792526 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -674,7 +674,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
default:
case 2:
aContext.Encryption.CanPrintFull = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 1:
aContext.Encryption.CanPrintTheDocument = true;
break;
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index d54de1a52b17..babf682a024f 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2246,7 +2246,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
aDate.SetDay( i );
sDate.append( SvxDateField::GetFormatted( aDate, eDateFormat, *pNumberFormatter, eLang ) );
}
- SAL_FALLTHROUGH; // We need months too!
+ [[fallthrough]]; // We need months too!
case SvxDateFormat::C: // 13.Feb 1996
case SvxDateFormat::D: // 13.February 1996
for( sal_uInt16 i = 1; i <= 12; ++i ) // we get all months in a year