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 80b0bac0134b2f48435805a9dd89cbf488a37158..660826309f33931a0121a51113a65a9c8a08c009 100644 (file)
--- 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 df2825567c3d71a89312825e402196b51bd9f208..933f75c442a049ecda487e303502eeb8305d7a43 100644 (file)
--- 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).