Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checking for null references on clipboard, trans (gtk/unix).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24940 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcafee%netscape.com
1999-03-24 01:43:46 +00:00
parent 70fc97d350
commit 83d83ef5df
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/editor/base/nsEditor.cpp
View File

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

19
mozilla/editor/libeditor/base/nsEditor.cpp
View File

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