Differential D9497

[textlayout] Do not enter infinite loop when line rect is not valid
ClosedPublic
Actions

Authored by anthonyfieroni on Dec 24 2017, 8:41 AM.

Details

Reviewers
danders
mecir
boemann
Group Reviewers
Calligra: 3.0
Commits
R8:890b3198f4d1: [textlayout] Do not enter infinite loop when line rect is not valid
Summary

If lineRect is not valid getLineRect *never* will return a valid rect which will hangs application.

Test Plan

Calligra Words now works with http://europass.cedefop.europa.eu/documents/curriculum-vitae/templates-instructions odt templates

Diff Detail

Repository
R8 Calligra
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
anthonyfieroni requested review of this revision.Dec 24 2017, 8:41 AM
anthonyfieroni created this revision.
anthonyfieroni updated this revision to Diff 24437.Dec 28 2017, 7:16 PM
anthonyfieroni removed a reviewer: Calligra: 3.0.
anthonyfieroni removed a project: Calligra: 3.0.

Revert qFuzzyIsNull, other part of project don't use it.

Restricted Application added a project: Calligra: 3.0. · View Herald TranscriptDec 28 2017, 7:16 PM
Restricted Application added a project: Calligra: 3.0. · View Herald TranscriptDec 28 2017, 7:17 PM
boemann requested changes to this revision.Dec 28 2017, 9:09 PM
boemann added inline comments.
libs/textlayout/RunAroundHelper.cpp
106

By removing this the lineRect doesn't change when maxLineHeight changes (which iirc it does in getLineRect())
Can you please make sure that we are not introducing a regression over this

And yes i know there should have been unit tests alread (maybe you could add some pls)

This revision now requires changes to proceed.Dec 28 2017, 9:09 PM
anthonyfieroni added inline comments.Dec 29 2017, 6:46 AM
libs/textlayout/RunAroundHelper.cpp
106

maxLineHeight is not changed, the code is same, i notice that creating new rect every time is significantly slower.

boemann accepted this revision.Dec 29 2017, 2:48 PM

Ok - good work

This revision is now accepted and ready to land.Dec 29 2017, 2:48 PM
Closed by commit R8:890b3198f4d1: [textlayout] Do not enter infinite loop when line rect is not valid (authored by anthonyfieroni). · Explain WhyDec 30 2017, 6:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mlibs/textlayout/RunAroundHelper.cpp (10 lines)

Diff 24478

View Options

libs/textlayout/RunAroundHelper.cpp

Loading...