From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 2 Nov 2009 04:31:06 +0000 (+0000)
Subject: Fix (partly) bug #5754: Caption inset not dissolved when unsetting longtable caption... 
X-Git-Tag: 2.0.0~5244
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=da8c15d4c389d4b13dc88ae56a12983642b5f8cd;p=features.git

Fix (partly) bug #5754: Caption inset not dissolved when unsetting longtable caption row.

This removes the caption-inset, which is made possible by the clean-up of the LFUN_INSET_DISSOLVE (see r31822 and r31756). This assumes that there is nothing else in the row than the caption inset. I think that should be the case, but this is not yet guaranteed.

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

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 7b13e010bc..f0c2073d99 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -1797,9 +1797,10 @@ Tabular::idx_type Tabular::setLTCaption(row_type row, bool what)
 		setRightLine(i, false);
 	} else {
 		unsetMultiColumn(i);
-		// FIXME: when unsetting a caption row, also all existing captions
-		// in this row must be dissolved, see (bug 5754)
-		// dispatch(FuncRequest(LFUN_INSET_DISSOLVE, "caption-insert"));
+		// When unsetting a caption row, also all existing
+		// captions in this row must be dissolved.
+		lyx::dispatch(FuncRequest(LFUN_INSET_BEGIN));
+		lyx::dispatch(FuncRequest(LFUN_INSET_DISSOLVE, "caption"));
 	}
 	row_info[row].caption = what;
 	return i;