diff options
Diffstat (limited to 'filter/source/msfilter/msdffimp.cxx')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 404dd3aff6bc..91b36b230129 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -29,7 +29,6 @@ #include <o3tl/safeint.hxx> #include <osl/file.hxx> #include <tools/solar.h> -#include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <rtl/math.hxx> @@ -4183,11 +4182,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r if( maShapeRecords.SeekToContent( rSt, DFF_msofbtUDefProp ) ) { - sal_uInt32 nBytesLeft = maShapeRecords.Current()->nRecLen; + sal_uInt32 nBytesLeft = maShapeRecords.Current()->nRecLen; while( 5 < nBytesLeft ) { - if (rSt.remainingSize() < 6) - break; sal_uInt16 nPID(0); rSt.ReadUInt16(nPID); if (!rSt.good()) @@ -4201,11 +4198,11 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r mbRotateGranientFillWithAngle = nUDData & 0x20; break; } - nBytesLeft -= 6; + nBytesLeft -= 6; } } aObjData.bShapeType = maShapeRecords.SeekToContent( rSt, DFF_msofbtSp ); - if (aObjData.bShapeType && rSt.remainingSize() >= 8) + if ( aObjData.bShapeType ) { sal_uInt32 temp; rSt.ReadUInt32( aObjData.nShapeId ) @@ -4249,7 +4246,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r } aObjData.bChildAnchor = maShapeRecords.SeekToContent( rSt, DFF_msofbtChildAnchor, SEEK_FROM_CURRENT_AND_RESTART ); - if (aObjData.bChildAnchor && rSt.remainingSize() >= 16) + if ( aObjData.bChildAnchor ) { sal_Int32 l(0), o(0), r(0), u(0); rSt.ReadInt32( l ).ReadInt32( o ).ReadInt32( r ).ReadInt32( u ); @@ -5706,14 +5703,7 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, SetDefaultPropSet( rStCtrl, nOffsDgg ); // read control stream, if successful set nBLIPCount - try - { - GetCtrlData( nOffsDgg ); - } - catch(SvStreamEOFException&) - { - TOOLS_WARN_EXCEPTION("filter.ms", ""); - } + GetCtrlData( nOffsDgg ); // check Text-Box-Story-Chain-Infos CheckTxBxStoryChain(); |