diff options
Diffstat (limited to 'WebCore/platform/win/PasteboardWin.cpp')
| -rw-r--r-- | WebCore/platform/win/PasteboardWin.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/WebCore/platform/win/PasteboardWin.cpp b/WebCore/platform/win/PasteboardWin.cpp index 506cc7b..427c303 100644 --- a/WebCore/platform/win/PasteboardWin.cpp +++ b/WebCore/platform/win/PasteboardWin.cpp @@ -26,10 +26,11 @@ #include "config.h" #include "Pasteboard.h" -#include "CString.h" #include "ClipboardUtilitiesWin.h" -#include "Document.h" +#include "CString.h" +#include "DeprecatedString.h" #include "DocumentFragment.h" +#include "Document.h" #include "Element.h" #include "Frame.h" #include "HitTestResult.h" @@ -115,10 +116,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, // Put CF_HTML format on the pasteboard if (::OpenClipboard(m_owner)) { ExceptionCode ec = 0; - Vector<char> data; - markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), - selectedRange->startContainer(ec)->document()->url().string(), data); - HGLOBAL cbData = createGlobalData(data); + HGLOBAL cbData = createGlobalData(markupToCF_HTML(createMarkup(selectedRange, 0, AnnotateForInterchange), selectedRange->startContainer(ec)->document()->url())); if (!::SetClipboardData(HTMLClipboardFormat, cbData)) ::GlobalFree(cbData); ::CloseClipboard(); @@ -168,9 +166,7 @@ void Pasteboard::writeURL(const KURL& url, const String& titleStr, Frame* frame) // write to clipboard in format CF_HTML to be able to paste into contenteditable areas as a link if (::OpenClipboard(m_owner)) { - Vector<char> data; - markupToCF_HTML(urlToMarkup(url, title), "", data); - HGLOBAL cbData = createGlobalData(data); + HGLOBAL cbData = createGlobalData(markupToCF_HTML(urlToMarkup(url, title), "")); if (!::SetClipboardData(HTMLClipboardFormat, cbData)) ::GlobalFree(cbData); ::CloseClipboard(); |