Move the contents of a row into the caption when setting a row as a longtable caption.

[lyx.git] / src / insets / InsetTabular.cpp

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 476541f1e221e339038a3fc1775f2d1d39867050..9b0abc9690dd2f0ca0941f64170925bdfcdb47e2 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -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;
@@ -4763,6 +4761,14 @@ void InsetTabular::tabularFeatures(Cursor & cur,
                break;
 
        case Tabular::UNSET_LONGTABULAR:
+               for (row_type i = 0; i < tabular.row_info.size(); ++i) {
+                       if (tabular.ltCaption(i)) {
+                               cur.idx() = tabular.cellIndex(i, 0);
+                               cur.pit() = 0;
+                               cur.pos() = 0;
+                               tabularFeatures(cur, Tabular::TOGGLE_LTCAPTION);
+                       }
+               }
                tabular.is_long_tabular = false;
                break;
 
@@ -4876,15 +4882,22 @@ 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)
+
+               if (set) {
+                       // When a row is set as caption, then also insert
+                       // a caption. Otherwise the LaTeX output is broken.
+                       lyx::dispatch(FuncRequest(LFUN_INSET_SELECT_ALL));
                        lyx::dispatch(FuncRequest(LFUN_CAPTION_INSERT));
+               } else {
+                       FuncRequest fr(LFUN_INSET_DISSOLVE, "caption");
+                       if (lyx::getStatus(fr).enabled())
+                               lyx::dispatch(fr);
+               }
                break;
        }