Author: adelmelle
Date: Sun Mar 22 19:42:33 2009
New Revision: 757244
URL: http://svn.apache.org/viewvc?rev=757244&view=rev
Log:
revert some changes, dependent on other local changes, which would cause a
compile error...
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java?rev=757244&r1=757243&r2=757244&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
Sun Mar 22 19:42:33 2009
@@ -83,11 +83,14 @@
int span = EN_NONE;
int disableColumnBalancing = EN_FALSE;
if (curLM instanceof BlockLayoutManager) {
- span = ((BlockLayoutManager)curLM).getSpan();
- disableColumnBalancing = ((BlockLayoutManager)
curLM).getDisableColumnBalancing();
+ span = ((BlockLayoutManager)curLM).getBlockFO().getSpan();
+ disableColumnBalancing = ((BlockLayoutManager)
curLM).getBlockContainerFO()
+ .getDisableColumnBalancing();
} else if (curLM instanceof BlockContainerLayoutManager) {
- span = ((BlockContainerLayoutManager)curLM).getSpan();
- disableColumnBalancing = ((BlockContainerLayoutManager)
curLM).getDisableColumnBalancing();
+ span = ((BlockContainerLayoutManager)curLM).getBlockFO()
+ .getSpan();
+ disableColumnBalancing = ((BlockContainerLayoutManager)
curLM).getBlockContainerFO()
+ .getDisableColumnBalancing();
}
int currentSpan = context.getCurrentSpan();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
