diff options
Diffstat (limited to 'src/java/org/apache/fop/fo/flow/Inline.java')
-rw-r--r-- | src/java/org/apache/fop/fo/flow/Inline.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java index 98fca8639..00f521d14 100644 --- a/src/java/org/apache/fop/fo/flow/Inline.java +++ b/src/java/org/apache/fop/fo/flow/Inline.java @@ -59,12 +59,12 @@ import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObjMixed; import org.apache.fop.fo.InlineCharIterator; import org.apache.fop.fo.properties.TextDecoration; -import org.apache.fop.layout.AccessibilityProps; -import org.apache.fop.layout.AuralProps; -import org.apache.fop.layout.BackgroundProps; -import org.apache.fop.layout.BorderAndPadding; -import org.apache.fop.layout.MarginInlineProps; -import org.apache.fop.layout.RelativePositionProps; +import org.apache.fop.fo.properties.CommonAccessibility; +import org.apache.fop.fo.properties.CommonAural; +import org.apache.fop.fo.properties.CommonBackground; +import org.apache.fop.fo.properties.CommonBorderAndPadding; +import org.apache.fop.fo.properties.CommonMarginInline; +import org.apache.fop.fo.properties.CommonRelativePosition; import org.apache.fop.apps.FOPException; /** @@ -99,23 +99,23 @@ public class Inline extends FObjMixed { } // Common Accessibility Properties - AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); + CommonAccessibility mAccProps = propMgr.getAccessibilityProps(); // Common Aural Properties - AuralProps mAurProps = propMgr.getAuralProps(); + CommonAural mAurProps = propMgr.getAuralProps(); // Common Border, Padding, and Background Properties - BorderAndPadding bap = propMgr.getBorderAndPadding(); - BackgroundProps bProps = propMgr.getBackgroundProps(); + CommonBorderAndPadding bap = propMgr.getBorderAndPadding(); + CommonBackground bProps = propMgr.getBackgroundProps(); // Common Font Properties //this.fontState = propMgr.getFontState(area.getFontInfo()); // Common Margin Properties-Inline - MarginInlineProps mProps = propMgr.getMarginInlineProps(); + CommonMarginInline mProps = propMgr.getMarginInlineProps(); // Common Relative Position Properties - RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); + CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); // this.properties.get("alignment-adjust"); // this.properties.get("alignment-baseline"); |