summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 17:07:11 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 17:07:11 +0200
commitd3ad80f08e4821eb0ac6999c3812384e8bfeb757 (patch)
tree3c65f2f5b3c17ba1b0fd89f99257d0c461b9574f /filter
parentad5323b2aae7a69e58629717fb71618ffb727e8d (diff)
Add SAL_FALLTHROUGH, where apparently appropriate
Change-Id: I6df171debbf4940bf27898c3ff5d8597f437897f
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx34
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx2
-rw-r--r--filter/source/pdf/pdfexport.cxx1
3 files changed, 37 insertions, 0 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index f481f5ed272a..253a5c8144ba 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -1673,6 +1673,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
case GOrdStkPop: PopAttr(); break;
case GOrdPIvAtr: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSIvAtr: {
sal_uInt8 nA, nP, nFlags, nMix;
sal_uLong nVal;
@@ -1748,6 +1749,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPIxCol: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSIxCol: {
sal_uInt8 nFlags;
sal_uLong nVal;
@@ -1775,6 +1777,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
case GOrdPColor:
case GOrdPXtCol: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSColor:
case GOrdSXtCol: {
sal_uInt8 nbyte;
@@ -1803,6 +1806,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPBgCol: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSBgCol: {
sal_uInt16 nVal;
Color aCol;
@@ -1825,6 +1829,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPBxCol: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSBxCol: {
sal_uInt8 nFlags;
sal_uLong nVal;
@@ -1851,6 +1856,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPMixMd: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSMixMd: {
sal_uInt8 nMix;
pOS2MET->ReadUChar( nMix );
@@ -1868,6 +1874,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPBgMix: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSBgMix: {
sal_uInt8 nMix;
pOS2MET->ReadUChar( nMix );
@@ -1885,10 +1892,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPPtSet: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSPtSet: SAL_INFO("filter.os2met","GOrdSPtSet");
break;
case GOrdPPtSym: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSPtSym: {
sal_uInt8 nPatt;
pOS2MET->ReadUChar( nPatt );
@@ -1897,18 +1906,22 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPPtRef: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSPtRef: SAL_INFO("filter.os2met","GOrdSPtRef");
break;
case GOrdPLnEnd: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSLnEnd:
break;
case GOrdPLnJoi: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSLnJoi:
break;
case GOrdPLnTyp: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSLnTyp: {
sal_uInt8 nType;
pOS2MET->ReadUChar( nType );
@@ -1923,6 +1936,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPLnWdt: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSLnWdt: {
sal_uInt8 nbyte;
pOS2MET->ReadUChar( nbyte );
@@ -1931,10 +1945,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPFrLWd: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSFrLWd:
break;
case GOrdPStLWd: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSStLWd :
{
sal_uInt8 nFlags;
@@ -1953,20 +1969,24 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPChDir: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSChDir:
break;
case GOrdPChPrc: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSChPrc:
break;
case GOrdPChSet: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSChSet: {
sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte );
aAttr.nChrSet=((sal_uLong)nbyte)&0xff;
break;
}
case GOrdPChAng: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSChAng: {
long nX,nY;
nX=ReadCoord(bCoord32); nY=ReadCoord(bCoord32);
@@ -1979,10 +1999,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPChBrx: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSChBrx:
break;
case GOrdPChCel: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSChCel: {
sal_uInt8 nbyte;
sal_uInt16 nLen=nOrderLen;
@@ -2000,18 +2022,22 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPChXtr: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSChXtr:
break;
case GOrdPChShr: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSChShr:
break;
case GOrdPTxAlg: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSTxAlg: SAL_INFO("filter.os2met","GOrdSTxAlg");
break;
case GOrdPMkPrc: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSMkPrc: {
sal_uInt8 nbyte;
pOS2MET->ReadUChar( nbyte );
@@ -2021,6 +2047,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPMkSet: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSMkSet: {
sal_uInt8 nbyte;
pOS2MET->ReadUChar( nbyte );
@@ -2030,6 +2057,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPMkSym: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSMkSym: {
sal_uInt8 nbyte;
pOS2MET->ReadUChar( nbyte );
@@ -2039,6 +2067,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPMkCel: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSMkCel: {
sal_uInt8 nbyte;
sal_uInt16 nLen=nOrderLen;
@@ -2054,6 +2083,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPArcPa: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSArcPa:
aAttr.nArcP=ReadCoord(bCoord32);
aAttr.nArcQ=ReadCoord(bCoord32);
@@ -2062,15 +2092,18 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
case GOrdPCrPos: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSCrPos:
aAttr.aCurPos=ReadPoint();
break;
case GOrdPMdTrn: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSMdTrn: SAL_INFO("filter.os2met","GOrdSMdTrn");
break;
case GOrdPPkIdn: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSPkIdn: SAL_INFO("filter.os2met","GOrdSPkIdn");
break;
@@ -2078,6 +2111,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
case GOrdPVwWin: PushAttr(nOrderID);
+ SAL_FALLTHROUGH;
case GOrdSVwWin: SAL_INFO("filter.os2met","GOrdSVwWin");
break;
default: SAL_INFO("filter.os2met","Unknown order: " << nOrderID);
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 3dcc60359387..5b68a175844a 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -198,6 +198,7 @@ bool PSDReader::ImplReadHeader()
{
case 5 :
mbTransparent = true;
+ SAL_FALLTHROUGH;
case 4 :
mnDestBitDepth = 24;
break;
@@ -214,6 +215,7 @@ bool PSDReader::ImplReadHeader()
break;
case 4 :
mbTransparent = true;
+ SAL_FALLTHROUGH;
case 3 :
mnDestBitDepth = 24;
break;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index b19129f80e87..68e8624173ef 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -677,6 +677,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
default:
case 2:
aContext.Encryption.CanPrintFull = true;
+ SAL_FALLTHROUGH;
case 1:
aContext.Encryption.CanPrintTheDocument = true;
break;