This optional argument to the InsetCollapsable constructor

[lyx.git] / src / ParagraphParameters.cpp

diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp
index d0d4b261278f61fa21450865f68a4b600eacaf79..6df71ee1c532754998ec6b4b95e44c3d7b4c94e8 100644 (file)
--- a/src/ParagraphParameters.cpp
+++ b/src/ParagraphParameters.cpp
@@ -172,7 +172,7 @@ void ParagraphParameters::leftIndent(Length const & li)
 void ParagraphParameters::read(string str, bool merge)
 {
        istringstream is(str);
-       Lexer lex(0, 0);
+       Lexer lex;
        lex.setStream(is);
        read(lex, merge);
 }
@@ -256,15 +256,6 @@ void ParagraphParameters::apply(
 }
 
 
-//FIXME This needs to be made a real method, so that getStatus()
-//can return sensible information.
-bool ParagraphParameters::canApply(
-       ParagraphParameters const & /*params*/, Layout const & /*layout*/)
-{
-       return true;
-}
-
-
 void ParagraphParameters::write(ostream & os) const
 {
        // Maybe the paragraph has special spacing
@@ -312,13 +303,13 @@ void params2string(Paragraph const & par, string & data)
        ostringstream os;
        params.write(os);
 
-       LayoutPtr const & layout = par.layout();
+       Layout const & layout = par.layout();
 
        // Is alignment possible
-       os << "\\alignpossible " << layout->alignpossible << '\n';
+       os << "\\alignpossible " << layout.alignpossible << '\n';
 
        /// set default alignment
-       os << "\\aligndefault " << layout->align << '\n';
+       os << "\\aligndefault " << layout.align << '\n';
 
        /// paragraph is always in inset. This is redundant.
        os << "\\ininset " << 1 << '\n';