From: Glenn Adams <gadams@apache.org>
Date: Sun, 30 Dec 2012 04:42:43 +0000 (+0000)
Subject: FOP-2160: Fix NPE when rl writing mode is used in certain contexts.
X-Git-Tag: fop-2_0~253
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f38bb6f29887606f6b4e576a32b71e1dd686a36e;p=xmlgraphics-fop.git

FOP-2160: Fix NPE when rl writing mode is used in certain contexts.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1426888 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/fop/area/inline/InlineArea.java b/src/java/org/apache/fop/area/inline/InlineArea.java
index 37930f3ba..d92ea4f4f 100644
--- a/src/java/org/apache/fop/area/inline/InlineArea.java
+++ b/src/java/org/apache/fop/area/inline/InlineArea.java
@@ -136,6 +136,14 @@ public class InlineArea extends Area {
         adjustingInfo = new InlineAdjustingInfo(stretch, shrink, adjustment);
     }
 
+    /**
+     * Sets the adjustment information from an existing object
+     * @param adjustingInfo the existing adjustment object
+     */
+    public void setAdjustingInfo(InlineAdjustingInfo adjustingInfo) {
+        this.adjustingInfo = adjustingInfo;
+    }
+
     /**
      * Modify the adjustment value in the adjustment information object
      * @param adjustment the new adjustment value
diff --git a/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java b/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
index 864c2930c..eb842a771 100644
--- a/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
+++ b/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
@@ -279,6 +279,7 @@ class UnflattenProcessor {
         assert f != null;
         fc.setIPD ( f.getIPD() );
         fc.setUnitWidth ( f.getUnitWidth() );
+        fc.setAdjustingInfo( f.getAdjustingInfo() );
     }
     private InlineParent generateInlineContainer0 ( InlineParent i ) {
         InlineParent ic = new InlineParent();
diff --git a/status.xml b/status.xml
index 3511dfc7c..cd7feb080 100644
--- a/status.xml
+++ b/status.xml
@@ -59,6 +59,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Layout" dev="GA" type="fix" fixes-bug="FOP-2160" due-to="Robert Meyer">
+        Fix NPE when rl writing mode is used in certain contexts.
+      </action>
       <action context="Layout" dev="GA" type="fix" fixes-bug="FOP-2178">
         Fix incomplete kerning when complex script features are enabled.
       </action>