Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 373ee6c01b80f31833daacc0e5112e708e9c2466..c4562e51c22bfed91fcda15451cf48b9f9a6e190 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -69,7 +69,7 @@ typedef limited_stack<pair<ParagraphList, textclass_type> > CutStack;
 CutStack theCuts(10);
 
 // store whether the tabular stack is newer than the normal copy stack
-// FIXME: this is a workaround for bug 1919. Should be removed for 1.5, 
+// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
 // when we (hopefully) have a one-for-all paste mechanism.
 bool dirty_tabular_stack_;
 
@@ -105,9 +105,9 @@ bool checkPastePossible(int index)
 
 
 pair<PitPosPair, pit_type>
-pasteSelectionHelper(Buffer const & buffer, 
+pasteSelectionHelper(Buffer const & buffer,
                     ParagraphList & pars, pit_type pit, int pos,
-                    ParagraphList const & parlist, textclass_type textclass, 
+                    ParagraphList const & parlist, textclass_type textclass,
                     ErrorList & errorlist)
 {
        if (parlist.empty())
@@ -139,7 +139,7 @@ pasteSelectionHelper(Buffer const & buffer,
        }
 
        // Make sure there is no class difference.
-       lyx::cap::SwitchBetweenClasses(textclass, tc, insertion, errorlist);
+       lyx::cap::switchBetweenClasses(textclass, tc, insertion, errorlist);
 
        ParagraphList::iterator tmpbuf = insertion.begin();
        int depth_delta = pars[pit].params().depth() - tmpbuf->params().depth();
@@ -216,15 +216,15 @@ pasteSelectionHelper(Buffer const & buffer,
        if (empty) {
                pars.insert(boost::next(pars.begin(), pit),
                            insertion.begin(),
-                           insertion.end());
+                           insertion.end());
 
                // merge the empty par with the last par of the insertion
                mergeParagraph(buffer.params(), pars,
-                              pit + insertion.size() - 1);
+                              pit + insertion.size() - 1);
        } else {
                pars.insert(boost::next(pars.begin(), pit + 1),
                            insertion.begin(),
-                           insertion.end());
+                           insertion.end());
 
                // merge the first par of the insertion with the current par
                mergeParagraph(buffer.params(), pars, pit);
@@ -262,12 +262,12 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
        pit_type startpit, pit_type endpit,
        int startpos, int endpos, bool doclear)
 {
-        // Start of selection is really invalid.
+       // Start of selection is really invalid.
        if (startpit == pit_type(pars.size()) ||
            (startpos > pars[startpit].size()))
                return PitPosPair(endpit, endpos);
 
-        // Start and end is inside same paragraph
+       // Start and end is inside same paragraph
        if (endpit == pit_type(pars.size()) ||
            startpit == endpit) {
                endpos -= pars[startpit].erase(startpos, endpos);
@@ -296,7 +296,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
                        --endpit;
                        if (pit == endpit)
                                endpos += thissize;
-               } else 
+               } else
                        ++pit;
        }
 
@@ -350,7 +350,7 @@ string grabAndEraseSelection(LCursor & cur)
 }
 
 
-void SwitchBetweenClasses(textclass_type c1, textclass_type c2,
+void switchBetweenClasses(textclass_type c1, textclass_type c2,
        ParagraphList & pars, ErrorList & errorlist)
 {
        BOOST_ASSERT(!pars.empty());
@@ -584,8 +584,8 @@ std::string getSelection(Buffer const & buf, size_t sel_index)
 }
 
 
-void pasteParagraphList(LCursor & cur, ParagraphList const & parlist, 
-                        textclass_type textclass)
+void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
+                       textclass_type textclass)
 {
        if (cur.inTexted()) {
                LyXText * text = cur.text();
@@ -599,10 +599,10 @@ void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
 
                boost::tie(ppp, endpit) =
                        pasteSelectionHelper(cur.buffer(),
-                                             text->paragraphs(),
-                                             cur.pit(), cur.pos(),
-                                             parlist, textclass,
-                                             el);
+                                            text->paragraphs(),
+                                            cur.pit(), cur.pos(),
+                                            parlist, textclass,
+                                            el);
                bufferErrors(cur.buffer(), el);
                updateCounters(cur.buffer());
                cur.clearSelection();