From efbf10c5ad4b086f8b344d086000487a0eeb67c4 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 9 Aug 2008 15:26:06 +0000 Subject: [PATCH] Fix my fix for nomencl-insert. The previous one was just a thinko. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26108 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Text3.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Text3.cpp b/src/Text3.cpp index e116e3ed89..13e3669e8a 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -1432,14 +1432,18 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_NOMENCL_INSERT: { InsetCommandParams p(NOMENCL_CODE); - docstring const content = cmd.argument().empty() ? - bv->cursor().innerText()->getStringToIndex(bv->cursor()) : - cmd.argument(); - p["symbol"] = content; - string const data = InsetCommand::params2string("nomenclature", p); - if (p["symbol"].empty()) { + if (cmd.argument().empty()) { + p["symbol"] = bv->cursor().innerText()->getStringToIndex(bv->cursor()); + string const data = InsetCommand::params2string("nomenclature", p); bv->showDialog("nomenclature", data); - } else { + break; + } + // this back and forth checks the validity of the data + InsetCommand::string2params("nomenclature", to_utf8(cmd.argument()), p); + string const data = InsetCommand::params2string("nomenclature", p); + if (p["symbol"].empty() || p["description"].empty()) + bv->showDialog("nomenclature", data); + else { FuncRequest fr(LFUN_INSET_INSERT, data); dispatch(cur, fr); }