From: André Pönitz <poenitz@gmx.net>
Date: Sun, 27 Jul 2003 15:41:46 +0000 (+0000)
Subject: get rid of LyXText::need_break_row
X-Git-Tag: 1.6.10~16442
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a4776de061d782ccd732e9c6082acd16cdf6edbf;p=features.git

get rid of LyXText::need_break_row


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7389 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2506b860fc..20667e07e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+
+2003-07-26  André Pönitz  <poenitz@gmx.net>
+
+	*	lyxtext.h:
+	* text.C:
+	* text2.C: get rid of LyXText::need_break_row
+
+
 2003-07-27  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* toc.[Ch]: put namespace toc inside namespace lyx
diff --git a/src/lyxtext.h b/src/lyxtext.h
index 51dfd0c3c1..ed7438b58b 100644
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -161,16 +161,13 @@ public:
 	///
 	void insertInset(InsetOld * inset);
 
-	/// Completes the insertion with a rebreak from 'need_break_row' on
+	/// Completes the insertion with a rebreak
 	void partialRebreak();
 	/// a full rebreak of the whole text
 	void fullRebreak();
 	/// compute text metrics
 	void metrics(MetricsInfo & mi, Dimension & dim);
 
-	///
-	RowList::iterator need_break_row;
-
 	/// clear any pending paints
 	void clearPaint();
 
diff --git a/src/text.C b/src/text.C
index 179c6db01d..0a6a6b77a8 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1634,8 +1634,6 @@ void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
 
 	if (boost::next(cursorRow()) != rows().end())
 		breakAgain(boost::next(cursorRow()));
-
-	need_break_row = rows().end();
 }
 
 
@@ -1808,15 +1806,8 @@ void LyXText::insertChar(char c)
 			real_current_font = realtmpfont;
 			setCursor(cursor.par(), cursor.pos() + 1,
 				  false, cursor.boundary());
-			// cursor MUST be in row now.
-
-			RowList::iterator next_row = boost::next(row);
-			if (next_row != rows().end() &&
-			    next_row->par() == row->par())
-				need_break_row = next_row;
-			else
-				need_break_row = rows().end();
 
+			// cursor MUST be in row now.
 			// check, wether the last characters font has changed.
 			if (cursor.pos() && cursor.pos() == cursor.par()->size()
 			    && rawparfont != rawtmpfont)
@@ -1860,14 +1851,6 @@ void LyXText::insertChar(char c)
 		    != cursor.boundary())
 			setCursor(cursor.par(), cursor.pos(), false,
 			  !cursor.boundary());
-
-		next_row = boost::next(row);
-
-		if (next_row != rows().end() &&
-		    next_row->par() == row->par())
-			need_break_row = next_row;
-		else
-			need_break_row = rows().end();
 	} else {
 		// FIXME: similar code is duplicated all over - make resetHeightOfRow
 		setHeightOfRow(row);
@@ -2611,14 +2594,8 @@ void LyXText::backspace()
 				if (row->pos() >= row->par()->size()) {
 					// remove it
 					removeRow(row);
-					need_break_row = rows().end();
 				} else {
 					breakAgainOneRow(row);
-					if (boost::next(row) != rows().end() &&
-					    boost::next(row)->par() == row->par())
-						need_break_row = boost::next(row);
-					else
-						need_break_row = rows().end();
 				}
 
 				// set the dimensions of the row above
@@ -2665,12 +2642,6 @@ void LyXText::backspace()
 			}
 
 			setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
-
-			if (boost::next(row) != rows().end() &&
-			    boost::next(row)->par() == row->par())
-				need_break_row = boost::next(row);
-			else
-				need_break_row = rows().end();
 		} else  {
 			// set the dimensions of the row
 			row->fill(fill(row, workWidth()));
diff --git a/src/text2.C b/src/text2.C
index 0231873fdb..4f94b03b3d 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -65,7 +65,6 @@ LyXText::LyXText(BufferView * bv)
 	  inset_owner(0), the_locking_inset(0), bv_owner(bv)
 {
 	anchor_row_ = rows().end();
-	need_break_row = rows().end();
 	need_refresh_ = true;
 }
 
@@ -75,7 +74,6 @@ LyXText::LyXText(BufferView * bv, InsetText * inset)
 	  inset_owner(inset), the_locking_inset(0), bv_owner(bv)
 {
 	anchor_row_ = rows().end();
-	need_break_row = rows().end();
 	need_refresh_ = true;
 }
 
@@ -85,7 +83,6 @@ void LyXText::init(BufferView * bview)
 	bv_owner = bview;
 
 	rowlist_.clear();
-	need_break_row = rows().end();
 	width = height = 0;
 	need_refresh_ = true;
 
@@ -701,7 +698,6 @@ void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 
 	// rebuild row cache
 	rowlist_.clear();
-	need_break_row = rows().end();
 	width = height = 0;
 
 	anchor_row_ = rows().end();
@@ -747,14 +743,7 @@ void LyXText::partialRebreak()
 		init(bv());
 		return;
 	}
-
-	RowList::iterator rows_end = rows().end();
-
-	if (need_break_row != rows_end) {
-		breakAgain(need_break_row);
-		need_break_row = rows_end;
-		return;
-	}
+	breakAgain(rows().begin());
 }