From 1840daa739e3c40f2470a4948e785af13019f5fc Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 4 Jun 2018 13:43:56 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-8403=2010.0html=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E4=B9=8Blist=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/third/v2/lowagie/text/html/ParseIndentAttrUtils.java | 3 +++ .../v2/lowagie/text/html/simpleparser/FactoryProperties.java | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fine-itext/src/com/fr/third/v2/lowagie/text/html/ParseIndentAttrUtils.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/ParseIndentAttrUtils.java index 1eeafb1e4..e96b74d5c 100644 --- a/fine-itext/src/com/fr/third/v2/lowagie/text/html/ParseIndentAttrUtils.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/ParseIndentAttrUtils.java @@ -30,6 +30,9 @@ public class ParseIndentAttrUtils { } public static IndentAttribute parsePaddingAttribute(Map map){ + if (map == null){ + return new IndentAttribute(); + } IndentAttribute indentAttribute = new IndentAttribute(); Iterator iter = map.entrySet().iterator(); while (iter.hasNext()) { diff --git a/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java index 4a59fc066..86146180e 100644 --- a/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java +++ b/fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/FactoryProperties.java @@ -158,10 +158,6 @@ public class FactoryProperties { String ss = props.getPropertyFromChain("div", "width"); p.setAttribute("width", ss); } - if(props.hasPropertyInChain("div", "height")){ - String ss = props.getPropertyFromChain("div", "height"); - p.setAttribute("height", ss); - } p.setHyphenation(getHyphenation(props)); setParagraphLeading(p, props.getProperty("leading"));