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

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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 6ebabf1ca57173617182ac7bacc14d9e08ec712c..4ee0f7eed733985de182628f1332619bb30a129f 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -77,7 +77,7 @@ docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const
 
 void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
        case LFUN_INSET_MODIFY: {
                InsetWrapParams params;
                InsetWrap::string2params(to_utf8(cmd.argument()), params);
@@ -102,7 +102,7 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
        case LFUN_INSET_MODIFY:
        case LFUN_INSET_DIALOG_UPDATE:
                flag.setEnabled(true);
@@ -114,20 +114,26 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetWrap::updateLabels(ParIterator const & it, bool out)
+void InsetWrap::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        setLabel(_("wrap: ") + floatName(params_.type));
        Counters & cnts =
                buffer().masterBuffer()->params().documentClass().counters();
+       if (utype == OutputUpdate) {
+               // counters are local to the wrap
+               cnts.saveLastCounter();
+       }
        string const saveflt = cnts.current_float();
 
        // Tell to captions what the current float is
        cnts.current_float(params().type);
 
-       InsetCollapsable::updateLabels(it, out);
+       InsetCollapsable::updateBuffer(it, utype);
 
        // reset afterwards
        cnts.current_float(saveflt);
+       if (utype == OutputUpdate)
+               cnts.restoreLastCounter();
 }