Skip to content

FOP-3349: A line that overflows on the float re-layout pass is reported, not a NullPointerException #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
plutext wants to merge 1 commit into
base: main
Choose a base branch
from
Open

FOP-3349: A line that overflows on the float re-layout pass is reported, not a NullPointerException #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,8 @@ public void updateData2(KnuthNode bestActiveNode,
InlineLevelEventProducer eventProducer
= InlineLevelEventProducer.Provider.get(
getFObj().getUserAgent().getEventBroadcaster());
if (curChildLM.getFObj() == null) {
// curChildLM is null on the float re-layout pass (PageBreaker.handleFloatLayout)
if (curChildLM == null || curChildLM.getFObj() == null) {
eventProducer.lineOverflows(this, getFObj().getName(), bestActiveNode.line,
-lack, getFObj().getLocator());
} else {
Expand Down
46 changes: 46 additions & 0 deletions fop/test/layoutengine/standard-testcases/float_overflow_relayout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id$ -->
<testcase>
<info>
<p>
This test checks a line that overflows beside a float wider than the measure. On the float
re-layout pass the line breaking algorithm reported the overflow through curChildLM, which
is null there, and FOP threw a NullPointerException instead of reporting it.
</p>
</info>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master master-name="page" page-width="595pt" page-height="842pt" margin="85pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body">
<fo:block><fo:float float="start"><fo:block-container width="480pt" height="200pt"><fo:block> </fo:block></fo:block-container></fo:float></fo:block>
<fo:block><fo:block>block child</fo:block><fo:inline>Overflowing ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ</fo:inline></fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
<eval expected="1" xpath="count(//pageViewport)"/>
<true xpath="boolean(//word[starts-with(., 'ABCDEFGHIJ')])"/>
</checks>
</testcase>