Fix bug http://bugzilla.lyx.org/show_bug.cgi?id=4910 by creating InsetText::addToToc().

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index ab2649f70147c3f9bb7ea268a731bb4848ad2ad3..27bdd01690313d11f6d6411c5df8343e2b5c19e4 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -34,7 +34,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
@@ -641,7 +641,6 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_ACCENT_HUNGARIAN_UMLAUT:
        case LFUN_ACCENT_MACRON:
        case LFUN_ACCENT_OGONEK:
-       case LFUN_ACCENT_SPECIAL_CARON:
        case LFUN_ACCENT_TIE:
        case LFUN_ACCENT_TILDE:
        case LFUN_ACCENT_UMLAUT:
@@ -660,7 +659,7 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FILE_INSERT:
        case LFUN_FLEX_INSERT:
        case LFUN_FLOAT_INSERT:
-       case LFUN_FLOAT_LIST:
+       case LFUN_FLOAT_LIST_INSERT:
        case LFUN_FLOAT_WIDE_INSERT:
        case LFUN_FONT_BOLD:
        case LFUN_FONT_TYPEWRITER:
@@ -714,30 +713,30 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_TOC_INSERT:
        case LFUN_WRAP_INSERT:
                if (layout_->isPassThru()) {
-                       flag.enabled(false);
+                       flag.setEnabled(false);
                        return true;
                }
                return InsetText::getStatus(cur, cmd, flag);
 
        case LFUN_INSET_TOGGLE:
                if (cmd.argument() == "open")
-                       flag.enabled(status_ != Open);
+                       flag.setEnabled(status_ != Open);
                else if (cmd.argument() == "close")
-                       flag.enabled(status_ == Open);
+                       flag.setEnabled(status_ == Open);
                else if (cmd.argument() == "toggle" || cmd.argument().empty()) {
-                       flag.enabled(true);
+                       flag.setEnabled(true);
                        flag.setOnOff(status_ == Open);
                } else
-                       flag.enabled(false);
+                       flag.setEnabled(false);
                return true;
 
        case LFUN_LANGUAGE:
-               flag.enabled(!layout_->isForceLtr());
+               flag.setEnabled(!layout_->isForceLtr());
                return InsetText::getStatus(cur, cmd, flag);
 
        case LFUN_BREAK_PARAGRAPH:
        case LFUN_BREAK_PARAGRAPH_SKIP:
-               flag.enabled(layout_->isMultiPar());
+               flag.setEnabled(layout_->isMultiPar());
                return true;
 
        default:
@@ -756,8 +755,10 @@ void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
 {
        status_ = status;
        setButtonLabel();
-       if (status_ == Collapsed)
+       if (status_ == Collapsed) {
                cur.leaveInset(*this);
+               mouse_hover_ = false;
+       }
 }