Do not reset custom space values if accessed via context menu (#8847)

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

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 927980dcf301ce8e9f7f9a69444d68e26ca36e4f..f621172fe2b5ba28475212002d26c7250fbdf6c7 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -59,7 +59,12 @@ void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                cur.recordUndo();
-               InsetVSpace::string2params(to_utf8(cmd.argument()), space_);
+               string arg = to_utf8(cmd.argument());
+               if (arg == "vspace custom")
+                       arg = (space_.kind() == VSpace::LENGTH)
+                               ? "vspace " + space_.length().asString()
+                               : "vspace 1" + string(stringFromUnit(Length::defaultUnit()));
+               InsetVSpace::string2params(arg, space_);
                break;
        }
 
@@ -78,7 +83,12 @@ bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "vspace") {
                        VSpace vspace;
-                       InsetVSpace::string2params(to_utf8(cmd.argument()), vspace);
+                       string arg = to_utf8(cmd.argument());
+                       if (arg == "vspace custom")
+                               arg = (space_.kind() == VSpace::LENGTH)
+                               ? "vspace " + space_.length().asString()
+                               : "vspace 1" + string(stringFromUnit(Length::defaultUnit()));
+                       InsetVSpace::string2params(arg, vspace);
                        status.setOnOff(vspace == space_);
                } 
                status.setEnabled(true);
@@ -92,7 +102,7 @@ bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetVSpace::read(Lexer & lex)
 {
-       LASSERT(lex.isOK(), /**/);
+       LASSERT(lex.isOK(), return);
        string vsp;
        lex >> vsp;
        if (lex)