"Inter-word Space"

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index a998da958ce84f9b2f9cc5c36dd4b6f3e1553936..912538e72df177cbfbd221e84a672fd10dc0760e 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -63,16 +63,13 @@ Paragraph::Pimpl::Pimpl(Paragraph * owner)
 }
 
 
-Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner, bool same_ids)
+Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
        : params(p.params), owner_(owner)
 {
        inset_owner = p.inset_owner;
        text = p.text;
        fontlist = p.fontlist;
-       if (same_ids)
-               id_ = p.id_;
-       else
-               id_ = paragraph_id++;
+       id_ = paragraph_id++;
 
        if (p.tracking())
                changes_.reset(new Changes(*p.changes_.get()));
@@ -824,10 +821,10 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
        InsetList::iterator icit = owner_->insetlist.begin();
        InsetList::iterator iend = owner_->insetlist.end();
        for (; icit != iend; ++icit) {
-               if (icit.getInset()) {
-                       icit.getInset()->validate(features);
+               if (icit->inset) {
+                       icit->inset->validate(features);
                        if (layout.needprotect &&
-                           icit.getInset()->lyxCode() == Inset::FOOT_CODE)
+                           icit->inset->lyxCode() == Inset::FOOT_CODE)
                                features.require("NeedLyXFootnoteCode");
                }
        }