Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace magic constant use of Escher Blip End type ID with reference 

Instead of referring to the magic constant 0xF117, reference the value in the EscherRecordTypes enum.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1886988 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Marius Volkhart 2021-02-27 18:33:56 +00:00
parent b9bbac0005
commit 66e08f08d3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
View File

@ -381,7 +381,8 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
// When parsing the BStoreDelay stream, [MS-ODRAW] says that we
// should terminate if the type isn't 0xf007 or 0xf018->0xf117
if (!((type == EscherRecordTypes.BSE.typeID) || (type >= EscherRecordTypes.BLIP_START.typeID && type <= 0xf117))) {
if (!((type == EscherRecordTypes.BSE.typeID) ||
(type >= EscherRecordTypes.BLIP_START.typeID && type <= EscherRecordTypes.BLIP_END.typeID))) {
break;
}

2
src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
View File

@ -74,7 +74,7 @@ public class PICFAndOfficeArtData
dataStream, offset );
if ( nextRecord.getRecordId() != EscherRecordTypes.BSE.typeID
&& ( nextRecord.getRecordId() < EscherRecordTypes.BLIP_START.typeID || nextRecord
.getRecordId() > (short) 0xF117 ) )
.getRecordId() > EscherRecordTypes.BLIP_END.typeID ) )
break;
int blipRecordSize = nextRecord.fillFields( dataStream, offset,