[Libreoffice-commits] core.git: filter/source
Caolán McNamara
caolanm at redhat.com
Sun May 15 12:35:25 UTC 2016
filter/source/msfilter/svdfppt.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e11afdff0199cb212401f9424ac40cd69784cfdc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun May 15 13:25:42 2016 +0100
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
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index ecfacfc..1a2c019 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 )
More information about the Libreoffice-commits
mailing list