remove more forms.h cruft

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index 41dbf70b93ec294583343e5329e8ae2f16f879d7..5b0989c6b629fc6c4e3dfe8e360805815c124638 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -115,27 +115,26 @@ Paragraph::Paragraph(Paragraph const & lp)
        itemdepth = 0;
        next_ = 0;
        previous_ = 0;
-       clear();
-
-       makeSameLayout(&lp);
 
        // this is because of the dummy layout of the paragraphs that
        // follow footnotes
        layout = lp.layout;
 
         // ale970302
-       if (lp.bibkey)
+       if (lp.bibkey) {
                bibkey = static_cast<InsetBibKey *>
                        (lp.bibkey->clone(*current_view->buffer()));
-       else
+       } else {
                bibkey = 0;
+       }
        
        // copy everything behind the break-position to the new paragraph
 
        insetlist = lp.insetlist;
        for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it)
+            it != insetlist.end(); ++it) {
                it->inset = it->inset->clone(*current_view->buffer());
+       }
 }
 
 
@@ -921,10 +920,8 @@ void Paragraph::breakParagraph(BufferParams const & bparams,
 void Paragraph::makeSameLayout(Paragraph const * par)
 {
        layout = par->layout;
-       params().makeSame(par->params());
-       
-       // This can be changed after NEW_INSETS is in effect. (Lgb)
-       setLabelWidthString(par->params().labelWidthString());
+       // move to pimpl?
+       params() = par->params();
 }
 
 
@@ -2004,7 +2001,7 @@ void  Paragraph::id(int id_arg)
 }
 
 
-LyXTextClass::size_type Paragraph::getLayout() const
+LyXTextClass::LayoutList::size_type Paragraph::getLayout() const
 {
        return layout;
 }