From 62b351cbeb9f397d7c1a9711e26a7c472fa231e7 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 17 May 2025 09:57:02 +0000 Subject: [PATCH] bring together CTRunTrackChange code git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1925611 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java | 5 ++--- .../src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java index 9494848c5e..95ab1237c1 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java @@ -109,14 +109,13 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para * sub-paragraph that correspond to character text * runs, and builds the appropriate runs for these. */ - @SuppressWarnings("deprecation") private void buildRunsInOrderFromXml(XmlObject object) { try (XmlCursor c = object.newCursor()) { c.selectPath("child::*"); while (c.toNextSelection()) { XmlObject o = c.getObject(); if (o instanceof CTR) { - XWPFRun r = new XWPFRun((CTR) o, this); + XWPFRun r = new XWPFRun((CTR) o, (IRunBody) this); runs.add(r); iruns.add(r); } @@ -147,7 +146,7 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para if (o instanceof CTRunTrackChange) { final CTRunTrackChange parentRecord = (CTRunTrackChange) o; for (CTR r : parentRecord.getRArray()) { - XWPFRun cr = new XWPFRun(r, this); + XWPFRun cr = new XWPFRun(r, (IRunBody) this); runs.add(cr); iruns.add(cr); } diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java index 03249fa66d..78532b9e5d 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java @@ -137,6 +137,7 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun { * @deprecated Use {@link XWPFRun#XWPFRun(CTR, IRunBody)} */ @Deprecated + @Removal(version = "7.0.0") public XWPFRun(CTR r, XWPFParagraph p) { this(r, (IRunBody) p); }