anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable inset-dissolve in table cells

Browse Source 
This is better than making sure that the inset has exactly one cell.

In the future, inset-dissolve could be extended to dissolve all the
cells contents in the enclosing text.

Note that this check does not appear in mathed, and using dissolve in
e.g. fraction inset may lead to data loss (only current cell contents
is preserved).
This commit is contained in:
Jean-Marc Lasgouttes 2019-12-04 15:56:30 +01:00
parent 9d0548e877
commit 5ac3b88007
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/insets/InsetTabular.cpp
View File

@ -3989,6 +3989,9 @@ bool InsetTableCell::getStatus(Cursor & cur, FuncRequest const & cmd,
{
bool enabled = true;
switch (cmd.action()) {
case LFUN_INSET_DISSOLVE:
enabled = false;
break;
case LFUN_MATH_DISPLAY:
if (!hasFixedWidth()) {
enabled = false;

8
src/insets/InsetText.cpp
View File

@ -317,10 +317,8 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
bool const main_inset = text_.isMainText();
bool const target_inset = cmd.argument().empty()
|| cmd.getArg(0) == insetName(lyxCode());
// 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) {
if (!main_inset && target_inset) {
// Text::dissolveInset assumes that the cursor
// is inside the Inset.
if (&cur.inset() != this)
@ -350,11 +348,9 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
bool const main_inset = text_.isMainText();
bool const target_inset = cmd.argument().empty()
|| cmd.getArg(0) == insetName(lyxCode());
// 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);
status.setEnabled(!main_inset);
return target_inset;
}