InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

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

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index f8807f974cc00d0641c39679d9bf6631e41a02d1..421b106a69984e1b19fe39b4d0ffad6ca8e0974c 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -137,7 +137,7 @@ docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
 
 void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                InsetFloatParams params;
@@ -152,8 +152,11 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
                setNewLabel();
                if (params_.type != params.type) {
                        params_.type = params.type;
-                       buffer().updateLabels();
+                       cur.forceBufferUpdate();
                }
+               // what we really want here is a TOC update, but that means
+               // a full buffer update
+               cur.forceBufferUpdate();
                break;
        }
 
@@ -172,7 +175,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY:
        case LFUN_INSET_DIALOG_UPDATE:
@@ -192,7 +195,7 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype)
+void InsetFloat::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        Counters & cnts =
                buffer().masterBuffer()->params().documentClass().counters();
@@ -214,7 +217,7 @@ void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype)
        cnts.current_float(params().type);
        cnts.isSubfloat(subflt);
 
-       InsetCollapsable::updateLabels(it, utype);
+       InsetCollapsable::updateBuffer(it, utype);
 
        //reset afterwards
        cnts.current_float(saveflt);
@@ -427,14 +430,6 @@ bool InsetFloat::insetAllowed(InsetCode code) const
 }
 
 
-bool InsetFloat::showInsetDialog(BufferView * bv) const
-{
-       if (!InsetText::showInsetDialog(bv))
-               bv->showDialog("float");
-       return true;
-}
-
-
 void InsetFloat::setWide(bool w, bool update_label)
 {
        params_.wide = w;