diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-09-22 20:47:14 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-09-22 20:47:14 +0200 |
| commit | 6d7df83ccc6d259dbdc2c35b99c9d9d5507fae68 (patch) | |
| tree | c0a118e60abeb56bd9a85e3de091d3dc53218f09 | |
| parent | 503a876c5d9f57e1452494c27c83fe9a75ff5209 (diff) | |
Fixed abortion.
| -rw-r--r-- | dw/textblock_linebreaking.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc index 2d67cf4e..acd122da 100644 --- a/dw/textblock_linebreaking.cc +++ b/dw/textblock_linebreaking.cc @@ -757,11 +757,12 @@ int Textblock::wrapWordInFlow (int wordIndex, bool wrapAll) // (currently?). lastFloatPos = newFloatPos; - - for (int i = 0; i < NUM_OOFM; i++) - searchOutOfFlowMgr(i)->tellPosition - (words->getRef(lastFloatPos)->content.widget, - boxOffsetX (), yNewLine); + + Widget *widget = words->getRef(lastFloatPos)->content.widget; + oof::OutOfFlowMgr *oofm = + searchOutOfFlowMgr (getWidgetOOFIndex (widget)); + if (oofm && oofm->mayAffectBordersAtAll ()) + oofm->tellPosition (widget, boxOffsetX (), yNewLine); balanceBreakPosAndHeight (wordIndex, firstIndex, &searchUntil, tempNewLine, penaltyIndex, false, |