diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-09-17 16:57:02 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-09-17 16:57:02 +0000 |
| commit | 909d0457495fa1d5f3cfe7065fd68d4021c0d291 (patch) | |
| tree | 33cb19d99eafde178bcc0b08316fba1568ed5fb7 /src/ui/clipboard.cpp | |
| parent | update to trunk (diff) | |
| parent | Fix for Bug #1217602 (Measure Path fails with XML too deep error) by dave m. (diff) | |
| download | inkscape-909d0457495fa1d5f3cfe7065fd68d4021c0d291.tar.gz inkscape-909d0457495fa1d5f3cfe7065fd68d4021c0d291.zip | |
Update to trunk
(bzr r11950.1.140)
Diffstat (limited to 'src/ui/clipboard.cpp')
| -rw-r--r-- | src/ui/clipboard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 22d42d525..aeb977078 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -1242,7 +1242,7 @@ Glib::ustring ClipboardManagerImpl::_getBestTarget() CloseClipboard(); if (format == CF_ENHMETAFILE) { - return CLIPBOARD_WIN32_EMF_TARGET; + return "CF_ENHMETAFILE"; } if (format == CF_DIB || format == CF_BITMAP) { return CLIPBOARD_GDK_PIXBUF_TARGET; @@ -1250,7 +1250,7 @@ Glib::ustring ClipboardManagerImpl::_getBestTarget() } if (IsClipboardFormatAvailable(CF_ENHMETAFILE)) { - return CLIPBOARD_WIN32_EMF_TARGET; + return "CF_ENHMETAFILE"; } #endif if (_clipboard->wait_is_image_available()) { @@ -1314,7 +1314,7 @@ void ClipboardManagerImpl::_setClipboardTargets() if (OpenClipboard(NULL)) { if ( _clipboardSPDoc != NULL ) { - const Glib::ustring target = CLIPBOARD_WIN32_EMF_MIME; + const Glib::ustring target = "image/x-emf"; Inkscape::Extension::DB::OutputList outlist; Inkscape::Extension::db.get_output_list(outlist); |