From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Sat, 7 Jul 2001 18:02:19 +0000 (+0000)
Subject: remove some commented code
X-Git-Tag: 1.6.10~21119
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e0710b734fdc7df2e2b17b1adbea9b475e74d9d0;p=features.git

remove some commented code


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

diff --git a/src/ChangeLog b/src/ChangeLog
index 3d491c90ff..00b01e71f9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2001-07-07  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+	* text2.C: remove some commented code.
+
 	* trans_mgr.[Ch]: simplify normalkey to only take a char as arg.
 	* trans.C: changes because of the above.
 
diff --git a/src/text2.C b/src/text2.C
index 3dac232451..daf94bb674 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -51,16 +51,18 @@ using std::pair;
 LyXText::LyXText(BufferView * bv)
 	: number_of_rows(0), height(0), width(0), first(0),
 	  bv_owner(bv), inset_owner(0), the_locking_inset(0),
-	  need_break_row(0), refresh_y(0), status_(LyXText::UNCHANGED),
-	  firstrow(0), lastrow(0), copylayouttype(0)
+	  need_break_row(0), refresh_y(0), refresh_row(0),
+	  status_(LyXText::UNCHANGED), firstrow(0), lastrow(0),
+	  copylayouttype(0)
 {}
 
 
 LyXText::LyXText(InsetText * inset)
 	:  number_of_rows(0),  height(0), width(0), first(0),
 	   bv_owner(0), inset_owner(inset), the_locking_inset(0),
-	   need_break_row(0), refresh_y(0), status_(LyXText::UNCHANGED),
-	   firstrow(0), lastrow(0), copylayouttype(0)
+	   need_break_row(0), refresh_y(0), refresh_row(0),
+	   status_(LyXText::UNCHANGED), firstrow(0), lastrow(0),
+	   copylayouttype(0)
 {}
 
 void LyXText::init(BufferView * bview)
@@ -681,29 +683,12 @@ void LyXText::redoHeightOfParagraph(BufferView * bview, LyXCursor const & cur)
 
 	setHeightOfRow(bview, tmprow);
 	
-#if 0
-	Paragraph * first_phys_par = tmprow->par();
-
-	// find the first row of the paragraph
-	if (first_phys_par != tmprow->par())
-		while (tmprow->previous()
-		       && tmprow->previous()->par() != first_phys_par) {
-			tmprow = tmprow->previous();
-			y -= tmprow->height();
-			setHeightOfRow(bview, tmprow);
-		}
-	while (tmprow->previous() && tmprow->previous()->par() == first_phys_par) {
+	while (tmprow->previous()
+	       && tmprow->previous()->par() == tmprow->par()) {
 		tmprow = tmprow->previous();
 		y -= tmprow->height();
 		setHeightOfRow(bview, tmprow);
 	}
-#else
-	while (tmprow->previous() && tmprow->previous()->par() == tmprow->par()) {
-		tmprow = tmprow->previous();
-		y -= tmprow->height();
-		setHeightOfRow(bview, tmprow);
-	}
-#endif
 	
 	// we can set the refreshing parameters now
 	status(bview, LyXText::NEED_MORE_REFRESH);
@@ -720,25 +705,12 @@ void LyXText::redoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur)
 	int y = cur.y() - tmprow->baseline();
 	setHeightOfRow(bview, tmprow);
 
-#if 0
-	Paragraph * first_phys_par = tmprow->par();
-
-	// find the first row of the paragraph
-	if (first_phys_par != tmprow->par())
-		while (tmprow->previous() && tmprow->previous()->par() != first_phys_par)  {
-			tmprow = tmprow->previous();
-			y -= tmprow->height();
-		}
-	while (tmprow->previous() && tmprow->previous()->par() == first_phys_par)  {
-		tmprow = tmprow->previous();
-		y -= tmprow->height();
-	}
-#else
-	while (tmprow->previous() && tmprow->previous()->par() == tmprow->par())  {
+	while (tmprow->previous()
+	       && tmprow->previous()->par() == tmprow->par())  {
 		tmprow = tmprow->previous();
 		y -= tmprow->height();
 	}
-#endif
+
 	// we can set the refreshing parameters now
 	if (status_ == LyXText::UNCHANGED || y < refresh_y) {
 		refresh_y = y;
@@ -763,25 +735,6 @@ void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
    
 	int y = cur.y() - tmprow->baseline();
 
-#if 0
-	if (!tmprow->previous()) {
-		first_phys_par = firstParagraph();   // a trick/hack for UNDO
-	} else {
-		first_phys_par = tmprow->par();
-		// find the first row of the paragraph
-		if (first_phys_par != tmprow->par())
-			while (tmprow->previous() &&
-			       (tmprow->previous()->par() != first_phys_par)) {
-				tmprow = tmprow->previous();
-				y -= tmprow->height();
-			}
-		while (tmprow->previous()
-		       && tmprow->previous()->par() == first_phys_par) {
-			tmprow = tmprow->previous();
-			y -= tmprow->height();
-		}
-	}
-#else
 	if (!tmprow->previous()) {
 		// a trick/hack for UNDO
 		// Can somebody please tell me _why_ this solves
@@ -795,7 +748,6 @@ void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
 			y -= tmprow->height();
 		}
 	}
-#endif
 	
 	// we can set the refreshing parameters now
 	status(bview, LyXText::NEED_MORE_REFRESH);