From 93a84ec681275776694f0c2e0ccee2fe1e96daf0 Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 24 Feb 1999 05:24:06 +0000
Subject: [PATCH] Fixed bug #2885 - the linebreaker couldn't handle a special
 case...

git-svn-id: svn://10.0.0.236/trunk@21705 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsTextFrame.cpp       | 3 ++-
 mozilla/layout/html/base/src/nsTextFrame.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp
index 119edfdfa68..703f10a0bf1 100644
--- a/mozilla/layout/generic/nsTextFrame.cpp
+++ b/mozilla/layout/generic/nsTextFrame.cpp
@@ -2123,7 +2123,8 @@ TextFrame::Reflow(nsIPresContext& aPresContext,
 #endif
     lineLayout.ForgetWordFrame(this);
   }
-  else {
+
+  if (!lineLayout.InWord()) {
     // There is no currently active word. This frame may contain the
     // start of one.
     if (endsInWhitespace) {
diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp
index 119edfdfa68..703f10a0bf1 100644
--- a/mozilla/layout/html/base/src/nsTextFrame.cpp
+++ b/mozilla/layout/html/base/src/nsTextFrame.cpp
@@ -2123,7 +2123,8 @@ TextFrame::Reflow(nsIPresContext& aPresContext,
 #endif
     lineLayout.ForgetWordFrame(this);
   }
-  else {
+
+  if (!lineLayout.InWord()) {
     // There is no currently active word. This frame may contain the
     // start of one.
     if (endsInWhitespace) {