- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 125d173778a83911ab1d8fad3baba8420b19dbe0..f9c2ca623b45abe6fa494f00b4f6de5eaacdce75 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -66,7 +66,8 @@ typedef limited_stack<pair<ParagraphList, textclass_type> > CutStack;
 
 CutStack theCuts(10);
 
-struct resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
+class resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
+public:
        void operator()(Paragraph & p) const {
                p.cleanChanges();
                p.setInsetOwner(0);
@@ -151,8 +152,12 @@ pasteSelectionHelper(Buffer const & buffer, ParagraphList & pars,
                }
        }
 
-       // Make the buf exactly the same layout as the cursor paragraph.
-       insertion.begin()->makeSameLayout(pars[pit]);
+       bool const empty = pars[pit].empty();
+       if (!empty) {
+               // Make the buf exactly the same layout as the cursor
+               // paragraph.
+               insertion.begin()->makeSameLayout(pars[pit]);
+       }
 
        // Prepare the paragraphs and insets for insertion.
        // A couple of insets store buffer references so need updating.
@@ -182,15 +187,24 @@ pasteSelectionHelper(Buffer const & buffer, ParagraphList & pars,
        std::swap(in.paragraphs(), insertion);
 
        // Split the paragraph for inserting the buf if necessary.
-       bool did_split = false;
-       if (pars[pit].size() || pit + 1 == pit_type(pars.size())) {
+       if (!empty)
                breakParagraphConservative(buffer.params(), pars, pit, pos);
-               did_split = true;
-       }
 
        // Paste it!
-       pars.insert(pars.begin() + pit + 1, insertion.begin(), insertion.end());
-       mergeParagraph(buffer.params(), pars, pit);
+       if (empty) {
+               pars.insert(pars.begin() + pit, insertion.begin(),
+                           insertion.end());
+
+               // merge the empty par with the last par of the insertion
+               mergeParagraph(buffer.params(), pars,
+                              pit + insertion.size() - 1);
+       } else {
+               pars.insert(pars.begin() + pit + 1, insertion.begin(),
+                           insertion.end());
+
+               // merge the first par of the insertion with the current par
+               mergeParagraph(buffer.params(), pars, pit);
+       }
 
        pit_type last_paste = pit + insertion.size() - 1;
 
@@ -199,7 +213,7 @@ pasteSelectionHelper(Buffer const & buffer, ParagraphList & pars,
        pos = pars[last_paste].size();
 
        // Maybe some pasting.
-       if (did_split && last_paste + 1 != pit_type(pars.size())) {
+       if (!empty && last_paste + 1 != pit_type(pars.size())) {
                if (pars[last_paste + 1].hasSameLayout(pars[last_paste])) {
                        mergeParagraph(buffer.params(), pars, last_paste);
                } else if (pars[last_paste + 1].empty()) {
@@ -466,7 +480,6 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
                if (doclear)
                        text->paragraphs()[begpit].stripLeadingSpaces();
 
-               text->redoParagraphs(begpit, begpit + 1);
                // cutSelection can invalidate the cursor so we need to set
                // it anew. (Lgb)
                // we prefer the end for when tracking changes
@@ -564,8 +577,6 @@ void pasteSelection(LCursor & cur, size_t sel_index)
                bufferErrors(cur.buffer(), el);
                cur.bv().showErrorList(_("Paste"));
 
-               text->redoParagraphs(cur.pit(), endpit);
-
                cur.clearSelection();
                cur.resetAnchor();
                text->setCursor(cur, ppp.first, ppp.second);