From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 10 May 2016 09:17:43 +0000 (+0200)
Subject: Disable LFUN_INSET_DISSOLVE in tabulars
X-Git-Tag: 2.2.2~132
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=67f77a07f0e82f5f7a4317700d80018f92974568;p=features.git

Disable LFUN_INSET_DISSOLVE in tabulars

When in a tabular cell, "this" is just a lone InsetText, while cur.inset() is the whole tabular. This makes a big difference, especially when one wants to count cells.

Fixes bug #9954.

(cherry picked from commit 4caf167dbd24722421ae8d94a2c103bf41a7667d)
---

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 80b0bac013..660826309f 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -293,7 +293,8 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 		bool const main_inset = &buffer().inset() == this;
 		bool const target_inset = cmd.argument().empty() 
 			|| cmd.getArg(0) == insetName(lyxCode());
-		bool const one_cell = nargs() == 1;
+		// cur.inset() is the tabular when this is a single cell (bug #9954)
+		bool const one_cell = cur.inset().nargs() == 1;
 
 		if (!main_inset && target_inset && one_cell) {
 			// Text::dissolveInset assumes that the cursor
@@ -325,7 +326,8 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
 		bool const main_inset = &buffer().inset() == this;
 		bool const target_inset = cmd.argument().empty() 
 			|| cmd.getArg(0) == insetName(lyxCode());
-		bool const one_cell = nargs() == 1;
+		// cur.inset() is the tabular when this is a single cell (bug #9954)
+		bool const one_cell = cur.inset().nargs() == 1;
 
 		if (target_inset)
 			status.setEnabled(!main_inset && one_cell);
diff --git a/status.22x b/status.22x
index df2825567c..933f75c442 100644
--- a/status.22x
+++ b/status.22x
@@ -71,7 +71,10 @@ What's new
 
 - Raise GuiView on buffer switch to bring it topmost in multi-window mode.
 
-- Fix cursor position after Redo of a document settings change (bug 10097).
+- Fix cursor position after Redo of a document settings change (bug
+  10097).
+
+- Disable Edit>Dissolve Inset in tabulars (bug 9954).
 
 - Shortcut preferences: ask the user for removing bindings when using the
   "restore" button (#9174).