diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-08-28 15:33:44 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2015-08-29 08:37:53 +0000 |
commit | 15af8289d6fda5fe2c722faaf4f4e2371912133e (patch) | |
tree | 407e02231ca820cc7808de70fb42e314ea8a3b40 | |
parent | 4b9ff37a4b4bf2e97ff80146a8c4f42b2f55955b (diff) |
eof isn't a Error, so use good not GetError
Change-Id: Ie1df87c7eb9d391d0fa4a579f744051a1f1b2ae1
(cherry picked from commit 078235028a8c4ea36b6b366348016e19759c456a)
Reviewed-on: https://gerrit.libreoffice.org/18118
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 28 | ||||
-rw-r--r-- | sd/qa/unit/data/ppt/pass/hang-19.ppt | bin | 0 -> 7680 bytes |
2 files changed, 14 insertions, 14 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 47a89e01d6c8..bab72e3149d8 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4147,17 +4147,17 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r SEEK_FROM_BEGINNING ) ) { sal_uInt32 nBytesLeft = maShapeRecords.Current()->nRecLen; - sal_uInt32 nUDData; - sal_uInt16 nPID; while( 5 < nBytesLeft ) { - rSt.ReadUInt16( nPID ); - if ( rSt.GetError() != 0 ) + sal_uInt16 nPID(0); + rSt.ReadUInt16(nPID); + if (!rSt.good()) break; - rSt.ReadUInt32( nUDData ); - if ( rSt.GetError() != 0 ) + sal_uInt32 nUDData(0); + rSt.ReadUInt32(nUDData); + if (!rSt.good()) break; - if ( nPID == 447 ) + if (nPID == 447) { mbRotateGranientFillWithAngle = nUDData & 0x20; break; @@ -4979,15 +4979,15 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, && maShapeRecords.Current()->nRecLen ) { sal_uInt32 nBytesLeft = maShapeRecords.Current()->nRecLen; - sal_uInt32 nUDData; - sal_uInt16 nPID; while( 5 < nBytesLeft ) { - rSt.ReadUInt16( nPID ); - if ( rSt.GetError() != 0 ) + sal_uInt16 nPID(0); + rSt.ReadUInt16(nPID); + if (!rSt.good()) break; - rSt.ReadUInt32( nUDData ); - switch( nPID ) + sal_uInt32 nUDData(0); + rSt.ReadUInt32(nUDData); + switch (nPID) { case 0x038F: pImpRec->nXAlign = nUDData; break; case 0x0390: @@ -5017,7 +5017,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, pImpRec->isHorizontalRule = true; break; } - if ( rSt.GetError() != 0 ) + if (!rSt.good()) break; nBytesLeft -= 6; } diff --git a/sd/qa/unit/data/ppt/pass/hang-19.ppt b/sd/qa/unit/data/ppt/pass/hang-19.ppt Binary files differnew file mode 100644 index 000000000000..942a58a66c5d --- /dev/null +++ b/sd/qa/unit/data/ppt/pass/hang-19.ppt |