Move isMultiCell() to Cursor, and use it.

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 0e8ab19dc6bd3cc3ee7484334c56e4723dbd93c9..09d7a49797d772b6b57785e9f5b1d98c7a27d25c 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -21,13 +21,13 @@
 #include "DispatchResult.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "TextClass.h"
 
 #include "support/debug.h"
+#include "support/gettext.h"
 #include "support/Translator.h"
 
 #include "frontends/Application.h"
@@ -96,8 +96,8 @@ BoxTranslatorLoc const & boxtranslator_loc()
 InsetBox::InsetBox(Buffer const & buffer, string const & label)
        : InsetCollapsable(buffer), params_(label)
 {
-       if (forceEmptyLayout())
-               paragraphs().back().setLayout(buffer.params().documentClass().emptyLayout());
+       if (forcePlainLayout())
+               paragraphs().back().setLayout(buffer.params().documentClass().plainLayout());
 }
 
 
@@ -176,7 +176,7 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 }
 
 
-bool InsetBox::forceEmptyLayout(idx_type) const
+bool InsetBox::forcePlainLayout(idx_type) const
 {
        return !params_.inner_box && params_.type != "Framed";
 }
@@ -223,18 +223,17 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "changetype")
                        flag.setOnOff(cmd.getArg(1) == params_.type);
-               else
-                       flag.enabled(true);
+               flag.setEnabled(true);
                return true;
 
        case LFUN_INSET_DIALOG_UPDATE:
-               flag.enabled(true);
+               flag.setEnabled(true);
                return true;
 
        case LFUN_BREAK_PARAGRAPH:
                if (params_.inner_box || params_.type == "Framed")
                        return InsetCollapsable::getStatus(cur, cmd, flag);
-               flag.enabled(false);
+               flag.setEnabled(false);
                return true;
 
        default: