changelogs

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

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 7b2332cc0d04060c0aa71b0046293067ca9ae5d4..edffe585ade7da28aff342fa2d4f14670d5c5708 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -17,9 +17,10 @@
 #include "dispatchresult.h"
 #include "funcrequest.h"
 #include "InsetList.h"
-#include "iterators.h"
 #include "lyxtext.h"
 #include "paragraph.h"
+#include "pariterator.h"
+#include "sgml.h"
 
 #include "frontends/LyXView.h"
 
@@ -39,7 +40,7 @@ InsetLabel::InsetLabel(InsetCommandParams const & p)
 {}
 
 
-std::auto_ptr<InsetBase> InsetLabel::clone() const
+std::auto_ptr<InsetBase> InsetLabel::doClone() const
 {
        return std::auto_ptr<InsetBase>(new InsetLabel(params()));
 }
@@ -91,25 +92,27 @@ void changeRefsIfUnique(BufferView & bv, string const & from, string const & to)
 } // namespace anon
 
 
-DispatchResult
-InsetLabel::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p;
                InsetCommandMailer::string2params("label", cmd.argument, p);
-               if (p.getCmdName().empty())
-                       return DispatchResult(false);
+               if (p.getCmdName().empty()) {
+                       cur.undispatched();
+                       break;
+               }
                if (p.getContents() != params().getContents())
                        changeRefsIfUnique(cur.bv(), params().getContents(),
                                                       p.getContents());
                setParams(p);
-               return DispatchResult(true, true);
+               break;
        }
 
        default:
-               return InsetCommand::priv_dispatch(cur, cmd);
+               InsetCommand::doDispatch(cur, cmd);
+               break;
        }
 }
 
@@ -130,17 +133,17 @@ int InsetLabel::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetLabel::linuxdoc(Buffer const &, ostream & os,
-                        OutputParams const &) const
+int InsetLabel::linuxdoc(Buffer const & buf, ostream & os,
+                        OutputParams const & runparams) const
 {
-       os << "<label id=\"" << getContents() << "\" >";
+       os << "<label id=\"" << sgml::cleanID(buf, runparams, getContents()) << "\" >";
        return 0;
 }
 
 
-int InsetLabel::docbook(Buffer const &, ostream & os,
-                       OutputParams const &) const
+int InsetLabel::docbook(Buffer const & buf, ostream & os,
+                       OutputParams const & runparams) const
 {
-       os << "<anchor id=\"" << getContents() << "\">";
+       os << "<!-- anchor id=\"" << sgml::cleanID(buf, runparams, getContents()) << "\" -->";
        return 0;
 }