moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

add getOverallRange() method definition to HWPFDocumentCore

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1143709 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-07-07 08:35:51 +00:00
parent 25f3636438
commit 0de832ba9d
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
View File

@ -284,11 +284,6 @@ public final class HWPFDocument extends HWPFDocumentCore
return _dop;
}
/**
* Returns the range that covers all text in the
* file, including main text, footnotes, headers
* and comments
*/
public Range getOverallRange() {
// hack to get the ending cp of the document, Have to revisit this.
PropertyNode p = _tpt.getTextPieces().get(_tpt.getTextPieces().size() - 1);

10
src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java
View File

@ -150,11 +150,17 @@ public abstract class HWPFDocumentCore extends POIDocument
}
/**
* Returns the range which covers the whole of the
* document, but excludes any headers and footers.
* Returns the range which covers the whole of the document, but excludes
* any headers and footers.
*/
public abstract Range getRange();
/**
* Returns the range that covers all text in the file, including main text,
* footnotes, headers and comments
*/
public abstract Range getOverallRange();
public abstract TextPieceTable getTextTable();
public CHPBinTable getCharacterTable()

12
src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
View File

@ -110,11 +110,15 @@ public class HWPFOldDocument extends HWPFDocumentCore {
);
}
public Range getRange() {
public Range getOverallRange()
{
// Life is easy when we have no footers, headers or unicode!
return new Range(
0, _fib.getFcMac() - _fib.getFcMin(), this
);
return new Range( 0, _fib.getFcMac() - _fib.getFcMin(), this );
}
public Range getRange()
{
return getOverallRange();
}
public TextPieceTable getTextTable()

3
src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
View File

@ -901,8 +901,7 @@ public class Range { // TODO -instantiable superclass
}
}
final Range overallrange = getDocument() instanceof HWPFDocument ? ((HWPFDocument) getDocument())
.getOverallRange() : getDocument().getRange();
final Range overallrange = getDocument().getOverallRange();
int limit = _paragraphs.size();
for ( ; tableEndInclusive < limit - 1; tableEndInclusive++ )
{