зеркало из https://github.com/mozilla/pjs.git
Removal of old EditorAppCore code.
This commit is contained in:
Родитель
b45b5886b3
Коммит
ea55e499a9
|
@ -58,7 +58,6 @@ class nsMsgCompose : public nsIMsgCompose
|
|||
/* void CloseWindow (); */
|
||||
NS_IMETHOD CloseWindow();
|
||||
|
||||
/* attribute nsIDOMEditorAppCore editor; */
|
||||
/* attribute nsIEditorShell editor; */
|
||||
NS_IMETHOD GetEditor(nsIEditorShell * *aEditor);
|
||||
NS_IMETHOD SetEditor(nsIEditorShell * aEditor);
|
||||
|
|
|
@ -17,18 +17,18 @@
|
|||
* Netscape Communications Corporation. All Rights Reserved.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "nsAppCoresCIDs.h"
|
||||
#include "nsAppCoresManagerFactory.h"
|
||||
#include "nsDOMPropsCoreFactory.h"
|
||||
#include "nsProfileCoreFactory.h"
|
||||
#include "nsRDFCoreFactory.h"
|
||||
#include "nsBrowserAppCoreFactory.h"
|
||||
#include "nsEditorAppCoreFactory.h"
|
||||
#include "nsToolkitCoreFactory.h"
|
||||
#include "nsIFactory.h"
|
||||
#include "nsIComponentManager.h"
|
||||
#include "pratom.h"
|
||||
#include <stdio.h>
|
||||
#include "nsIServiceManager.h"
|
||||
|
||||
static PRInt32 gLockCnt = 0;
|
||||
|
@ -41,7 +41,6 @@ static NS_DEFINE_IID(kProfileCoreCID, NS_PROFILECORE_CID);
|
|||
static NS_DEFINE_IID(kRDFCoreCID, NS_RDFCORE_CID);
|
||||
static NS_DEFINE_IID(kToolkitCoreCID, NS_TOOLKITCORE_CID);
|
||||
static NS_DEFINE_IID(kBrowserAppCoreCID, NS_BROWSERAPPCORE_CID);
|
||||
static NS_DEFINE_IID(kEditorAppCoreCID, NS_EDITORAPPCORE_CID);
|
||||
static NS_DEFINE_IID(kAppCoresManagerCID, NS_APPCORESMANAGER_CID);
|
||||
|
||||
|
||||
|
@ -65,7 +64,7 @@ NSRegisterSelf(nsISupports* serviceMgr, const char *path)
|
|||
nsComponentManager::RegisterComponent(kRDFCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
nsComponentManager::RegisterComponent(kToolkitCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
nsComponentManager::RegisterComponent(kBrowserAppCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
//nsComponentManager::RegisterComponent(kEditorAppCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -80,7 +79,6 @@ NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
|
|||
nsComponentManager::UnregisterComponent(kRDFCoreCID, path);
|
||||
nsComponentManager::UnregisterComponent(kToolkitCoreCID, path);
|
||||
nsComponentManager::UnregisterComponent(kBrowserAppCoreCID, path);
|
||||
//nsComponentManager::UnregisterComponent(kEditorAppCoreCID, path);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
@ -126,12 +124,6 @@ NSGetFactory(nsISupports* serviceMgr,
|
|||
{
|
||||
inst = new nsBrowserAppCoreFactory();
|
||||
}
|
||||
/*
|
||||
else if ( aClass.Equals(kEditorAppCoreCID) )
|
||||
{
|
||||
inst = new nsEditorAppCoreFactory();
|
||||
}
|
||||
*/
|
||||
else
|
||||
{
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include "nsIDOMProfileCore.h"
|
||||
#include "nsIDOMRDFCore.h"
|
||||
#include "nsIDOMBrowserAppCore.h"
|
||||
#include "nsIDOMEditorAppCore.h"
|
||||
#include "nsAppCoresCIDs.h"
|
||||
|
||||
|
||||
|
@ -41,7 +40,6 @@ static NS_DEFINE_IID(kDOMPropsCoreCID, NS_DOMPROPSCORE_CID);
|
|||
static NS_DEFINE_IID(kProfileCoreCID, NS_PROFILECORE_CID);
|
||||
static NS_DEFINE_IID(kRDFCoreCID, NS_RDFCORE_CID);
|
||||
static NS_DEFINE_IID(kBrowserAppCoreCID, NS_BROWSERAPPCORE_CID);
|
||||
static NS_DEFINE_IID(kEditorAppCoreCID, NS_EDITORAPPCORE_CID);
|
||||
|
||||
nsAppCoresNameSet::nsAppCoresNameSet()
|
||||
{
|
||||
|
@ -66,9 +64,8 @@ nsAppCoresNameSet::InitializeClasses(nsIScriptContext* aScriptContext)
|
|||
if (NS_OK != result) return result;
|
||||
|
||||
result = NS_InitDOMPropsCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitProfileCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitProfileCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitBrowserAppCoreClass(aScriptContext, nsnull);
|
||||
//result = NS_InitEditorAppCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitToolkitCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitRDFCoreClass(aScriptContext, nsnull);
|
||||
|
||||
|
@ -118,13 +115,7 @@ nsAppCoresNameSet::AddNameSet(nsIScriptContext* aScriptContext)
|
|||
PR_TRUE);
|
||||
|
||||
if (NS_OK != result) return result;
|
||||
/*
|
||||
result = manager->RegisterGlobalName("EditorAppCore",
|
||||
kEditorAppCoreCID,
|
||||
PR_TRUE);
|
||||
|
||||
if (NS_OK != result) return result;
|
||||
*/
|
||||
result = manager->RegisterGlobalName("XPAppCoresManager",
|
||||
kAppCoresCID,
|
||||
PR_FALSE);
|
||||
|
|
Загрузка…
Ссылка в новой задаче