From: Richard Heck <rgheck@comcast.net>
Date: Mon, 24 Mar 2008 18:56:12 +0000 (+0000)
Subject: Minor cleanup.
X-Git-Tag: 1.6.10~5457
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7d57b49746553bd9e35390b484baf87350f6e8a4;p=features.git

Minor cleanup.

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

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index dda821ceb2..2c90b17f93 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -773,16 +773,16 @@ void GuiLayoutBox::updateContents(bool reset)
 	model_->clear();
 	DocumentClass::const_iterator lit = text_class_->begin();
 	DocumentClass::const_iterator len = text_class_->end();
+
 	for (; lit != len; ++lit) {
 		docstring const & name = lit->name();
+		bool const useEmpty = inset_->forceEmptyLayout() || inset_->useEmptyLayout();
 		// if this inset requires the empty layout, we skip the default
 		// layout
-		if (name == text_class_->defaultLayoutName() && inset &&
-		    (inset->forceEmptyLayout() || inset->useEmptyLayout()))
+		if (name == text_class_->defaultLayoutName() && inset_ && useEmpty)
 			continue;
 		// if it doesn't require the empty layout, we skip it
-		if (name == text_class_->emptyLayoutName() && inset &&
-		    !inset->forceEmptyLayout() && !inset->useEmptyLayout())
+		if (name == text_class_->emptyLayoutName() && inset_ && !useEmpty)
 			continue;
 		addItemSort(name, lit->category(), lyxrc.sort_layouts, lyxrc.group_layouts);
 	}