X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext2.C;h=0513d5181c24454afdcd574ff0d8553f070b2c41;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=7dcc542d63aadffa2033a2153388a3b0e55db1dc;hpb=1ce9a35c4d0d353702ea2650390eacdc1238ce86;p=lyx.git

diff --git a/src/text2.C b/src/text2.C
index 7dcc542d63..0513d5181c 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -352,7 +352,7 @@ void LyXText::setLayout(Buffer const & buffer, pit_type start, pit_type end,
 	for (pit_type pit = start; pit != end; ++pit) {
 		pars_[pit].applyLayout(lyxlayout);
 		if (lyxlayout->margintype == MARGIN_MANUAL)
-			pars_[pit].setLabelWidthString(lyxlayout->labelstring());
+			pars_[pit].setLabelWidthString(buffer.translateLabel(lyxlayout->labelstring()));
 	}
 }
 
@@ -604,7 +604,7 @@ docstring LyXText::getStringToIndex(LCursor const & cur)
 
 void LyXText::setParagraph(LCursor & cur,
 			   Spacing const & spacing, LyXAlignment align,
-			   string const & labelwidthstring, bool noindent)
+			   docstring const & labelwidthstring, bool noindent)
 {
 	BOOST_ASSERT(cur.text());
 	// make sure that the depth behind the selection are restored, too
@@ -628,8 +628,7 @@ void LyXText::setParagraph(LCursor & cur,
 			else
 				params.align(align);
 		}
-		// FIXME UNICODE
-		par.setLabelWidthString(from_ascii(labelwidthstring));
+		par.setLabelWidthString(labelwidthstring);
 		params.noindent(noindent);
 	}
 }
@@ -987,7 +986,7 @@ InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
 		return 0;
 	}
 
-	InsetBase * insetBefore = pars_[pit].getInset(pos - 1);
+	InsetBase * insetBefore = pos? pars_[pit].getInset(pos - 1): 0;
 	//InsetBase * insetBehind = pars_[pit].getInset(pos);
 
 	// This should be just before or just behind the