* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / insetlabel.C

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 8cf00afa7614e2edc6bd6e4a67e88be0239eba85..3d995c3ea0085da9053c82672d54dbf8df5de48e 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -26,8 +26,10 @@
 #include "support/lyxalgo.h"
 #include "support/std_ostream.h"
 
-using lyx::docstring;
-using lyx::support::escape;
+
+namespace lyx {
+
+using support::escape;
 
 using std::string;
 using std::ostream;
@@ -47,15 +49,13 @@ std::auto_ptr<InsetBase> InsetLabel::doClone() const
 
 void InsetLabel::getLabelList(Buffer const &, std::vector<docstring> & list) const
 {
-       // FIXME UNICODE
-       list.push_back(lyx::from_utf8(getContents()));
+       list.push_back(getParam("name"));
 }
 
 
 docstring const InsetLabel::getScreenLabel(Buffer const &) const
 {
-       // FIXME UNICODE
-       return lyx::from_utf8(getContents());
+       return getParam("name");
 }
 
 
@@ -64,15 +64,16 @@ void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
        switch (cmd.action) {
 
        case LFUN_INSET_MODIFY: {
-               InsetCommandParams p;
-               InsetCommandMailer::string2params("label", lyx::to_utf8(cmd.argument()), p);
+               InsetCommandParams p("label");
+               // FIXME UNICODE
+               InsetCommandMailer::string2params("label", to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
                        cur.noUpdate();
                        break;
                }
-               if (p.getContents() != params().getContents())
-                       cur.bv().buffer()->changeRefsIfUnique(params().getContents(),
-                                                      p.getContents(), InsetBase::REF_CODE);
+               if (p["name"] != params()["name"])
+                       cur.bv().buffer()->changeRefsIfUnique(params()["name"],
+                                       p["name"], InsetBase::REF_CODE);
                setParams(p);
                break;
        }
@@ -84,7 +85,7 @@ void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
 }
 
 
-int InsetLabel::latex(Buffer const &, ostream & os,
+int InsetLabel::latex(Buffer const &, odocstream & os,
                      OutputParams const &) const
 {
        os << escape(getCommand());
@@ -92,18 +93,22 @@ int InsetLabel::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetLabel::plaintext(Buffer const &, lyx::odocstream & os,
+int InsetLabel::plaintext(Buffer const &, odocstream & os,
                      OutputParams const &) const
 {
-       // FIXME UNICODE
-       os << '<' << lyx::from_utf8(getContents()) << '>';
+       os << '<' << getParam("name") << '>';
        return 0;
 }
 
 
-int InsetLabel::docbook(Buffer const & buf, ostream & os,
+int InsetLabel::docbook(Buffer const & buf, odocstream & os,
                        OutputParams const & runparams) const
 {
-       os << "<!-- anchor id=\"" << sgml::cleanID(buf, runparams, getContents()) << "\" -->";
+       os << "<!-- anchor id=\""
+           << sgml::cleanID(buf, runparams, getParam("name"))
+           << "\" -->";
        return 0;
 }
+
+
+} // namespace lyx