more WARNs in log
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1144852 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6b96874866
commit
b3c475a8df
@ -21,6 +21,8 @@ import java.util.Collections;
|
|||||||
|
|
||||||
import org.apache.poi.poifs.common.POIFSConstants;
|
import org.apache.poi.poifs.common.POIFSConstants;
|
||||||
import org.apache.poi.util.LittleEndian;
|
import org.apache.poi.util.LittleEndian;
|
||||||
|
import org.apache.poi.util.POILogFactory;
|
||||||
|
import org.apache.poi.util.POILogger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class holds all of the character formatting
|
* This class holds all of the character formatting
|
||||||
@ -32,6 +34,9 @@ import org.apache.poi.util.LittleEndian;
|
|||||||
*/
|
*/
|
||||||
public final class OldCHPBinTable extends CHPBinTable
|
public final class OldCHPBinTable extends CHPBinTable
|
||||||
{
|
{
|
||||||
|
private static final POILogger logger = POILogFactory
|
||||||
|
.getLogger( OldCHPBinTable.class );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor used to read an old-style binTable
|
* Constructor used to read an old-style binTable
|
||||||
* in from a Word document.
|
* in from a Word document.
|
||||||
@ -62,8 +67,14 @@ public final class OldCHPBinTable extends CHPBinTable
|
|||||||
for (int y = 0; y < fkpSize; y++)
|
for (int y = 0; y < fkpSize; y++)
|
||||||
{
|
{
|
||||||
CHPX chpx = cfkp.getCHPX(y);
|
CHPX chpx = cfkp.getCHPX(y);
|
||||||
if (chpx != null && tpt.isIndexInTable( chpx.getStartBytes(), chpx.getEndBytes() ))
|
if (chpx != null && tpt.isIndexInTable( chpx.getStartBytes(), chpx.getEndBytes() )) {
|
||||||
_textRuns.add(chpx);
|
_textRuns.add(chpx);
|
||||||
|
} else {
|
||||||
|
logger.log( POILogger.WARN, "CHPX [",
|
||||||
|
chpx.getStartBytes(), "; ", chpx.getEndBytes(),
|
||||||
|
") (bytes) doesn't have corresponding text pieces "
|
||||||
|
+ "and will be skipped" );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Collections.sort( _textRuns, PropertyNode.StartComparator.instance );
|
Collections.sort( _textRuns, PropertyNode.StartComparator.instance );
|
||||||
|
@ -21,6 +21,8 @@ import java.util.Collections;
|
|||||||
|
|
||||||
import org.apache.poi.poifs.common.POIFSConstants;
|
import org.apache.poi.poifs.common.POIFSConstants;
|
||||||
import org.apache.poi.util.LittleEndian;
|
import org.apache.poi.util.LittleEndian;
|
||||||
|
import org.apache.poi.util.POILogFactory;
|
||||||
|
import org.apache.poi.util.POILogger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class holds all of the paragraph formatting
|
* This class holds all of the paragraph formatting
|
||||||
@ -32,6 +34,9 @@ import org.apache.poi.util.LittleEndian;
|
|||||||
*/
|
*/
|
||||||
public final class OldPAPBinTable extends PAPBinTable
|
public final class OldPAPBinTable extends PAPBinTable
|
||||||
{
|
{
|
||||||
|
private static final POILogger logger = POILogFactory
|
||||||
|
.getLogger( OldPAPBinTable.class );
|
||||||
|
|
||||||
public OldPAPBinTable(byte[] documentStream, int offset,
|
public OldPAPBinTable(byte[] documentStream, int offset,
|
||||||
int size, int fcMin, TextPieceTable tpt)
|
int size, int fcMin, TextPieceTable tpt)
|
||||||
{
|
{
|
||||||
@ -53,8 +58,14 @@ public final class OldPAPBinTable extends PAPBinTable
|
|||||||
for (int y = 0; y < fkpSize; y++)
|
for (int y = 0; y < fkpSize; y++)
|
||||||
{
|
{
|
||||||
PAPX papx = pfkp.getPAPX(y);
|
PAPX papx = pfkp.getPAPX(y);
|
||||||
if (papx != null && tpt.isIndexInTable( papx.getStartBytes(), papx.getEndBytes() ))
|
if (papx != null && tpt.isIndexInTable( papx.getStartBytes(), papx.getEndBytes() )) {
|
||||||
_paragraphs.add(papx);
|
_paragraphs.add(papx);
|
||||||
|
} else {
|
||||||
|
logger.log( POILogger.WARN, "PAPX [", papx.getStartBytes(),
|
||||||
|
"; ", papx.getEndBytes(),
|
||||||
|
") (bytes) doesn't have corresponding text pieces "
|
||||||
|
+ "and will be skipped" );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Collections.sort( _paragraphs, PropertyNode.StartComparator.instance );
|
Collections.sort( _paragraphs, PropertyNode.StartComparator.instance );
|
||||||
|
@ -20,6 +20,8 @@ package org.apache.poi.hwpf.model;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import org.apache.poi.util.LittleEndian;
|
import org.apache.poi.util.LittleEndian;
|
||||||
|
import org.apache.poi.util.POILogFactory;
|
||||||
|
import org.apache.poi.util.POILogger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class holds all of the section formatting
|
* This class holds all of the section formatting
|
||||||
@ -31,6 +33,9 @@ import org.apache.poi.util.LittleEndian;
|
|||||||
*/
|
*/
|
||||||
public final class OldSectionTable extends SectionTable
|
public final class OldSectionTable extends SectionTable
|
||||||
{
|
{
|
||||||
|
private static final POILogger logger = POILogFactory
|
||||||
|
.getLogger( OldSectionTable.class );
|
||||||
|
|
||||||
public OldSectionTable(byte[] documentStream, int offset,
|
public OldSectionTable(byte[] documentStream, int offset,
|
||||||
int size, int fcMin,
|
int size, int fcMin,
|
||||||
TextPieceTable tpt)
|
TextPieceTable tpt)
|
||||||
@ -70,8 +75,17 @@ public final class OldSectionTable extends SectionTable
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ( tpt.isIndexInTable( sepx.getStartBytes(), sepx.getEndBytes() ) )
|
if ( tpt.isIndexInTable( sepx.getStartBytes(), sepx.getEndBytes() ) )
|
||||||
|
{
|
||||||
_sections.add( sepx );
|
_sections.add( sepx );
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.log( POILogger.WARN, "Section [", sepx.getStartBytes(),
|
||||||
|
"; ", sepx.getEndBytes(),
|
||||||
|
") (bytes) doesn't have corresponding text pieces "
|
||||||
|
+ "and will be skipped" );
|
||||||
|
}
|
||||||
|
}
|
||||||
Collections.sort( _sections, PropertyNode.StartComparator.instance );
|
Collections.sort( _sections, PropertyNode.StartComparator.instance );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user