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

Switching to use NS_WITH_SERVICE macro as specified in (5403); removing spurious clipboard service instance in nsEditorEventListeners.cpp. r=akkana, a=chofmann.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@52832 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcafee%netscape.com
1999-11-05 01:29:49 +00:00
parent e6b6878f91
commit 5478f9dda3
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/editor/base/nsEditorEventListeners.cpp
View File

@@ -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);

2
mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
View File

@@ -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);

10
mozilla/layout/base/nsPresShell.cpp
View File

@@ -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;

10
mozilla/layout/html/base/src/nsPresShell.cpp
View File

@@ -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;