add content of main text box to document text

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1143769 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
index db9dcde34f37baca8d98b23fa8ed204f3bfa6f90..847a15abc0c42dda6e7172543c74afaa9416acc0 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
@@ -363,6 +363,17 @@ public final class HWPFDocument extends HWPFDocumentCore
       );
   }
 
+  /**
+   * Returns the range which covers all the Endnotes.
+  */
+  public Range getMainTextboxRange() {
+          return new Range(
+                          _cpSplit.getMainTextboxStart(),
+                          _cpSplit.getMainTextboxEnd(),
+                          this
+      );
+  }
+
   /**
    * Returns the range which covers all "Header Stories".
    * A header story contains a header, footer, end note

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java b/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
index 1c6ed2b1d208a8d993c7ca440af1153909608dc8..b5dcc78a80fcfbd0d7b34bb2988d51a63a73790e 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
@@ -120,6 +120,12 @@ public final class WordExtractor extends POIOLE2TextExtractor {
                 return getParagraphText(r);
         }
 
+        public String[] getMainTextboxText() {
+                Range r = doc.getMainTextboxRange();
+
+                return getParagraphText(r);
+        }
+
         public String[] getEndnoteText() {
                 Range r = doc.getEndnoteRange();
 
@@ -251,6 +257,7 @@ public final class WordExtractor extends POIOLE2TextExtractor {
 
           ArrayList<String> text = new ArrayList<String>();
           text.addAll(Arrays.asList(getParagraphText()));
+          text.addAll(Arrays.asList(getMainTextboxText()));
           text.addAll(Arrays.asList(getFootnoteText()));
           text.addAll(Arrays.asList(getEndnoteText()));
 

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java
index d5e55b1a2ff53648a6af617eb788ac16e6f8cc6f..ef51961c8602d4326b6662ba33d644ce754285b5 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java
@@ -27,13 +27,35 @@ public final class FIBLongHandler {
   public static final int CBMAC = 0;
   public static final int PRODUCTCREATED = 1;
   public static final int PRODUCTREVISED = 2;
-  public static final int CCPTEXT = 3;
-  public static final int CCPFTN = 4;
-  public static final int CCPHDD = 5;
-  public static final int CCPMCR = 6;
-  public static final int CCPATN = 7;
-  public static final int CCPEDN = 8;
-  public static final int CCPTXBX = 9;
+    /**
+     * Pointer to length of main document text stream 1
+     */
+    public static final int CCPTEXT = 3;
+    /**
+     * Pointer to length of footnote subdocument text stream
+     */
+    public static final int CCPFTN = 4;
+    /**
+     * Pointer to length of header subdocument text stream
+     */
+    public static final int CCPHDD = 5;
+    /**
+     * Pointer to length of macro subdocument text stream, which should now
+     * always be 0
+     */
+    public static final int CCPMCR = 6;
+    /**
+     * Pointer to length of annotation subdocument text stream
+     */
+    public static final int CCPATN = 7;
+    /**
+     * Pointer to length of endnote subdocument text stream
+     */
+    public static final int CCPEDN = 8;
+    /**
+     * Pointer to length of textbox subdocument text stream
+     */
+    public static final int CCPTXBX = 9;
   public static final int CCPHDRTXBX = 10;
   public static final int PNFBPCHPFIRST = 11;
   public static final int PNCHPFIRST = 12;