From 5478f9dda39cc97bf86a115c7db652c0daa49fec Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Fri, 5 Nov 1999 01:29:49 +0000 Subject: [PATCH] Switching to use NS_WITH_SERVICE macro as specified in (5403); removing spurious clipboard service instance in nsEditorEventListeners.cpp. r=akkana, a=chofmann. git-svn-id: svn://10.0.0.236/trunk@52832 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsEditorEventListeners.cpp | 2 -- .../editor/libeditor/text/nsEditorEventListeners.cpp | 2 -- mozilla/layout/base/nsPresShell.cpp | 10 ++++------ mozilla/layout/html/base/src/nsPresShell.cpp | 10 ++++------ 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/mozilla/editor/base/nsEditorEventListeners.cpp b/mozilla/editor/base/nsEditorEventListeners.cpp index fe01bce4a4b..3fd6d75719f 100644 --- a/mozilla/editor/base/nsEditorEventListeners.cpp +++ b/mozilla/editor/base/nsEditorEventListeners.cpp @@ -45,7 +45,6 @@ // Drag & Drop, Clipboard #include "nsIServiceManager.h" #include "nsWidgetsCID.h" -#include "nsIClipboard.h" #include "nsIDragService.h" #include "nsIDragSession.h" #include "nsITransferable.h" @@ -60,7 +59,6 @@ static NS_DEFINE_CID(kCDragServiceCID, NS_DRAGSERVICE_CID); static NS_DEFINE_CID(kCTransferableCID, NS_TRANSFERABLE_CID); static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID); static NS_DEFINE_IID(kContentIteratorCID, NS_CONTENTITERATOR_CID); -static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID); static NS_DEFINE_IID(kCXIFConverterCID, NS_XIFFORMATCONVERTER_CID); diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp index fe01bce4a4b..3fd6d75719f 100644 --- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp @@ -45,7 +45,6 @@ // Drag & Drop, Clipboard #include "nsIServiceManager.h" #include "nsWidgetsCID.h" -#include "nsIClipboard.h" #include "nsIDragService.h" #include "nsIDragSession.h" #include "nsITransferable.h" @@ -60,7 +59,6 @@ static NS_DEFINE_CID(kCDragServiceCID, NS_DRAGSERVICE_CID); static NS_DEFINE_CID(kCTransferableCID, NS_TRANSFERABLE_CID); static NS_DEFINE_IID(kCDataFlavorCID, NS_DATAFLAVOR_CID); static NS_DEFINE_IID(kContentIteratorCID, NS_CONTENTITERATOR_CID); -static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID); static NS_DEFINE_IID(kCXIFConverterCID, NS_XIFFORMATCONVERTER_CID); diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index a4ebad5f086..bc6c818eed6 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -1734,7 +1734,8 @@ PresShell::DoCopy() GetDocument(getter_AddRefs(doc)); if (doc) { nsString buffer; - + nsresult rv; + nsIDOMSelection* sel = nsnull; GetSelection(SELECTION_NORMAL, &sel); @@ -1743,10 +1744,8 @@ PresShell::DoCopy() NS_IF_RELEASE(sel); // Get the Clipboard - nsIClipboard* clipboard = nsnull; - nsresult rv = nsServiceManager::GetService(kCClipboardCID, - nsIClipboard::GetIID(), - (nsISupports **)&clipboard); + NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + if (NS_FAILED(rv)) return rv; if ( clipboard ) { // Create a transferable for putting data on the Clipboard @@ -1787,7 +1786,6 @@ PresShell::DoCopy() clipboard->SetData(trans, nsnull); } } - nsServiceManager::ReleaseService(kCClipboardCID, clipboard); } } return NS_OK; diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index a4ebad5f086..bc6c818eed6 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -1734,7 +1734,8 @@ PresShell::DoCopy() GetDocument(getter_AddRefs(doc)); if (doc) { nsString buffer; - + nsresult rv; + nsIDOMSelection* sel = nsnull; GetSelection(SELECTION_NORMAL, &sel); @@ -1743,10 +1744,8 @@ PresShell::DoCopy() NS_IF_RELEASE(sel); // Get the Clipboard - nsIClipboard* clipboard = nsnull; - nsresult rv = nsServiceManager::GetService(kCClipboardCID, - nsIClipboard::GetIID(), - (nsISupports **)&clipboard); + NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + if (NS_FAILED(rv)) return rv; if ( clipboard ) { // Create a transferable for putting data on the Clipboard @@ -1787,7 +1786,6 @@ PresShell::DoCopy() clipboard->SetData(trans, nsnull); } } - nsServiceManager::ReleaseService(kCClipboardCID, clipboard); } } return NS_OK;