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

Switch Drag&Drop over to nsCOMPtr and fixed service release

Browse Source
This commit is contained in:
rods%netscape.com 1999-04-23 14:43:30 +00:00
parent 4f4cf854ea
commit a570e5b6c0
2 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/base/nsEditorEventListeners.cpp
View File

@ -930,7 +930,7 @@ nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent)
(nsISupports **)&dragService);
if (NS_OK == rv) {
dragService->SetCanDrop(PR_TRUE);
NS_RELEASE(dragService);
nsServiceManager::ReleaseService(kCDragServiceCID, dragService);
}
#endif
return NS_OK;
@ -947,7 +947,7 @@ nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent)
(nsISupports **)&dragService);
if (NS_OK == rv) {
dragService->SetCanDrop(PR_TRUE);
NS_RELEASE(dragService);
nsServiceManager::ReleaseService(kCDragServiceCID, dragService);
}
#endif
return NS_OK;
@ -973,18 +973,18 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
kIDragServiceIID,
(nsISupports **)&dragService);
if (NS_OK == rv) {
nsIGenericTransferable *genericTrans = 0;
nsCOMPtr<nsIGenericTransferable> genericTrans;
rv = nsComponentManager::CreateInstance(kCGenericTransferableCID, nsnull,
kIGenericTransferableIID, (void**) &genericTrans);
kIGenericTransferableIID, (void**) getter_AddRefs(genericTrans));
if (NS_OK == rv) {
nsIDataFlavor *flavor = 0;
rv = nsComponentManager::CreateInstance(kCDataFlavorCID, nsnull, kIDataFlavorIID, (void**) &flavor);
nsCOMPtr<nsIDataFlavor> flavor;
rv = nsComponentManager::CreateInstance(kCDataFlavorCID, nsnull, kIDataFlavorIID, (void**) getter_AddRefs(flavor));
if (NS_OK == rv) {
flavor->Init(kTextMime, "Text");
genericTrans->AddDataFlavor(flavor);
nsCOMPtr<nsITransferable> trans = do_QueryInterface(genericTrans);
nsCOMPtr<nsITransferable> trans (do_QueryInterface(genericTrans));
if (trans) {
dragService->GetData(trans);
@ -994,19 +994,13 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
trans->GetTransferData(flavor, (void **)&str, &len);
if (str) {
if (str[len-1] == 0) {
len--;
}
stuffToPaste.SetString(str, len);
mEditor->InsertText(stuffToPaste);
}
}
NS_IF_RELEASE(flavor);
}
NS_IF_RELEASE(genericTrans);
}
NS_IF_RELEASE(dragService);
nsServiceManager::ReleaseService(kCDragServiceCID, dragService);
}
#endif

22
editor/libeditor/text/nsEditorEventListeners.cpp
View File

@ -930,7 +930,7 @@ nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent)
(nsISupports **)&dragService);
if (NS_OK == rv) {
dragService->SetCanDrop(PR_TRUE);
NS_RELEASE(dragService);
nsServiceManager::ReleaseService(kCDragServiceCID, dragService);
}
#endif
return NS_OK;
@ -947,7 +947,7 @@ nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent)
(nsISupports **)&dragService);
if (NS_OK == rv) {
dragService->SetCanDrop(PR_TRUE);
NS_RELEASE(dragService);
nsServiceManager::ReleaseService(kCDragServiceCID, dragService);
}
#endif
return NS_OK;
@ -973,18 +973,18 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
kIDragServiceIID,
(nsISupports **)&dragService);
if (NS_OK == rv) {
nsIGenericTransferable *genericTrans = 0;
nsCOMPtr<nsIGenericTransferable> genericTrans;
rv = nsComponentManager::CreateInstance(kCGenericTransferableCID, nsnull,
kIGenericTransferableIID, (void**) &genericTrans);
kIGenericTransferableIID, (void**) getter_AddRefs(genericTrans));
if (NS_OK == rv) {
nsIDataFlavor *flavor = 0;
rv = nsComponentManager::CreateInstance(kCDataFlavorCID, nsnull, kIDataFlavorIID, (void**) &flavor);
nsCOMPtr<nsIDataFlavor> flavor;
rv = nsComponentManager::CreateInstance(kCDataFlavorCID, nsnull, kIDataFlavorIID, (void**) getter_AddRefs(flavor));
if (NS_OK == rv) {
flavor->Init(kTextMime, "Text");
genericTrans->AddDataFlavor(flavor);
nsCOMPtr<nsITransferable> trans = do_QueryInterface(genericTrans);
nsCOMPtr<nsITransferable> trans (do_QueryInterface(genericTrans));
if (trans) {
dragService->GetData(trans);
@ -994,19 +994,13 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
trans->GetTransferData(flavor, (void **)&str, &len);
if (str) {
if (str[len-1] == 0) {
len--;
}
stuffToPaste.SetString(str, len);
mEditor->InsertText(stuffToPaste);
}
}
NS_IF_RELEASE(flavor);
}
NS_IF_RELEASE(genericTrans);
}
NS_IF_RELEASE(dragService);
nsServiceManager::ReleaseService(kCDragServiceCID, dragService);
}
#endif