diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2006-03-27 09:51:14 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2006-03-27 09:51:14 +0000 |
| commit | 0a2d149c230858d311f6d4d776072704a0096ac2 (patch) | |
| tree | 3dcbf5ed7be99ab2a93f5911ff2ff40e10364fc6 /src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java | |
| parent | 60fc6535d1a4bb48faea00e1d4793d18bc0f7f98 (diff) | |
| download | xmlgraphics-fop-0a2d149c230858d311f6d4d776072704a0096ac2.tar.gz xmlgraphics-fop-0a2d149c230858d311f6d4d776072704a0096ac2.zip | |
Merged Temp_API_Finalization branch back into FOP Trunk:
Finalized API according to the plan in the Wiki: http://wiki.apache.org/xmlgraphics-fop/ApiDesign
In addition to that:
Deprecated the rest of the Fop constructors.
Refactored the FopServlet a bit to make it more versatile and still easy to understand. The FopPrintServlet is now a subclass of FopServlet.
Some further cleanup on the way.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@389086 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java index 73c0de905..ef84d1c73 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java @@ -1520,11 +1520,11 @@ public class LineLayoutManager extends InlineStackingLayoutManager // on an inline or wrapper below the block level. Hyphenation hyph = Hyphenator.hyphenate(hyphenationProperties.language, - hyphenationProperties.country, - getFObj().getUserAgent().getHyphenationTreeResolver(), - sbChars.toString(), - hyphenationProperties.hyphenationRemainCharacterCount, - hyphenationProperties.hyphenationPushCharacterCount); + hyphenationProperties.country, + getFObj().getUserAgent().getFactory().getHyphenationTreeResolver(), + sbChars.toString(), + hyphenationProperties.hyphenationRemainCharacterCount, + hyphenationProperties.hyphenationPushCharacterCount); // They hyph structure contains the information we need // Now start from prev: reset to that position, ask that LM to get // a Position for the first hyphenation offset. If the offset isn't in |