fix compilation on F13 and binutils/gold by rewriting specialized X11 code

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index f70096b442c7fb48df84915efdd5cb603ea3451f..07274a39a040158e90637523b7266c351d130a55 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -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
@@ -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);