]> git.lyx.org Git - lyx.git/blobdiff - src/CutAndPaste.cpp
* InsetListings.cpp:
[lyx.git] / src / CutAndPaste.cpp
index 8a71efb7748ea55f1c4ed3ccf53ae94e2e0dc579..07274a39a040158e90637523b7266c351d130a55 100644 (file)
@@ -29,7 +29,7 @@
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
-#include "LyXFunc.h"
+#include "LyX.h"
 #include "LyXRC.h"
 #include "Text.h"
 #include "Paragraph.h"
@@ -258,7 +258,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                                                        static_cast<InsetMathHull &>(*itt);
                                                // this is necessary to prevent an uninitialized
                                                // buffer when the RefInset is in a MathBox.
-                                               // FIXME audit setBuffer/updateLabels calls
+                                               // FIXME audit setBuffer/updateBuffer calls
                                                mi.setBuffer(const_cast<Buffer &>(buffer));
                                                if (mi.asRefInset()->getTarget() == oldname)
                                                        mi.asRefInset()->changeTarget(newname);
@@ -287,7 +287,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                                                static_cast<InsetMathHull &>(*itt);
                                        // this is necessary to prevent an uninitialized
                                        // buffer when the RefInset is in a MathBox.
-                                       // FIXME audit setBuffer/updateLabels calls
+                                       // FIXME audit setBuffer/updateBuffer calls
                                        mi.setBuffer(const_cast<Buffer &>(buffer));
                                        if (mi.asRefInset()->getTarget() == oldname)
                                                mi.asRefInset()->changeTarget(newname);
@@ -382,7 +382,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        pit = last_paste;
        pos = pars[last_paste].size();
 
-       // FIXME Should we do it here, or should we let updateLabels() do it?
+       // FIXME Should we do it here, or should we let updateBuffer() do it?
        // Set paragraph buffers. It's important to do this right away
        // before something calls Inset::buffer() and causes a crash.
        for (pit_type p = startpit; p <= pit; ++p)
@@ -464,7 +464,7 @@ void putClipboard(ParagraphList const & paragraphs,
        // some kind of garbage collection there, or a shared_ptr, then this
        // would not be needed.
        static Buffer * buffer = theBufferList().newBuffer(
-               FileName::tempName().absFilename() + "_clipboard.internal");
+               FileName::tempName().absFileName() + "_clipboard.internal");
        buffer->setUnnamed(true);
        buffer->paragraphs() = paragraphs;
        buffer->inset().setBuffer(*buffer);
@@ -539,6 +539,8 @@ void copySelectionHelper(Buffer const & buf, Text const & text,
        // deleted, unless the whole selection was deleted
        if (!isFullyDeleted(copy_pars))
                acceptChanges(copy_pars, buf.params());
+       else
+               rejectChanges(copy_pars, buf.params());
 
 
        // do some final cleanup now, to make sure that the paragraphs
@@ -775,7 +777,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
 
                // need a valid cursor. (Lgb)
                cur.clearSelection();
-               cur.buffer()->updateLabels();
+               cur.buffer()->updateBuffer();
 
                // tell tabular that a recent copy happened
                dirtyTabularStack(false);
@@ -953,7 +955,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
 
                boost::tie(ppp, endpit) =
                        pasteSelectionHelper(cur, parlist, docclass, errorList);
-               cur.buffer()->updateLabels();
+               cur.buffer()->updateBuffer();
                cur.clearSelection();
                text->setCursor(cur, ppp.first, ppp.second);
        }
@@ -1027,7 +1029,7 @@ void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
        // create inset for graphic
        InsetGraphics * inset = new InsetGraphics(cur.buffer());
        InsetGraphicsParams params;
-       params.filename = support::DocFileName(filename.absFilename());
+       params.filename = support::DocFileName(filename.absFileName());
        inset->setParams(params);
        cur.recordUndo();
        cur.insert(inset);