From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Sat, 9 May 2009 16:53:51 +0000 (+0000)
Subject: * disable some invalid insets in description items (covers bug 5937).
X-Git-Tag: 2.0.0~6632
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=74784942ede81fd33c0433eb717bed0e2697339a;p=features.git

* disable some invalid insets in description items (covers bug 5937).

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

diff --git a/src/Text3.cpp b/src/Text3.cpp
index c7392600e1..c7fadab79d 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -2071,8 +2071,11 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_DIALOG_SHOW_NEW_INSET:
 		if (cmd.argument() == "bibitem")
 			code = BIBITEM_CODE;
-		else if (cmd.argument() == "bibtex")
+		else if (cmd.argument() == "bibtex") {
 			code = BIBTEX_CODE;
+			// not allowed in description items
+			enable = !inDescriptionItem(cur);
+		}
 		else if (cmd.argument() == "box")
 			code = BOX_CODE;
 		else if (cmd.argument() == "branch")
@@ -2147,6 +2150,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	case LFUN_FLOAT_LIST_INSERT:
 		code = FLOAT_LIST_CODE;
+		// not allowed in description items
+		enable = !inDescriptionItem(cur);
 		break;
 	case LFUN_CAPTION_INSERT:
 		code = CAPTION_CODE;
@@ -2201,6 +2206,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	case LFUN_INDEX_PRINT:
 		code = INDEX_PRINT_CODE;
+		// not allowed in description items
+		enable = !inDescriptionItem(cur);
 		break;
 	case LFUN_NOMENCL_INSERT:
 		if (cur.selIsMultiCell() || cur.selIsMultiLine()) {
@@ -2211,9 +2218,13 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	case LFUN_NOMENCL_PRINT:
 		code = NOMENCL_PRINT_CODE;
+		// not allowed in description items
+		enable = !inDescriptionItem(cur);
 		break;
 	case LFUN_TOC_INSERT:
 		code = TOC_CODE;
+		// not allowed in description items
+		enable = !inDescriptionItem(cur);
 		break;
 	case LFUN_HYPERLINK_INSERT:
 		if (cur.selIsMultiCell() || cur.selIsMultiLine()) {