diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2011-02-10 14:09:42 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2011-02-10 14:09:42 +0000 |
| commit | df68e0c99457e88e53bb6a434487712902ff382d (patch) | |
| tree | 919f2e9441c2c188e98ab52a2b1144f7562d5941 /src/java/org/apache/fop/area/inline/InlineBlockParent.java | |
| parent | b190db6910a3e133d8c1696b4730d77383f98c92 (diff) | |
| parent | f1269cc280b846cd6da396177bc74c4c9808579e (diff) | |
| download | xmlgraphics-fop-df68e0c99457e88e53bb6a434487712902ff382d.tar.gz xmlgraphics-fop-df68e0c99457e88e53bb6a434487712902ff382d.zip | |
Merge from Trunk, revisions 1060235 to 1069383.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Color@1069397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/area/inline/InlineBlockParent.java')
| -rw-r--r-- | src/java/org/apache/fop/area/inline/InlineBlockParent.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/java/org/apache/fop/area/inline/InlineBlockParent.java b/src/java/org/apache/fop/area/inline/InlineBlockParent.java index fe024ac0f..982e8848f 100644 --- a/src/java/org/apache/fop/area/inline/InlineBlockParent.java +++ b/src/java/org/apache/fop/area/inline/InlineBlockParent.java @@ -48,6 +48,7 @@ public class InlineBlockParent extends InlineArea { * * @param childArea the child area to add */ + @Override public void addChildArea(Area childArea) { if (child != null) { throw new IllegalStateException("InlineBlockParent may have only one child area."); |