diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-15 13:25:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-15 13:28:18 +0100 |
| commit | e11afdff0199cb212401f9424ac40cd69784cfdc (patch) | |
| tree | 35f532de024aff3b6a10d458e92d0564c43b4a52 /filter | |
| parent | 49cdc1da7660328d64a964fbc26611bf8ce158aa (diff) | |
coverity#1361575 Logically dead code
commit 6312dfdc16f7da09f48628f51bb20b09dc5b7001
Date: Wed May 11 20:11:18 2016 +0200
convert TSS_TYPE to scoped enum
changed
- if ( ( nInstance < PPT_STYLESHEETENTRYS ) &&
to
+ if ( ( nInstance < TSS_Type::LAST ) &&
but PPT_STYLESHEETENTRYS is 9 and TSS_Type::LAST is 8
Change-Id: I08fb0ad04332cd17e1bdc724799f2927a77359a7
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index ecfacfc99f0a..1a2c0191fe4d 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -4128,7 +4128,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd while ( ( aTxMasterStyleHd.nRecType == PPT_PST_TxMasterStyleAtom ) && ( rIn.Tell() < nEndRecPos ) ) //TODO: aTxMasterStyleHd may be used without having been properly initialized { TSS_Type nInstance = (TSS_Type)aTxMasterStyleHd.nRecInstance; - if ( ( nInstance < TSS_Type::LAST ) && + if ( ( nInstance <= TSS_Type::LAST ) && ( ( nInstance != TSS_Type::TextInShape ) || !bFoundTxMasterStyleAtom04 ) ) { if ( nInstance > TSS_Type::TextInShape ) |