fixes for article

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

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
index a13931aa3f96913427070390dbda1a080ab9d9d7..0f55cbd55790c0074900c23258344129628c60af 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
@@ -336,7 +336,7 @@ public class Range
 
     int insertIndex = _end - tp.getStart();
 
-    if (tp.getStringBuffer().charAt(_end - 1) == '\r')
+    if (tp.getStringBuffer().charAt(_end - 1) == '\r' && text.charAt(0) != '\u0007')
     {
       insertIndex--;
     }

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
index 73aff313768b97829cdf01aedc577fe7e98ee0db..65aee3748b755b274d4fdc310f3e3d484ba50bc7 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 
 package org.apache.poi.hwpf.usermodel;
 
@@ -37,6 +37,11 @@ public class Section
     return TYPE_SECTION;
   }
 
+  public int getNumColumns()
+  {
+    return _props.getCcolM1() + 1;
+  }
+
   public Object clone()
      throws CloneNotSupportedException
    {

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
index 6882c3aafa05f94190be85c4e3f8d838547ac8c9..42aa6570b45cc3e3dac43323811182317eaa21c5 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hwpf.usermodel;
 
 import java.util.ArrayList;
@@ -36,12 +36,12 @@ public class Table
     while (rowEnd < numParagraphs)
     {
       Paragraph p = getParagraph(rowEnd);
-      rowEnd++;
       if (p.isTableRowEnd() && p.getTableLevel() == levelNum)
       {
         _rows.add(new TableRow(rowStart, rowEnd, this, levelNum));
         rowStart = rowEnd;
       }
+      rowEnd++;
     }
   }