anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-14 09:32:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Fix bug http://bugzilla.lyx.org/show_bug.cgi?id=5560.

Browse Source 
Allow users to paste text from e.g. MS Word. This text can be paste from clipboard both as text and as graphics. LyX should prefer to paste it as text.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@27996 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-01-05 14:29:40 +00:00
parent 417178a7be
commit 7f77edbeac
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Text3.cpp
View File

@ -998,7 +998,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
if (arg.empty()) {
if (theClipboard().isInternal())
pasteFromStack(cur, bv->buffer().errorList("Paste"), 0);
else if (theClipboard().hasGraphicsContents())
else if (theClipboard().hasGraphicsContents()
&& !theClipboard().hasTextContents())
pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"));
else
pasteClipboardText(cur, bv->buffer().errorList("Paste"));

2
src/frontends/Clipboard.h
View File

@ -69,6 +69,8 @@ public:
/// Does the clipboard contain LyX contents?
virtual bool hasLyXContents() const = 0;
/// Does the clipboard contain text contents?
virtual bool hasTextContents() const = 0;
/// Does the clipboard contain graphics contents of a certain type?
virtual bool hasGraphicsContents(GraphicsType type = AnyGraphicsType) const = 0;
/// state of clipboard.

8
src/frontends/qt4/GuiClipboard.cpp
View File

@ -342,6 +342,14 @@ bool GuiClipboard::hasLyXContents() const
}
bool GuiClipboard::hasTextContents() const
{
QMimeData const * const source =
qApp->clipboard()->mimeData(QClipboard::Clipboard);
return source && source->hasText();
}
bool GuiClipboard::hasGraphicsContents(Clipboard::GraphicsType type) const
{
if (type == AnyGraphicsType) {

1
src/frontends/qt4/GuiClipboard.h
View File

@ -41,6 +41,7 @@ public:
void put(std::string const & lyx, docstring const & text);
bool hasLyXContents() const;
bool hasGraphicsContents(GraphicsType type = AnyGraphicsType) const;
bool hasTextContents() const;
bool isInternal() const;
bool hasInternal() const;
bool empty() const;