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

remove some unused functions from editor shell (r=jfrancis)

This commit is contained in:
brade%netscape.com 1999-11-30 15:23:46 +00:00
Родитель bcb79d06b0
Коммит 7fcd34a7e6
5 изменённых файлов: 0 добавлений и 167 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -241,50 +241,6 @@ nsEditorShell::QueryInterface(REFNSIID aIID,void** aInstancePtr)
return NS_ERROR_NO_INTERFACE;
}
#if 0
NS_IMETHODIMP
nsEditorShell::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
{
NS_PRECONDITION(nsnull != aScriptObject, "null arg");
nsresult res = NS_OK;
if (nsnull == mScriptObject)
{
res = NS_NewScriptEditorAppCore(aContext,
(nsISupports *)(nsIEditorShell*)this,
nsnull,
&mScriptObject);
}
*aScriptObject = mScriptObject;
return res;
}
#endif
nsIScriptContext *
nsEditorShell::GetScriptContext(nsIDOMWindow * aWin)
{
nsIScriptContext * scriptContext = nsnull;
if (nsnull != aWin) {
nsIDOMDocument * domDoc;
aWin->GetDocument(&domDoc);
if (nsnull != domDoc) {
nsIDocument * doc;
if (NS_OK == domDoc->QueryInterface(nsIDocument::GetIID(),(void**)&doc)) {
nsIScriptContextOwner * owner = doc->GetScriptContextOwner();
if (nsnull != owner) {
owner->GetScriptContext(&scriptContext);
NS_RELEASE(owner);
}
NS_RELEASE(doc);
}
NS_RELEASE(domDoc);
}
}
return scriptContext;
}
NS_IMETHODIMP
nsEditorShell::Init()
{
@ -435,8 +391,6 @@ nsEditorShell::SetToolbarWindow(nsIDOMWindow* aWin)
return NS_ERROR_NULL_POINTER;
mToolbarWindow = aWin;
//NS_ADDREF(aWin);
//mToolbarScriptContext = GetScriptContext(aWin);
return NS_OK;
}
@ -449,7 +403,6 @@ nsEditorShell::SetContentWindow(nsIDOMWindow* aWin)
return NS_ERROR_NULL_POINTER;
mContentWindow = aWin;
//mContentScriptContext = GetScriptContext(mContentWindow); // XXX does this AddRef?
nsresult rv;
nsCOMPtr<nsIScriptGlobalObject> globalObj = do_QueryInterface(mContentWindow, &rv);
@ -473,9 +426,6 @@ nsEditorShell::SetWebShellWindow(nsIDOMWindow* aWin)
if (!aWin)
return NS_ERROR_NULL_POINTER;
// if (!mContentWindow) {
// return NS_ERROR_FAILURE;
// }
nsCOMPtr<nsIScriptGlobalObject> globalObj( do_QueryInterface(aWin) );
if (!globalObj) {
return NS_ERROR_FAILURE;
@ -1208,16 +1158,6 @@ static nsresult OpenWindow( const char *chrome, const PRUnichar *url )
return rv;
}
NS_IMETHODIMP
nsEditorShell::CreateWindowWithURL(const char* urlStr)
{
nsresult rv = NS_OK;
rv = OpenWindow( urlStr, nsString("chrome://editor/content/EditorInitPage.html").GetUnicode() );
return rv;
}
// this will AddRef the returned window, if any.
NS_IMETHODIMP
nsEditorShell::FindOpenWindowForFile(const PRUnichar* inFileURL, nsIDOMWindow** outFoundWindow)
@ -1642,27 +1582,6 @@ nsEditorShell::Print()
return NS_OK;
}
// NO LONGER CALLED Global JS method goQuitApplication() is called instead
NS_IMETHODIMP
nsEditorShell::Exit()
{
PRBool result;
nsresult rv = CheckAndSaveDocument(GetString("BeforeClosing").GetUnicode(),&result);
// Don't shutdown if there was an error saving file or
// user canceled an action along the way
if (NS_SUCCEEDED(rv) && result)
{
/*
* Create the Application Shell instance...
*/
NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
if (NS_FAILED(rv)) { return rv; }
appShell->Quit();
}
return NS_OK; //Why not return rv?
}
NS_IMETHODIMP
nsEditorShell::GetLocalFileURL(nsIDOMWindow *parent, const PRUnichar *filterType, PRUnichar **_retval)
{
@ -2908,7 +2827,6 @@ nsEditorShell::CreateElementWithDefaults(const PRUnichar *aInTagName, nsIDOMElem
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteElement(nsIDOMElement *element)
{

1
editor/base/nsEditorShell.h
Просмотреть файл

@ -130,7 +130,6 @@ class nsEditorShell : public nsIEditorShell,
NS_IMETHOD TransferDocumentStateListeners();
NS_IMETHOD RemoveOneProperty(const nsString& aProp, const nsString& aAttr);
void SetButtonImage(nsIDOMNode * aParentNode, PRInt32 aBtnNum, const nsString &aResName);
NS_IMETHOD CreateWindowWithURL(const char* urlStr);
NS_IMETHOD FindOpenWindowForFile(const PRUnichar* fileURL, nsIDOMWindow** outFoundWindow);
NS_IMETHOD PrepareDocumentForEditing(nsIURI *aUrl);
NS_IMETHOD DoFind(PRBool aFindNext);

82
editor/composer/src/nsEditorShell.cpp
Просмотреть файл

@ -241,50 +241,6 @@ nsEditorShell::QueryInterface(REFNSIID aIID,void** aInstancePtr)
return NS_ERROR_NO_INTERFACE;
}
#if 0
NS_IMETHODIMP
nsEditorShell::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
{
NS_PRECONDITION(nsnull != aScriptObject, "null arg");
nsresult res = NS_OK;
if (nsnull == mScriptObject)
{
res = NS_NewScriptEditorAppCore(aContext,
(nsISupports *)(nsIEditorShell*)this,
nsnull,
&mScriptObject);
}
*aScriptObject = mScriptObject;
return res;
}
#endif
nsIScriptContext *
nsEditorShell::GetScriptContext(nsIDOMWindow * aWin)
{
nsIScriptContext * scriptContext = nsnull;
if (nsnull != aWin) {
nsIDOMDocument * domDoc;
aWin->GetDocument(&domDoc);
if (nsnull != domDoc) {
nsIDocument * doc;
if (NS_OK == domDoc->QueryInterface(nsIDocument::GetIID(),(void**)&doc)) {
nsIScriptContextOwner * owner = doc->GetScriptContextOwner();
if (nsnull != owner) {
owner->GetScriptContext(&scriptContext);
NS_RELEASE(owner);
}
NS_RELEASE(doc);
}
NS_RELEASE(domDoc);
}
}
return scriptContext;
}
NS_IMETHODIMP
nsEditorShell::Init()
{
@ -435,8 +391,6 @@ nsEditorShell::SetToolbarWindow(nsIDOMWindow* aWin)
return NS_ERROR_NULL_POINTER;
mToolbarWindow = aWin;
//NS_ADDREF(aWin);
//mToolbarScriptContext = GetScriptContext(aWin);
return NS_OK;
}
@ -449,7 +403,6 @@ nsEditorShell::SetContentWindow(nsIDOMWindow* aWin)
return NS_ERROR_NULL_POINTER;
mContentWindow = aWin;
//mContentScriptContext = GetScriptContext(mContentWindow); // XXX does this AddRef?
nsresult rv;
nsCOMPtr<nsIScriptGlobalObject> globalObj = do_QueryInterface(mContentWindow, &rv);
@ -473,9 +426,6 @@ nsEditorShell::SetWebShellWindow(nsIDOMWindow* aWin)
if (!aWin)
return NS_ERROR_NULL_POINTER;
// if (!mContentWindow) {
// return NS_ERROR_FAILURE;
// }
nsCOMPtr<nsIScriptGlobalObject> globalObj( do_QueryInterface(aWin) );
if (!globalObj) {
return NS_ERROR_FAILURE;
@ -1208,16 +1158,6 @@ static nsresult OpenWindow( const char *chrome, const PRUnichar *url )
return rv;
}
NS_IMETHODIMP
nsEditorShell::CreateWindowWithURL(const char* urlStr)
{
nsresult rv = NS_OK;
rv = OpenWindow( urlStr, nsString("chrome://editor/content/EditorInitPage.html").GetUnicode() );
return rv;
}
// this will AddRef the returned window, if any.
NS_IMETHODIMP
nsEditorShell::FindOpenWindowForFile(const PRUnichar* inFileURL, nsIDOMWindow** outFoundWindow)
@ -1642,27 +1582,6 @@ nsEditorShell::Print()
return NS_OK;
}
// NO LONGER CALLED Global JS method goQuitApplication() is called instead
NS_IMETHODIMP
nsEditorShell::Exit()
{
PRBool result;
nsresult rv = CheckAndSaveDocument(GetString("BeforeClosing").GetUnicode(),&result);
// Don't shutdown if there was an error saving file or
// user canceled an action along the way
if (NS_SUCCEEDED(rv) && result)
{
/*
* Create the Application Shell instance...
*/
NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
if (NS_FAILED(rv)) { return rv; }
appShell->Quit();
}
return NS_OK; //Why not return rv?
}
NS_IMETHODIMP
nsEditorShell::GetLocalFileURL(nsIDOMWindow *parent, const PRUnichar *filterType, PRUnichar **_retval)
{
@ -2908,7 +2827,6 @@ nsEditorShell::CreateElementWithDefaults(const PRUnichar *aInTagName, nsIDOMElem
return result;
}
NS_IMETHODIMP
nsEditorShell::DeleteElement(nsIDOMElement *element)
{

1
editor/composer/src/nsEditorShell.h
Просмотреть файл

@ -130,7 +130,6 @@ class nsEditorShell : public nsIEditorShell,
NS_IMETHOD TransferDocumentStateListeners();
NS_IMETHOD RemoveOneProperty(const nsString& aProp, const nsString& aAttr);
void SetButtonImage(nsIDOMNode * aParentNode, PRInt32 aBtnNum, const nsString &aResName);
NS_IMETHOD CreateWindowWithURL(const char* urlStr);
NS_IMETHOD FindOpenWindowForFile(const PRUnichar* fileURL, nsIDOMWindow** outFoundWindow);
NS_IMETHOD PrepareDocumentForEditing(nsIURI *aUrl);
NS_IMETHOD DoFind(PRBool aFindNext);

1
editor/idl/nsIEditorShell.idl
Просмотреть файл

@ -130,7 +130,6 @@ interface nsIEditorShell : nsISupports
boolean CloseWindow();
void Print();
void Exit();
void Undo();
void Redo();