* GuiToolbar.cpp:

	- do not add "ObsoletedBy" layouts to the combo (bug 5083).

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

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 6a4f990b846155f10c695522663fb360b8d36529..ef5eca49073a558d186b3f181de56e87f353f9ac 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -625,6 +625,9 @@ void GuiLayoutBox::updateContents(bool reset)
                // if it doesn't require the empty layout, we skip it
                if (name == text_class_->emptyLayoutName() && inset_ && !useEmpty)
                        continue;
+               // obsoleted layouts are skipped as well
+               if (!lit->obsoleted_by().empty())
+                       continue;
                addItemSort(name, lit->category(), lyxrc.sort_layouts, 
                                lyxrc.group_layouts, lit->isUnknown());
        }