Fix empty width support for Box inset

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

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 3d271a672d40c7d810cdcc89bd1412b92ee742eb..55ef4bf94fe38725344aa7ea683cc2eda4bdda3b 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -53,17 +53,12 @@ InsetVSpace::InsetVSpace(VSpace const & space)
 {}
 
 
-InsetVSpace::~InsetVSpace()
-{
-       hideDialogs("vspace", this);
-}
-
-
 void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
+               cur.recordUndo();
                InsetVSpace::string2params(to_utf8(cmd.argument()), space_);
                break;
        }
@@ -78,7 +73,7 @@ void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
        // we handle these
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "vspace") {
@@ -95,17 +90,9 @@ bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-bool InsetVSpace::showInsetDialog(BufferView * bv) const
-{
-       bv->showDialog("vspace", params2string(space()),
-               const_cast<InsetVSpace *>(this));
-       return true;
-}
-
-
 void InsetVSpace::read(Lexer & lex)
 {
-       LASSERT(lex.isOK(), /**/);
+       LASSERT(lex.isOK(), return);
        string vsp;
        lex >> vsp;
        if (lex)
@@ -214,14 +201,14 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-int InsetVSpace::latex(odocstream & os, OutputParams const &) const
+void InsetVSpace::latex(otexstream & os, OutputParams const &) const
 {
        os << from_ascii(space_.asLatexCommand(buffer().params())) << '\n';
-       return 1;
 }
 
 
-int InsetVSpace::plaintext(odocstream & os, OutputParams const &) const
+int InsetVSpace::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
        os << "\n\n";
        return PLAINTEXT_NEWLINE;
@@ -246,9 +233,9 @@ docstring InsetVSpace::xhtml(XHTMLStream &, OutputParams const &) const
 }
 
 
-docstring InsetVSpace::contextMenu(BufferView const &, int, int) const
+string InsetVSpace::contextMenuName() const
 {
-       return from_ascii("context-vspace");
+       return "context-vspace";
 }