Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor changes to call to new clipboard

Browse Source
This commit is contained in:
rods%netscape.com 1999-03-26 15:49:28 +00:00
parent 29901c6520
commit 00af88c97a
2 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editor/base/nsEditor.cpp
View File

@ -848,30 +848,19 @@ NS_IMETHODIMP nsEditor::Paste()
nsString stuffToPaste;
#ifdef NEW_CLIPBOARD_SUPPORT
nsIClipboard* clipboard = 0;
nsIClipboard* clipboard;
nsresult rv = nsServiceManager::GetService(kCClipboardCID,
kIClipboardIID,
(nsISupports **)&clipboard);
nsITransferable * trans = 0;
nsITransferable * trans;
rv = nsComponentManager::CreateInstance(kCTransferableCID, nsnull, kITransferableIID, (void**) &trans);
if (nsnull != trans) {
//if (nsnull != trans) {
//trans->AddDataFlavor("text/xif", "XIF Format");
trans->AddDataFlavor(kTextMime, "Text Format");
} else {
printf("nsEditor::Paste(), trans is null.\n");
}
//trans->AddDataFlavor(kTextMime, "Text Format");
//}
if(clipboard) {
clipboard->SetData(trans, nsnull);
clipboard->GetClipboard();
} else {
printf("nsEditor::Paste(), clipboard instance is null.\n");
}
if(trans) {
trans->GetTransferString(stuffToPaste);
}
clipboard->GetData(trans);
trans->GetTransferString(stuffToPaste);
NS_IF_RELEASE(clipboard);
NS_IF_RELEASE(trans);

25
editor/libeditor/base/nsEditor.cpp
View File

@ -848,30 +848,19 @@ NS_IMETHODIMP nsEditor::Paste()
nsString stuffToPaste;
#ifdef NEW_CLIPBOARD_SUPPORT
nsIClipboard* clipboard = 0;
nsIClipboard* clipboard;
nsresult rv = nsServiceManager::GetService(kCClipboardCID,
kIClipboardIID,
(nsISupports **)&clipboard);
nsITransferable * trans = 0;
nsITransferable * trans;
rv = nsComponentManager::CreateInstance(kCTransferableCID, nsnull, kITransferableIID, (void**) &trans);
if (nsnull != trans) {
//if (nsnull != trans) {
//trans->AddDataFlavor("text/xif", "XIF Format");
trans->AddDataFlavor(kTextMime, "Text Format");
} else {
printf("nsEditor::Paste(), trans is null.\n");
}
//trans->AddDataFlavor(kTextMime, "Text Format");
//}
if(clipboard) {
clipboard->SetData(trans, nsnull);
clipboard->GetClipboard();
} else {
printf("nsEditor::Paste(), clipboard instance is null.\n");
}
if(trans) {
trans->GetTransferString(stuffToPaste);
}
clipboard->GetData(trans);
trans->GetTransferString(stuffToPaste);
NS_IF_RELEASE(clipboard);
NS_IF_RELEASE(trans);