From: Stefan Schimanski <sts@lyx.org>
Date: Tue, 4 Mar 2008 09:47:11 +0000 (+0000)
Subject: * fix sorting of layout names
X-Git-Tag: 1.6.10~5912
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b36c8ae173bb2010094df3ad389a421fedb1dc5e;p=features.git

* fix sorting of layout names


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

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 72f090b220..76cdefe45b 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -421,8 +421,10 @@ void GuiLayoutBox::set(docstring const & layout)
 void GuiLayoutBox::addItemSort(docstring const & item, bool sorted)
 {
 	QString qitem = toqstr(item);
+	QString titem = toqstr(translateIfPossible(item));
+
 	QList<QStandardItem *> row;
-	row.append(new QStandardItem(toqstr(translateIfPossible(item))));
+	row.append(new QStandardItem(titem));
 	row.append(new QStandardItem(qitem));
 
 	// the simple unsorted case
@@ -435,14 +437,14 @@ void GuiLayoutBox::addItemSort(docstring const & item, bool sorted)
 	// find row to insert the item
 	int i = 1; // skip the Standard layout
 	QString is = model_->item(i, 1)->text();
-	while (is.compare(qitem) < 0) {
+	while (is.compare(titem) < 0) {
 		// e.g. --Separator--
 		if (is[0].category() != QChar::Letter_Uppercase)
 			break;
 		++i;
 		if (i == end)
 			break;
-		QString is = model_->item(i, 1)->text();
+		is = model_->item(i, 1)->text();
 	}
 
 	model_->insertRow(i, row);