X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.h;h=94535151c7855f534e07cb0d79de6785c127d49e;hb=758de9577dcf3ff912c794dc4dffa13e138ffd41;hp=4149f1983b135a0465d72e6e6a7041513f0baaa7;hpb=c0ea37f33791515a1991151581021092b2022595;p=lyx.git

diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index 4149f1983b..94535151c7 100644
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -22,7 +22,6 @@
 
 #include <vector>
 
-using lyx::frontend::Clipboard;
 
 namespace lyx {
 
@@ -39,7 +38,7 @@ std::vector<docstring> availableSelections(Buffer const *);
 /// Get the number of available elements in the cut buffer.
 size_type numberOfSelections();
 /// Get the sel_index-th element of the cut buffer in plain text format.
-docstring selection(size_t sel_index);
+docstring selection(size_t sel_index, DocumentClassConstPtr docclass);
 
 /**
  * Replace using the font of the first selected character and select
@@ -61,6 +60,9 @@ void replaceSelection(Cursor & cur);
  *                selection.
  */
 void cutSelection(Cursor & cur, bool doclear = true, bool realcut = true);
+/// Like cutSelection, but only put to temporary cut buffer
+void cutSelectionToTemp(Cursor & cur, bool doclear = true, bool realcut = true);
+
 /// Push the current selection to the cut buffer and the system clipboard.
 void copySelection(Cursor const & cur);
 ///
@@ -89,21 +91,31 @@ void pasteSelection(Cursor & cur, ErrorList &);
 /// Does handle undo. Does only work in text, not mathed.
 /// \p asParagraphs is only considered if plain text is pasted.
 bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs,
-	Clipboard::TextType preferedType = Clipboard::LyXOrPlainTextType);
+	frontend::Clipboard::TextType preferedType = frontend::Clipboard::LyXOrPlainTextType);
 /// Replace the current selection with the clipboard contents as graphic.
 /// Does handle undo. Does only work in text, not mathed.
 void pasteClipboardGraphics(Cursor & cur, ErrorList & errorList,
-	Clipboard::GraphicsType preferedType = Clipboard::AnyGraphicsType);
+	frontend::Clipboard::GraphicsType preferedType = frontend::Clipboard::AnyGraphicsType);
 /// Replace the current selection with cut buffer \c sel_index
 /// Does handle undo. Does only work in text, not mathed.
 bool pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index);
+/// Replace the current selection with temporary cut buffer
+/// Does handle undo. Does only work in text, not mathed.
+bool pasteFromTemp(Cursor & cur, ErrorList & errorList);
 /// Paste the clipboard as simple text, removing any formatting
 void pasteSimpleText(Cursor & cur, bool asParagraphs);
 
+// What to do with unknown branches?
+enum BranchAction {
+	BRANCH_ADD, // add the branch unconditionally
+	BRANCH_IGNORE, // leave the branch undefined
+	BRANCH_ASK // ask the user whether the branch should be added
+};
 /// Paste the paragraph list \p parlist at the position given by \p cur.
 /// Does not handle undo. Does only work in text, not mathed.
 void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
-			DocumentClassConstPtr textclass, ErrorList & errorList);
+                        DocumentClassConstPtr textclass, ErrorList & errorList,
+                        BranchAction branchAction = BRANCH_ASK);
 
 
 /** Needed to switch between different classes. This works