mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed editor registration and startup problems

This commit is contained in:
cmanske%netscape.com 1999-03-09 22:52:24 +00:00
Родитель d060a66ec8
Коммит ec8f15ffaf
2 изменённых файлов: 14 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
editor/base/nsEditor.cpp
Просмотреть файл

@ -133,7 +133,7 @@ PRMonitor *getEditorMonitor() //if more than one person asks for the monitor at
nsIComponentManager* gCompMgr = NULL;
/*
we must be good providers of factories ect. this is where to put ALL editor exports
we must be good providers of factories etc. this is where to put ALL editor exports
*/
//BEGIN EXPORTS
extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports * aServMgr,
@ -148,7 +148,12 @@ extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports * aServMgr,
*aFactory = nsnull;
nsresult rv = aServMgr->QueryInterface(nsIComponentManager::GetIID(), (void**)&gCompMgr);
nsresult rv;
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
rv = servMgr->GetService(kComponentManagerCID, nsIComponentManager::GetIID(),
(nsISupports**)&gCompMgr);
if (NS_FAILED(rv)) return rv;
if (aClass.Equals(kEditorCID)) {
@ -352,10 +357,6 @@ nsEditor::EnableUndo(PRBool aEnable)
nsITransactionManager *txnMgr = 0;
nsresult result=NS_OK;
/** -- temp code until the txn mgr auto-registers -- **/
gCompMgr->RegisterComponent(kCTransactionManagerFactoryCID, NULL, NULL,
TRANSACTION_MANAGER_DLL, PR_FALSE, PR_FALSE);
/** -- end temp code -- **/
if (PR_TRUE==aEnable)
{
if (!mTxnMgr)

13
editor/libeditor/base/nsEditor.cpp
Просмотреть файл

@ -133,7 +133,7 @@ PRMonitor *getEditorMonitor() //if more than one person asks for the monitor at
nsIComponentManager* gCompMgr = NULL;
/*
we must be good providers of factories ect. this is where to put ALL editor exports
we must be good providers of factories etc. this is where to put ALL editor exports
*/
//BEGIN EXPORTS
extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports * aServMgr,
@ -148,7 +148,12 @@ extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports * aServMgr,
*aFactory = nsnull;
nsresult rv = aServMgr->QueryInterface(nsIComponentManager::GetIID(), (void**)&gCompMgr);
nsresult rv;
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
rv = servMgr->GetService(kComponentManagerCID, nsIComponentManager::GetIID(),
(nsISupports**)&gCompMgr);
if (NS_FAILED(rv)) return rv;
if (aClass.Equals(kEditorCID)) {
@ -352,10 +357,6 @@ nsEditor::EnableUndo(PRBool aEnable)
nsITransactionManager *txnMgr = 0;
nsresult result=NS_OK;
/** -- temp code until the txn mgr auto-registers -- **/
gCompMgr->RegisterComponent(kCTransactionManagerFactoryCID, NULL, NULL,
TRANSACTION_MANAGER_DLL, PR_FALSE, PR_FALSE);
/** -- end temp code -- **/
if (PR_TRUE==aEnable)
{
if (!mTxnMgr)