From 2307fb399c72779b25618c6de1fcfff5b197be5b Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Fri, 24 Mar 2000 05:04:15 +0000 Subject: [PATCH] Fixed problem with previous checkin. Made sure "mColumn" is set correctly git-svn-id: svn://10.0.0.236/trunk@63992 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsTextFrame.cpp | 2 +- mozilla/layout/html/base/src/nsTextFrame.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 952d0bed0ee..a979aa55012 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -3271,7 +3271,7 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext, } } } - lineLayout.SetColumn(column); + lineLayout.SetColumn(textData.mColumn); // Inform line layout of how this piece of text ends in whitespace // (only text objects do this). Note that if x is zero then this diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 952d0bed0ee..a979aa55012 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -3271,7 +3271,7 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext, } } } - lineLayout.SetColumn(column); + lineLayout.SetColumn(textData.mColumn); // Inform line layout of how this piece of text ends in whitespace // (only text objects do this). Note that if x is zero then this