diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-03-06 14:48:24 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-03-06 15:08:39 +0100 |
| commit | ca3700c42238e71684ec1d5f5eacaea4b1ca3b30 (patch) | |
| tree | ce7ae58631e16fbc58345f83c89a93bd4b91279e /filter | |
| parent | 8da61f23384c7f3f2850a6362765506e4e078862 (diff) | |
v612: obfuscated if/goto
Change-Id: Ia12b325e41238b9e12e2f388273bd01b96d61c08
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d7d9cf1db313..6f0fb8645966 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3178,11 +3178,10 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const DffRecordHeader aContentDataHd; const DffRecordHeader* pListHd = rMan.aDocRecManager.GetRecordHeader( PPT_PST_List, SEEK_FROM_BEGINNING ); - while( pListHd ) - { + if( pListHd ) pListHd->SeekToContent( rSt ); - if ( !rMan.SeekToContentOfProgTag( 9, rSt, *pListHd, aContentDataHd ) ) - break; + if ( pListHd && rMan.SeekToContentOfProgTag( 9, rSt, *pListHd, aContentDataHd ) ) + { while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aContentDataHd.GetRecEndFilePos() ) ) { ReadDffRecordHeader( rSt, aHd ); @@ -3257,13 +3256,10 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const } aHd.SeekToEndOfRecord( rSt ); } - break; } - while( pHd ) + if ( pHd && rMan.SeekToContentOfProgTag( 9, rSt, *pHd, aContentDataHd ) ) { // get the extended paragraph styles on mainmaster ( graphical bullets, num ruling ... ) - if ( !rMan.SeekToContentOfProgTag( 9, rSt, *pHd, aContentDataHd ) ) - break; while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aContentDataHd.GetRecEndFilePos() ) ) { ReadDffRecordHeader( rSt, aHd ); @@ -3308,7 +3304,6 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const } aHd.SeekToEndOfRecord( rSt ); } - break; } rSt.Seek( nOldPos ); } |