diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-03 17:11:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-03 17:11:27 +0000 |
| commit | d0abc1a165ce7130e802d892e1417617a99a3ba0 (patch) | |
| tree | 7dc885cf1d4bca7a30bfa8877164008c4966f6b3 /khtml/rendering/render_line.cpp | |
| parent | c5415f69834f13834179331af41329980fe8a3e8 (diff) | |
| download | tdelibs-d0abc1a165ce7130e802d892e1417617a99a3ba0.tar.gz tdelibs-d0abc1a165ce7130e802d892e1417617a99a3ba0.zip | |
Merge commit 1170303 from the Enterprise branch
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171389 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_line.cpp')
| -rw-r--r-- | khtml/rendering/render_line.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/khtml/rendering/render_line.cpp b/khtml/rendering/render_line.cpp index f3b769e9c..2bcbe366e 100644 --- a/khtml/rendering/render_line.cpp +++ b/khtml/rendering/render_line.cpp @@ -271,8 +271,8 @@ bool InlineFlowBox::onEndChain(RenderObject* endObject) RenderObject* curr = endObject; RenderObject* parent = curr->parent(); - while (parent && !parent->isRenderBlock() || parent == object()) { - if (parent->lastChild() != curr) + while (parent && !parent->isRenderBlock()) { + if (parent->lastChild() != curr || parent == object()) return false; curr = parent; |