From 9ac1e96a99a6e2f02d938d0e939e1837b0c73207 Mon Sep 17 00:00:00 2001 From: Finn Bock Date: Fri, 29 Oct 2004 09:17:34 +0000 Subject: More properties implement in the property subsystem. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198108 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/layoutmgr/ExternalGraphicLayoutManager.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/java/org/apache/fop/layoutmgr') diff --git a/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java index 0b0c9073d..8b29cbcd9 100644 --- a/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java @@ -99,21 +99,23 @@ public class ExternalGraphicLayoutManager extends LeafNodeLayoutManager { int cheight = -1; Length ch = fobj.getContentHeight(); if (ch.getEnum() != AUTO) { - /*if (ch.scaleToFit()) { + if (ch.getEnum() == SCALE_TO_FIT) { if (viewHeight != -1) { cheight = viewHeight; } - } else {*/ - cheight = ch.getValue(); + } else { + cheight = ch.getValue(); + } } Length cw = fobj.getContentWidth(); if (cw.getEnum() != AUTO) { - /*if (cw.scaleToFit()) { + if (cw.getEnum() == SCALE_TO_FIT) { if (viewWidth != -1) { cwidth = viewWidth; } - } else {*/ - cwidth = cw.getValue(); + } else { + cwidth = cw.getValue(); + } } int scaling = fobj.getScaling(); -- cgit v1.2.3