Refactor decodeInsetParam

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 23658747804fcb1b6b678386a502268f4e579683..ec632d86e66c8d01d899c14b036c2b52e04f4449 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -306,6 +306,7 @@ bool decodeInsetParam(string const & name, string & data,
        switch (code) {
        case BIBITEM_CODE:
        case BIBTEX_CODE:
+       case CITE_CODE:
        case INDEX_PRINT_CODE:
        case LABEL_CODE:
        case LINE_CODE:
@@ -319,11 +320,6 @@ bool decodeInsetParam(string const & name, string & data,
                break;
        }
        case INCLUDE_CODE: {
-               // data is the include type: one of "include",
-               // "input", "verbatiminput" or "verbatiminput*"
-               if (data.empty())
-                       // default type is requested
-                       data = "include";
                data = InsetCommandParams(INCLUDE_CODE, data).toString();
                break;
        }
@@ -336,10 +332,6 @@ bool decodeInsetParam(string const & name, string & data,
                data = InsetBranchParams().toString();
                break;
        }
-       case CITE_CODE: {
-               data = InsetCommandParams(CITE_CODE).toString();
-               break;
-       }
        case ERT_CODE: {
                data = InsetERTParams().toString();
                break;

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 35b87e327eb8feed2aa2387be2b7100d0ccb152a..de5092ab82f78cae7bb92186c608f7ae858b6d27 100644 (file)
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -184,6 +184,8 @@ InsetCommandParams::InsetCommandParams(InsetCode code,
        string const & cmdName)
        : insetCode_(code), cmdName_(cmdName), preview_(false)
 {
+       if (cmdName_.empty())
+               cmdName_ = getDefaultCmd(code);
        info_ = findInfo(code, cmdName);
 }