This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git
The following commit(s) were added to refs/heads/trunk by this push:
new 68ddbac962 Fix offset calculation in
ParagraphSprmUncompressor.handleTabs() (#1127)
68ddbac962 is described below
commit 68ddbac9622813c3c5b63faf1362ad9a863cc103
Author: Mark Koops <[email protected]>
AuthorDate: Thu Jun 11 11:31:43 2026 +0200
Fix offset calculation in ParagraphSprmUncompressor.handleTabs() (#1127)
Co-authored-by: Mark Koops <[email protected]>
---
.../poi/hwpf/sprm/ParagraphSprmUncompressor.java | 3 +-
.../hwpf/sprm/ParagraphSprmUncompressorTest.java | 120 +++++++++++++++++++++
test-data/document/gh-issue-1126.doc | Bin 0 -> 25088 bytes
3 files changed, 121 insertions(+), 2 deletions(-)
diff --git
a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
index da16b69ce7..83bc32b8fd 100644
---
a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
+++
b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.logging.log4j.Logger;
import org.apache.poi.logging.PoiLogManager;
import org.apache.poi.hwpf.model.TabDescriptor;
-import org.apache.poi.hwpf.model.types.TBDAbstractType;
import org.apache.poi.hwpf.usermodel.BorderCode;
import org.apache.poi.hwpf.usermodel.DateAndTime;
import org.apache.poi.hwpf.usermodel.DropCapSpecifier;
@@ -419,7 +418,7 @@ public final class ParagraphSprmUncompressor extends
SprmUncompressor {
int start = offset;
for (int x = 0; x < addSize; x++) {
Integer key = (int) LittleEndian.getShort(grpprl, offset);
- TabDescriptor val = new TabDescriptor(grpprl, start +
((TBDAbstractType.getSize() * addSize) + x));
+ TabDescriptor val = new TabDescriptor(grpprl, start +
((LittleEndianConsts.SHORT_SIZE * addSize) + x));
tabMap.put(key, val);
offset += LittleEndianConsts.SHORT_SIZE;
}
diff --git
a/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressorTest.java
b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressorTest.java
new file mode 100644
index 0000000000..2b3ba827f5
--- /dev/null
+++
b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressorTest.java
@@ -0,0 +1,120 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.apache.poi.hwpf.sprm;
+
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.HWPFTestDataSamples;
+import org.apache.poi.hwpf.model.TabDescriptor;
+import org.apache.poi.hwpf.usermodel.Paragraph;
+import org.apache.poi.hwpf.usermodel.Range;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ParagraphSprmUncompressorTest {
+ @Test
+ void testLoadTabStopDefinitions() throws IOException {
+ List<Paragraph> paragraphs = new ArrayList<>();
+
+ try (HWPFDocument doc =
HWPFTestDataSamples.openSampleFile("gh-issue-1126.doc")) {
+ Range globalRange = doc.getRange();
+ for (int i = 0; i < globalRange.numParagraphs(); i++) {
+ paragraphs.add(globalRange.getParagraph(i));
+ }
+ }
+
+ List<String> descriptions =
paragraphs.stream().map(this::extractTabStops).collect(Collectors.toList());
+
+ assertEquals(6, paragraphs.size());
+ assertEquals(6, descriptions.size());
+
+ assertEquals("0 (2268, left, none); 1 (5670, left, none)",
descriptions.get(0));
+ assertEquals("", descriptions.get(1));
+ assertEquals("0 (1276, right, hyphen)", descriptions.get(2));
+ assertEquals("0 (1276, right, hyphen); 1 (2694, center, dot); 2 (4253,
right, underscore)", descriptions.get(3));
+ assertEquals("0 (4253, right, underscore); 1 (6237, bar, none)",
descriptions.get(4));
+ assertEquals("0 (1134, decimal, dot)", descriptions.get(5));
+ }
+
+ private String extractTabStops(Paragraph paragraph) {
+ TabDescriptor[] tabDescriptors = paragraph.getProps().getRgtbd();
+ int[] tabStopsPositions = paragraph.getTabStopsPositions();
+
+ StringBuilder out = new StringBuilder();
+ for (int i = 0; i < tabDescriptors.length; i++) {
+ if (i > 0) out.append("; ");
+ out
+ .append(i)
+ .append(" (")
+ .append(tabStopsPositions[i])
+ .append(", ")
+ .append(describeAlignment(tabDescriptors[i]))
+ .append(", ")
+ .append(describeLeader(tabDescriptors[i]))
+ .append(")");
+ }
+ return out.toString();
+ }
+
+ private String describeAlignment(TabDescriptor tabDescriptor) {
+ switch (tabDescriptor.getJc()) {
+ case 0:
+ return "left";
+ case 1:
+ return "center";
+ case 2:
+ return "right";
+ case 3:
+ return "decimal";
+ case 4:
+ return "bar";
+ case 5:
+ return "list";
+ default:
+ return "unknown";
+ }
+ }
+
+ private String describeLeader(TabDescriptor tabDescriptor) {
+ switch (tabDescriptor.getTlc()) {
+ case 0:
+ return "none";
+ case 1:
+ return "dot";
+ case 2:
+ return "hyphen";
+ case 3:
+ return "underscore";
+ case 4:
+ return "heavy";
+ case 5:
+ return "middleDot";
+ case 7:
+ return "default";
+ default:
+ return "unknown";
+ }
+ }
+}
+
diff --git a/test-data/document/gh-issue-1126.doc
b/test-data/document/gh-issue-1126.doc
new file mode 100644
index 0000000000..5d317ade4c
Binary files /dev/null and b/test-data/document/gh-issue-1126.doc differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
