From b76f3f14a6d73696abfe40018a70cc7a8e86e5a5 Mon Sep 17 00:00:00 2001 From: Adrian Cumiskey Date: Wed, 23 Jul 2008 09:57:22 +0000 Subject: [PATCH] Merged revisions 678730,679044 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r678730 | acumiskey | 2008-07-22 13:14:37 +0100 (Tue, 22 Jul 2008) | 1 line Lets free a little memory in every BlockParent :).. Commented out the unused private member variable 'orientation'. ........ r679044 | acumiskey | 2008-07-23 10:26:40 +0100 (Wed, 23 Jul 2008) | 2 lines Minor optimization. ........ git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@679052 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/area/BlockParent.java | 2 +- .../org/apache/fop/layoutmgr/BlockContainerLayoutManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/fop/area/BlockParent.java b/src/java/org/apache/fop/area/BlockParent.java index caca5befc..8e4f71250 100644 --- a/src/java/org/apache/fop/area/BlockParent.java +++ b/src/java/org/apache/fop/area/BlockParent.java @@ -51,7 +51,7 @@ public class BlockParent extends Area { protected List children = null; // orientation if reference area - private int orientation = ORIENT_0; +// private int orientation = ORIENT_0; /** {@inheritDoc} */ public void addChildArea(Area childArea) { diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index 022ba1d90..4aa73cc37 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -196,8 +196,6 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager return getNextKnuthElementsAbsolute(context, alignment); } - boolean switchedProgressionDirection - = (getBlockContainerFO().getReferenceOrientation() % 180 != 0); autoHeight = false; //boolean rotated = (getBlockContainerFO().getReferenceOrientation() % 180 != 0); int maxbpd = context.getStackLimitBP().opt; @@ -354,6 +352,8 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager if (autoHeight) { //Update content BPD now that it is known int newHeight = breaker.deferredAlg.totalWidth; + boolean switchedProgressionDirection + = (getBlockContainerFO().getReferenceOrientation() % 180 != 0); if (switchedProgressionDirection) { setContentAreaIPD(newHeight); } else { -- 2.39.5