More fixes to the autocollapsing of paragraphs.

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index 94662b1424b4f10a2372d4af80c0b68f4c31e026..de831a0d210f461e9f038c4f6cf20cbc890b60f1 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -89,7 +89,7 @@ Paragraph::Paragraph()
 }
 
 
-// This construktor inserts the new paragraph in a list.
+// This constructor inserts the new paragraph in a list.
 Paragraph::Paragraph(Paragraph * par)
        : layout(0), pimpl_(new Paragraph::Pimpl(this))
 {
@@ -140,6 +140,8 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
             it != insetlist.end(); ++it)
        {
                it->inset = it->inset->clone(*current_view->buffer(), same_ids);
+               // tell the new inset who is the boss now
+               it->inset->parOwner(this);
        }
 }
 
@@ -438,6 +440,8 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
                                            search_elem, Pimpl::matchIT());
                        if (it != insetlist.end() && it->pos == pos)
                                it->inset = 0;
+                       // the inset is not in a paragraph anymore
+                       minibuffer_inset->parOwner(0);
                } else {
                        minibuffer_inset = 0;
                        minibuffer_char = ' ';
@@ -1193,7 +1197,7 @@ int Paragraph::autoDeleteInsets()
        while (index < insetlist.size()) {
                if (insetlist[index].inset && insetlist[index].inset->autoDelete()) {
                        erase(insetlist[index].pos); 
-                       // Erase() calls to insetlist.erase(&insetlist[index])
+                       // erase() calls to insetlist.erase(&insetlist[index])
                        // so index shouldn't be increased.
                        ++count;
                } else
@@ -1215,7 +1219,7 @@ Paragraph::InsetIterator(pos_type pos)
 
 
 // returns -1 if inset not found
-int Paragraph::getPositionOfInset(Inset * inset) const
+int Paragraph::getPositionOfInset(Inset const * inset) const
 {
        // Find the entry.
        for (InsetList::const_iterator cit = insetlist.begin();