NECKO ifdef (ifdef'd _off_ by default) this checkin should not impact anything. checkin approved. If someone runs into a problem, call me at 303.546.0061.

git-svn-id: svn://10.0.0.236/trunk@35863 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
valeski%netscape.com
1999-06-18 17:34:08 +00:00
parent f8cf48d35b
commit 4fa4e2e84d
124 changed files with 3915 additions and 243 deletions

View File

@@ -50,6 +50,13 @@
#include "nsIStyleContext.h"
#include "nsIEditActionListener.h"
#ifdef NECKO
#include "nsIIOService.h"
#include "nsIURI.h"
#include "nsIServiceManager.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#endif // NECKO
#include "nsEditorShell.h"
#include "nsEditorShellFactory.h"
@@ -530,7 +537,19 @@ nsEditor::Init(nsIDOMDocument *aDoc, nsIPresShell* aPresShell)
if (NS_SUCCEEDED(result) && service)
{
nsCOMPtr<nsIURL> url;
#ifndef NECKO
result = NS_NewURL(getter_AddRefs(url), nsString(EDITOR_BUNDLE_URL));
#else
NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &result);
if (NS_FAILED(result)) return result;
nsIURI *uri = nsnull;
result = ioService->NewURI(EDITOR_BUNDLE_URL, nsnull, &uri);
if (NS_FAILED(result)) return result;
result = uri->QueryInterface(nsIURI::GetIID(), (void**)&url);
NS_RELEASE(uri);
#endif // NECKO
if (NS_SUCCEEDED(result) && url)
{