Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 77131a055b4a2e27c8913ded9c8777acddffdb7b..85eca0c305991174abcc5cdb594a14890b46ec76 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -261,8 +261,7 @@ Inset * InsetText::editXY(Cursor & cur, int x, int y)
 
 void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       LYXERR(Debug::ACTION, "InsetText::doDispatch()"
-               << " [ cmd.action() = " << cmd.action() << ']');
+       LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
 
        if (getLayout().isPassThru()) {
                // Force any new text to latex_language FIXME: This
@@ -848,18 +847,18 @@ void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
 }
 
 
-docstring InsetText::contextMenu(BufferView const &, int, int) const
+string InsetText::contextMenu(BufferView const &, int, int) const
 {
-       docstring context_menu = contextMenuName();
+       string context_menu = contextMenuName();
        if (context_menu != InsetText::contextMenuName())
                context_menu += ";" + InsetText::contextMenuName(); 
        return context_menu;
 }
 
 
-docstring InsetText::contextMenuName() const
+string InsetText::contextMenuName() const
 {
-       return from_ascii("context-edit");
+       return "context-edit";
 }