Initialize recently added forceownlines_ bool

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

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 92eb1a84fce8c81733457502364a57468d0a11ff..b2fbc690000652cf4e6bcd594beb9414565edd7b 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -80,7 +80,7 @@ InsetCommand::~InsetCommand()
 
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       button_.update(screenLabel(), editable() || hasSettings());
+       button_.update(screenLabel(), editable() || clickable(0, 0));
        button_.metrics(mi, dim);
 }
 
@@ -126,7 +126,8 @@ void InsetCommand::latex(otexstream & os, OutputParams const & runparams_in) con
 }
 
 
-int InsetCommand::plaintext(odocstream & os, OutputParams const &) const
+int InsetCommand::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
        docstring const str = "[" + buffer().B_("LaTeX Command: ")
                + from_utf8(getCmdName()) + "]";
@@ -210,9 +211,9 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-docstring InsetCommand::contextMenuName() const
+string InsetCommand::contextMenuName() const
 {
-       return from_ascii("context-") + from_ascii(insetName(p_.code()));
+       return "context-" + insetName(p_.code());
 }