The "I want this in now" patch.

[lyx.git] / src / ParagraphParameters.C

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 70b002cfe630b052c48feeaf17a06c76b439beaa..2e95e9f56418dfaf8b4f8c2915be04e45ffa0f44 100644 (file)
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -7,9 +7,12 @@
 
 #include "buffer.h"
 #include "BufferView.h"
+#include "Lsstream.h"
 #include "gettext.h"
 #include "paragraph.h"
 #include "lyxtext.h"
+#include "Lsstream.h"
+
 #include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
@@ -418,7 +421,7 @@ void ParagraphParameters::write(ostream & os) const
 
 void setParagraphParams(BufferView & bv, string const & data)
 {
-       istringstream is(data);
+       istringstream is(STRCONV(data));
        LyXLex lex(0,0);
        lex.setStream(is);
 
@@ -426,8 +429,7 @@ void setParagraphParams(BufferView & bv, string const & data)
        params.read(lex);
 
        LyXText * text = bv.getLyXText();
-       text->setParagraph(&bv,
-                          params.lineTop(),
+       text->setParagraph(params.lineTop(),
                           params.lineBottom(),
                           params.pagebreakTop(),
                           params.pagebreakBottom(),
@@ -439,12 +441,7 @@ void setParagraphParams(BufferView & bv, string const & data)
                           params.noindent());
 
        // Actually apply these settings
-       bv.update(text,
-                 BufferView::SELECT |
-                 BufferView::FITCUR |
-                 BufferView::CHANGE);
-
-       bv.buffer()->markDirty();
+       bv.update(text, BufferView::SELECT);
 
        bv.owner()->message(_("Paragraph layout set"));
 }
@@ -473,7 +470,7 @@ void params2string(Paragraph const & par, string & data)
        os << "\\aligndefault " << layout->align << '\n';
 
        /// is paragraph in inset
-       os << "\\ininset " << par.inInset() << '\n';
+       os << "\\ininset " << (par.inInset()?1:0) << '\n';
 
-       data = os.str();
+       data = STRCONV(os.str());
 }