summaryrefslogtreecommitdiff
path: root/filter/source/graphicfilter
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/source/graphicfilter
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 'filter/source/graphicfilter')
-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
4 files changed, 43 insertions, 43 deletions
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 )