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

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

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index f6e69e6a333e06c7b068215f566f436b0a1f2bf3..c8f418bcb062c813609ddd6fbb050268e5090c1e 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -19,6 +19,8 @@
 #include "support/std_ostream.h"
 
 
+namespace lyx {
+
 using std::string;
 using std::auto_ptr;
 using std::ostream;
@@ -27,18 +29,16 @@ using std::ostream;
 InsetMarginal::InsetMarginal(BufferParams const & bp)
        : InsetFootlike(bp)
 {
-       // FIXME UNICODE
-       setLabel(lyx::to_utf8(_("margin")));
-       setInsetName("Marginal");
+       setLabel(_("margin"));
+       setInsetName(from_ascii("Marginal"));
 }
 
 
 InsetMarginal::InsetMarginal(InsetMarginal const & in)
        : InsetFootlike(in)
 {
-       // FIXME UNICODE
-       setLabel(lyx::to_utf8(_("margin")));
-       setInsetName("Marginal");
+       setLabel(_("margin"));
+       setInsetName(from_ascii("Marginal"));
 }
 
 
@@ -48,14 +48,13 @@ auto_ptr<InsetBase> InsetMarginal::doClone() const
 }
 
 
-string const InsetMarginal::editMessage() const
+docstring const InsetMarginal::editMessage() const
 {
-       // FIXME UNICODE
-       return lyx::to_utf8(_("Opened Marginal Note Inset"));
+       return _("Opened Marginal Note Inset");
 }
 
 
-int InsetMarginal::latex(Buffer const & buf, ostream & os,
+int InsetMarginal::latex(Buffer const & buf, odocstream & os,
                         OutputParams const & runparams) const
 {
        os << "%\n\\marginpar{";
@@ -64,7 +63,7 @@ int InsetMarginal::latex(Buffer const & buf, ostream & os,
        return i + 2;
 }
 
-int InsetMarginal::docbook(Buffer const & buf, ostream & os,
+int InsetMarginal::docbook(Buffer const & buf, odocstream & os,
                       OutputParams const & runparams) const
 {
        os << "<note role=\"margin\">";
@@ -73,3 +72,6 @@ int InsetMarginal::docbook(Buffer const & buf, ostream & os,
 
        return i;
 }
+
+
+} // namespace lyx