add ParagraphList::erase, make mergeParagraph take a Buffer* arg, adjust other funcs...

[features.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 2bc417722464ac5af9947a4e3e05a304f7b39e98..77462f1e936dcc2c5e0fe2e4f7f151297edd5893 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -154,8 +154,10 @@ void breakParagraphConservative(BufferParams const & bparams,
 }
 
 
-void mergeParagraph(BufferParams const & bparams, ParagraphList::iterator par)
+void mergeParagraph(Buffer * buf, ParagraphList::iterator par)
 {
+       BufferParams const & bparams = buf->params;
+
        ParagraphList::iterator the_next = boost::next(par);
 
        // first the DTP-stuff
@@ -173,13 +175,7 @@ void mergeParagraph(BufferParams const & bparams, ParagraphList::iterator par)
                        ++j;
        }
 
-       // delete the next paragraph
-#warning a ParagraphList::erase is needed. (Lgb)
-       // Isn't this really just par?
-       ParagraphList::iterator ppar = boost::prior(the_next);
-       ParagraphList::iterator npar = boost::next(the_next);
-       delete &*the_next;
-       ppar->next(&*npar);
+       buf->paragraphs.erase(the_next);
 }