aboutsummaryrefslogtreecommitdiffstats
path: root/src/org/apache/fop/traits/LayoutProps.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/apache/fop/traits/LayoutProps.java')
-rw-r--r--src/org/apache/fop/traits/LayoutProps.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/org/apache/fop/traits/LayoutProps.java b/src/org/apache/fop/traits/LayoutProps.java
index 5aa34db96..e49150a08 100644
--- a/src/org/apache/fop/traits/LayoutProps.java
+++ b/src/org/apache/fop/traits/LayoutProps.java
@@ -32,13 +32,13 @@ public class LayoutProps {
}
// public static int higherBreak(int brkParent, int brkChild) {
- // if (brkParent == brkChild) return brkChild;
- // for (int i=0; i < s_breakPriorities.length; i++) {
- // int bp = s_breakPriorities[i];
- // if (bp == brkParent) return brkChild;
- // else if (bp == brkChild) return brkParent;
- // }
- // return brkChild;
+ // if (brkParent == brkChild) return brkChild;
+ // for (int i=0; i < s_breakPriorities.length; i++) {
+ // int bp = s_breakPriorities[i];
+ // if (bp == brkParent) return brkChild;
+ // else if (bp == brkChild) return brkParent;
+ // }
+ // return brkChild;
// }
public void combineWithParent(LayoutProps parentLP) {
@@ -48,11 +48,13 @@ public class LayoutProps {
if (bp == breakBefore) {
breakBefore = parentLP.breakBefore;
break;
- } else if (bp == parentLP.breakBefore)
+ } else if (bp == parentLP.breakBefore) {
break;
+ }
}
}
// Parent span always overrides child span
bIsSpan = parentLP.bIsSpan;
}
}
+