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

diff --git a/src/java/org/apache/fop/area/BlockParent.java b/src/java/org/apache/fop/area/BlockParent.java
index caca5befc150620c529abadff8b14a4f4b1762c5..8e4f71250a946564bbc51035dbc74cce36576c86 100644 (file)
--- 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 022ba1d90d75b33b04cf425468e050cf8362c185..4aa73cc3751bf359a18a9e75f4342227e9814588 100644 (file)
--- 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 {