Make it compile when USE_BOOST_FORMAT is unset

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

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index f07462f0f35da9313a80e60c908b04bddc07f860..f81d9b64b78b07617ceb1084ae61a5a8d5f49f38 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -1,11 +1,11 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *          Copyright 1998 The LyX Team.
+/**
+ * \file insetnote.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -28,20 +28,21 @@
 
 using std::ostream;
 
+
 void InsetNote::init()
 {
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        font.setColor(LColor::note);
        setLabelFont(font);
-       setBackgroundColor(LColor::note);
+       setBackgroundColor(LColor::notebg);
        setLabel(_("note"));
        setInsetName("Note");
 }
 
 
-InsetNote::InsetNote()
-       : InsetCollapsable()
+InsetNote::InsetNote(BufferParams const & bp)
+       : InsetCollapsable(bp)
 {
        init();
 }
@@ -61,14 +62,13 @@ Inset * InsetNote::clone(Buffer const &, bool same_id) const
 
 
 // This constructor is used for reading old InsetInfo
-InsetNote::InsetNote(Buffer const * buf, string const & contents, 
+InsetNote::InsetNote(Buffer const * buf, string const & contents,
                     bool collapsed)
-       : InsetCollapsable(collapsed)
+       : InsetCollapsable(buf->params, collapsed)
 {
        init();
 
        Paragraph * par = inset.paragraph();
-       Paragraph::pos_type pos = 0;
        LyXFont font(LyXFont::ALL_INHERIT, buf->params.language);
 
        // Since XForms doesn't support RTL, we can assume that old notes
@@ -76,11 +76,12 @@ InsetNote::InsetNote(Buffer const * buf, string const & contents,
        if (font.language()->RightToLeft())
                font.setLanguage(default_language);
 
-       buf->insertStringAsLines(par, pos, font, strip(contents, '\n'));
+       lyx::pos_type pos = 0;
+       buf->insertStringAsLines(par, pos, font, rtrim(contents, "\n"));
 }
 
 
-string const InsetNote::editMessage() const 
+string const InsetNote::editMessage() const
 {
        return _("Opened Note Inset");
 }