From: Jürgen Vigna <jug@sad.it>
Date: Thu, 21 Oct 1999 12:39:45 +0000 (+0000)
Subject: Two small bugfixes for tabulars and cursor setting
X-Git-Tag: 1.6.10~22592
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=93cba756296858deb056d98891d839c8e3898c67;p=features.git

Two small bugfixes for tabulars and cursor setting


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

diff --git a/ChangeLog b/ChangeLog
index 7c76ce5d0e..030476af08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-10-21  Juergen Vigna  <jug@sad.it>
+
+	* src/table.C (SetPWidth): Just a small fix so the alignment is not
+	set to left if I just remove the width entry (or it is empty).
+
+	* src/text2.C (SetCursorIntern): Fixed a bug calculating to use wrong
+	paragraph when having dummy paragraphs.
+
 1999-10-20  Juergen Vigna  <jug@sad.it>
 
 	* src/insets/figinset.C: just commented some fl_free_form calls
diff --git a/src/table.C b/src/table.C
index 1153146445..bd6ff67a1d 100644
--- a/src/table.C
+++ b/src/table.C
@@ -601,7 +601,8 @@ bool LyXTable::SetPWidth(int cell, string width)
         cellinfo_of_cell(fvcell)->p_width = width;
     } else {
         column_info[column_of_cell(fvcell)].p_width = width;
-        SetAlignment(cell,LYX_ALIGN_LEFT);
+	if (!width.empty()) // do this only if there is a width
+		SetAlignment(cell,LYX_ALIGN_LEFT);
     }
     return true;
 }
diff --git a/src/text2.C b/src/text2.C
index 1c5848950b..6515b58c7a 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -2807,11 +2807,15 @@ void LyXText::SetCursorIntern(LyXParagraph *par, int pos)
 		pos = par->PositionInParFromPos(pos);
 		par = tmppar;
 	}
-	if (par->IsDummy() && par->previous && 
+	if (par->IsDummy() && par->previous &&
 	    par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
-		while (par->previous && 
-		       par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE){
+		while (par->previous &&
+		       ((par->previous->IsDummy() && par->previous->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) ||
+			(par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE))) {
 			par = par->previous ;
+			if (par->IsDummy() &&
+			    par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
+				pos += par->last + 1;
 		}
 		if (par->previous) {
 			par = par->previous;