X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FParagraphParameters.cpp;h=72b2286b1284588385a5adaa924fa863dbae2f14;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=90c8705e898d831d4b09feb34f8c7335a3c13410;hpb=eea4ef9b6e8c103b8d77fb456214a116c68f58a7;p=lyx.git diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp index 90c8705e89..72b2286b12 100644 --- a/src/ParagraphParameters.cpp +++ b/src/ParagraphParameters.cpp @@ -16,13 +16,12 @@ #include "ParagraphParameters.h" -#include "Buffer.h" -#include "support/gettext.h" #include "Layout.h" #include "Lexer.h" -#include "Text.h" #include "Paragraph.h" +#include "support/debug.h" +#include "support/docstring.h" #include "support/lstrings.h" #include @@ -169,7 +168,7 @@ void ParagraphParameters::leftIndent(Length const & li) } -void ParagraphParameters::read(string str, bool merge) +void ParagraphParameters::read(string const & str, bool merge) { istringstream is(str); Lexer lex; @@ -245,14 +244,14 @@ void ParagraphParameters::read(Lexer & lex, bool merge) void ParagraphParameters::apply( - ParagraphParameters const & p, Layout const & layout) + ParagraphParameters const & params, Layout const & layout) { - spacing(p.spacing()); + spacing(params.spacing()); // does the layout allow the new alignment? - if (p.align() & layout.alignpossible) - align(p.align()); - labelWidthString(p.labelWidthString()); - noindent(p.noindent()); + if (params.align() & layout.alignpossible) + align(params.align()); + labelWidthString(params.labelWidthString()); + noindent(params.noindent()); }