Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 42ee4e5358a13366ea557c4e447c9b04e8320f62..f907f329bef8a29c174a0f99682c60dcb0a4cdc2 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -192,7 +192,7 @@ LyXFont LyXText::getFont(Paragraph const & par, pos_type const pos) const
        if (!isMainText())
                applyOuterFont(font);
 
-       // Find the pit value belonging to paragraph. This will not break 
+       // Find the pit value belonging to paragraph. This will not break
        // even if pars_ would not be a vector anymore.
        // Performance appears acceptable.
 
@@ -648,7 +648,7 @@ void LyXText::insertStringAsParagraphs(LCursor & cur, string const & str)
                                linestr[i] = ' ';
                                newline_inserted = true;
                        }
-               } else if (IsPrintable(linestr[i])) {
+               } else if (isPrintable(linestr[i])) {
                        newline_inserted = false;
                }
        }
@@ -954,7 +954,7 @@ InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
        // This should be just before or just behind the
        // cursor position set above.
        BOOST_ASSERT((pos != 0 && inset == pars_[pit].getInset(pos - 1))
-                    || inset == pars_[pit].getInset(pos));
+                    || inset == pars_[pit].getInset(pos));
        // Make sure the cursor points to the position before
        // this inset.
        if (inset == pars_[pit].getInset(pos - 1))
@@ -1258,12 +1258,12 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
                           max(old.pit() - 1, pit_type(0)),
                           min(old.pit() + 1, old.lastpit()));
                ParagraphList & plist = old.text()->paragraphs();
-               plist.erase(plist.begin() + old.pit());
+               plist.erase(boost::next(plist.begin(), old.pit()));
 
                // see #warning above
                if (cur.depth() >= old.depth()) {
                        CursorSlice & curslice = cur[old.depth() - 1];
-                       if (&curslice.inset() == &old.inset() 
+                       if (&curslice.inset() == &old.inset()
                            && curslice.pit() > old.pit()) {
                                --curslice.pit();
                                // since a paragraph has been deleted, all the
@@ -1274,7 +1274,9 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
                                cur.resetAnchor();
                        }
                }
-               updateCounters(old.buffer());
+               ParIterator par_it(old);
+               if (needsUpdateCounters(old.buffer(), par_it))
+                       updateCounters(old.buffer());
                return true;
        }