From d553938c92353ce5d8ec96390df04d97853601be Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Tue, 9 Dec 2014 21:19:49 +0100 Subject: [PATCH] Improve and unify error messages Now the errors given for an unknown layout in copystyle and obsoletedby provide the same information. --- src/insets/InsetLayout.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index ee415b1b9b..98f9775d8d 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -321,7 +321,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass) name_ = tmpname; } else { LYXERR0("Cannot copy unknown InsetLayout `" - << style << "'\n" + << style << "' to InsetLayout `" + << name() << "'\n" << "All InsetLayouts so far:"); TextClass::InsetLayouts::const_iterator lit = tclass.insetLayouts().begin(); @@ -348,8 +349,17 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass) if (obsoleted_by().empty()) obsoleted_by_ = style; } else { - LYXERR0("Cannot replace with unknown InsetLayout `" - << style << '\''); + LYXERR0("Cannot replace InsetLayout `" + << name() + << "' with unknown InsetLayout `" + << style << "'\n" + << "All InsetLayouts so far:"); + TextClass::InsetLayouts::const_iterator lit = + tclass.insetLayouts().begin(); + TextClass::InsetLayouts::const_iterator len = + tclass.insetLayouts().end(); + for (; lit != len; ++lit) + lyxerr << lit->second.name() << "\n"; } break; } -- 2.39.2