From b6b3653c1230314e3c2451c846c2dbfcc2de6c89 Mon Sep 17 00:00:00 2001 From: zhouping Date: Fri, 15 Nov 2019 17:40:19 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1314=20fine-itext=E6=94=AF=E6=8C=81JDK11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fine-itext-old/src/com/fr/third/com/lowagie/text/Row.java | 2 +- .../com/lowagie/text/html/simpleparser/HTMLWorker.java | 6 +----- .../com/fr/third/com/lowagie/text/rtf/table/RtfRow.java | 2 +- .../com/fr/third/com/lowagie/text/rtf/table/RtfTable.java | 8 ++++---- .../v2/lowagie/text/html/simpleparser/HTMLWorker.java | 4 +--- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/fine-itext-old/src/com/fr/third/com/lowagie/text/Row.java b/fine-itext-old/src/com/fr/third/com/lowagie/text/Row.java index e6092dd96..a238628c1 100755 --- a/fine-itext-old/src/com/fr/third/com/lowagie/text/Row.java +++ b/fine-itext-old/src/com/fr/third/com/lowagie/text/Row.java @@ -93,7 +93,7 @@ public class Row implements Element { /** This is the array of Objects (Cell or Table). */ protected Object[] cells; - /** carl:反正自己改代码，不管什么结构了*/ + /** carl:鍙嶆鑷繁鏀逛唬鐮侊紝涓嶇浠涔堢粨鏋勪簡*/ protected int height = 0; /** This is the vertical alignment. */ diff --git a/fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/HTMLWorker.java b/fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/HTMLWorker.java index 1399c6d20..f1ea48571 100644 --- a/fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/HTMLWorker.java +++ b/fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/HTMLWorker.java @@ -72,14 +72,10 @@ import com.fr.third.com.lowagie.text.pdf.PdfPTable; import com.fr.third.com.lowagie.text.pdf.draw.LineSeparator; import com.fr.third.com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler; import com.fr.third.com.lowagie.text.xml.simpleparser.SimpleXMLParser; -import sun.misc.BASE64Decoder; +import com.fr.third.sun.misc.BASE64Decoder; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.io.Reader; import java.util.ArrayList; import java.util.HashMap; diff --git a/fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/table/RtfRow.java b/fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/table/RtfRow.java index 1fb95f795..2f36fff2f 100755 --- a/fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/table/RtfRow.java +++ b/fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/table/RtfRow.java @@ -232,7 +232,7 @@ public class RtfRow extends RtfElement { this.cells = new ArrayList(); this.width = this.document.getDocumentHeader().getPageSetting().getPageWidth() - this.document.getDocumentHeader().getPageSetting().getMarginLeft() - this.document.getDocumentHeader().getPageSetting().getMarginRight(); this.width = (int) (this.width * this.parentTable.getTableWidthPercent() / 100); - // carl: 传递height + // carl: height this.height = row.getHeight(); int cellRight = 0; diff --git a/fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/table/RtfTable.java b/fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/table/RtfTable.java index aaa3cb150..5a1b5e1cf 100755 --- a/fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/table/RtfTable.java +++ b/fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/table/RtfTable.java @@ -238,14 +238,14 @@ public class RtfTable extends RtfElement { result.write(RtfFont.FONT_SIZE); result.write(intToByteArray(this.offset)); } - // carl:多出来的行，行高设为最小 1 + // carl:澶氬嚭鏉ョ殑琛岋紝琛岄珮璁句负鏈灏 1 result.write(RtfParagraph.PLAIN); // result.write("\\s".getBytes()); // result.write(intToByteArray(0)); result.write(RtfPhrase.LINE_SPACING); result.write(intToByteArray(0)); result.write(RtfParagraph.PLAIN); - // 这里是关键，把这破行设成1 + // 杩欓噷鏄叧閿紝鎶婅繖鐮磋璁炬垚1 result.write(RtfFont.FONT_SIZE); result.write(intToByteArray(2)); result.write(RtfParagraph.PARAGRAPH); @@ -258,14 +258,14 @@ public class RtfTable extends RtfElement { } result.write(RtfParagraph.PARAGRAPH_DEFAULTS); - // carl:多出来的行，行高设为最小 1 + // carl:澶氬嚭鏉ョ殑琛岋紝琛岄珮璁句负鏈灏 1 result.write(RtfParagraph.PLAIN); // result.write("\\s".getBytes()); // result.write(intToByteArray(0)); result.write(RtfPhrase.LINE_SPACING); result.write(intToByteArray(0)); result.write(RtfParagraph.PLAIN); - // 这里是关键，把这破行设成1 + // 杩欓噷鏄叧閿紝鎶婅繖鐮磋璁炬垚1 result.write(RtfFont.FONT_SIZE); result.write(intToByteArray(2)); } diff --git a/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java index ade85f5cf..5a4481ab7 100644 --- a/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/HTMLWorker.java @@ -58,8 +58,6 @@ import java.io.InputStream; import java.io.Reader; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; import java.util.Stack; import java.util.StringTokenizer; @@ -85,7 +83,7 @@ import com.fr.third.v2.lowagie.text.Paragraph; import com.fr.third.v2.lowagie.text.Phrase; import com.fr.third.v2.lowagie.text.pdf.PdfPTable; import com.fr.third.v2.lowagie.text.xml.simpleparser.SimpleXMLParser; -import sun.misc.BASE64Decoder; +import com.fr.third.sun.misc.BASE64Decoder; import javax.imageio.ImageIO;