X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext2.C;h=6515b58c7aef9fdf121a4a9ebebbf47c00046c52;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=b1bc3e4af01a706996990d967bc2442c9b080f07;hpb=35584afc1162dec2cf9fff79305e95cb3b75aefb;p=lyx.git

diff --git a/src/text2.C b/src/text2.C
index b1bc3e4af0..6515b58c7a 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -1463,7 +1463,7 @@ void LyXText::SetCounter(LyXParagraph *par)
 	}
    
 	if (!par->labelstring.empty()) {
-		par->labelstring.erase();
+		par->labelstring.clear();
 	}
    
 	if (layout->margintype == MARGIN_MANUAL) {
@@ -1489,13 +1489,13 @@ void LyXText::SetCounter(LyXParagraph *par)
 				if (!layout->labelstring.empty())
 					par->labelstring = layout->labelstring;
 				else
-					par->labelstring.erase();
+					par->labelstring.clear();
                         }
 			else {
 				if (!layout->labelstring_appendix.empty())
 					par->labelstring = layout->labelstring_appendix;
 				else
-					par->labelstring.erase();
+					par->labelstring.clear();
 			}
  
 			if (!par->appendix){
@@ -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;