diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2008-12-09 15:00:35 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2008-12-09 15:00:35 +0000 |
| commit | a6ddced309701a1ca8d79a9e7bec3288afba2cc8 (patch) | |
| tree | c3d2bcfe7277246d9a2acc3675721a99f4de5727 /src/java/org/apache/fop/area/inline/InlineArea.java | |
| parent | 9d339f0968314f0cfcc4a720628fed1845292ce1 (diff) | |
| parent | f9d4720b99f5e0fb423b097d7207dfab446d911c (diff) | |
| download | xmlgraphics-fop-a6ddced309701a1ca8d79a9e7bec3288afba2cc8.tar.gz xmlgraphics-fop-a6ddced309701a1ca8d79a9e7bec3288afba2cc8.zip | |
Merge from Trunk revisions 719662 - 724689.
Conflict for ImageHandler interface resolved by renaming Trunk's ImageHandler to ImageHandlerBase and extending the other ImageHandler from that.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@724729 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/area/inline/InlineArea.java')
| -rw-r--r-- | src/java/org/apache/fop/area/inline/InlineArea.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/area/inline/InlineArea.java b/src/java/org/apache/fop/area/inline/InlineArea.java index d8936dd42..6d5d9ca98 100644 --- a/src/java/org/apache/fop/area/inline/InlineArea.java +++ b/src/java/org/apache/fop/area/inline/InlineArea.java @@ -221,7 +221,7 @@ public class InlineArea extends Area { notifyIPDVariation(ipdVariation); } - /** + /** * notify the parent area about the ipd variation of this area * or of a descendant area * @param ipdVariation the difference between new and old ipd |