two fixes (posted to list)

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 7235db4f182c29538ce5b993dfad772ac9b6c158..c5b7171fa11e0ca64716a1b814ac7f9f64b147cf 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -62,6 +62,14 @@ void breakParagraph(BufferParams const & bparams,
 
                // copy everything behind the break-position
                // to the new paragraph
+
+#ifdef WITH_WARNINGS
+#warning this seems wrong
+#endif
+               /* FIXME: if !keepempty, empty() == true, then we reach
+                * here with size() == 0. So pos_end becomes - 1. Why
+                * doesn't this cause problems ???
+                */
                pos_type pos_end = par->size() - 1;
                pos_type i = pos;
                pos_type j = pos;
@@ -125,13 +133,8 @@ void breakParagraphConservative(BufferParams const & bparams,
 }
 
 
-// Be carefull, this does not make any check at all.
-// This method has wrong name, it combined this par with the next par.
-// In that sense it is the reverse of break paragraph. (Lgb)
-void pasteParagraph(BufferParams const & bparams,
-                   Paragraph * par)
+void mergeParagraph(BufferParams const & bparams, Paragraph * par)
 {
-       // copy the next paragraph to this one
        Paragraph * the_next = par->next();
 
        // first the DTP-stuff