#7379 avoid the wrap spell check question when buffer is empty

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 832ab2dd9ea2fc818cbf80b69d706c9dcc757acb..1273ac9e082ccdce10556ce8ddccec4e43e845b6 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -182,7 +182,8 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 
 bool InsetBox::forcePlainLayout(idx_type) const
 {
-       return !params_.inner_box && params_.type != "Framed";
+       return (!params_.inner_box || params_.use_makebox)
+               && params_.type != "Shaded" && params_.type != "Framed";
 }
 
 
@@ -192,9 +193,10 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                //lyxerr << "InsetBox::dispatch MODIFY" << endl;
-               if (cmd.getArg(0) == "changetype")
+               cur.recordUndoInset(ATOMIC_UNDO, this);
+               if (cmd.getArg(0) == "changetype") {
                        params_.type = cmd.getArg(1);
-               else
+               } else
                        string2params(to_utf8(cmd.argument()), params_);
                setButtonLabel();
                break;
@@ -223,7 +225,8 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        case LFUN_BREAK_PARAGRAPH:
-               if (params_.inner_box || params_.type == "Framed")
+               if ((params_.inner_box && !params_.use_makebox)
+                    || params_.type == "Shaded" || params_.type == "Framed")
                        return InsetCollapsable::getStatus(cur, cmd, flag);
                flag.setEnabled(false);
                return true;
@@ -234,7 +237,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
+void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 {
        BoxType btype = boxtranslator().find(params_.type);
 
@@ -268,8 +271,10 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                }
        }
 
-       int i = 0;
-       os << "%\n";
+       os << safebreakln;
+       if (runparams.lastid != -1)
+               os.texrow().start(runparams.lastid, runparams.lastpos);
+
        // Adapt to column/text width correctly also if paragraphs indented:
        if (stdwidth)
                os << "\\noindent";
@@ -279,7 +284,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                break;
        case Framed:
                os << "\\begin{framed}%\n";
-               i += 1;
                break;
        case Boxed:
                os << "\\framebox";
@@ -365,15 +369,13 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                }
 
                os << "%\n";
-               ++i;
        } // end if inner_box
 
        if (btype == Shaded) {
                os << "\\begin{shaded}%\n";
-               ++i;
        }
 
-       i += InsetText::latex(os, runparams);
+       InsetText::latex(os, runparams);
 
        if (btype == Shaded)
                os << "\\end{shaded}";
@@ -404,10 +406,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
                // already done
                break;
        }
-
-       i += 2;
-
-       return i;
 }
 
 
@@ -528,7 +526,7 @@ void InsetBox::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBox::contextMenu(BufferView const &, int, int) const
+docstring InsetBox::contextMenuName() const
 {
        return from_ascii("context-box");
 }