anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better fix for bug #5754: Caption inset not dissolved when unsetting longtable caption.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32153 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-11-22 17:10:56 +00:00
parent a2701141ac
commit 8384fa4123
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/insets/InsetTabular.cpp
View File

@ -1800,8 +1800,6 @@ Tabular::idx_type Tabular::setLTCaption(row_type row, bool what)
unsetMultiColumn(i);
// When unsetting a caption row, also all existing
// captions in this row must be dissolved.
lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN));
lyx::dispatch(FuncRequest(LFUN_INSET_DISSOLVE, "caption"));
}
row_info[row].caption = what;
return i;
@ -4876,15 +4874,21 @@ void InsetTabular::tabularFeatures(Cursor & cur,
break;
case Tabular::TOGGLE_LTCAPTION: {
bool set = !tabular.ltCaption(row);
bool const set = !tabular.ltCaption(row);
cur.idx() = tabular.setLTCaption(row, set);
cur.pit() = 0;
cur.pos() = 0;
cur.setSelection(false);
// When a row is set as caption, then also insert a caption. Otherwise
// the LaTeX output is broken, when the user doesn't add a caption.
if (set)
// When a row is set as caption, then also insert
// a caption. Otherwise the LaTeX output is broken.
lyx::dispatch(FuncRequest(LFUN_CAPTION_INSERT));
else {
FuncRequest fr(LFUN_INSET_DISSOLVE, "caption");
if (lyx::getStatus(fr).enabled())
lyx::dispatch(fr);
}
break;
}