remove unneeded XMLEncodingService, fix bug 22282
This commit is contained in:
@@ -66,8 +66,6 @@
|
||||
|
||||
#include "nsMetaCharsetCID.h"
|
||||
#include "nsIMetaCharsetService.h"
|
||||
#include "nsXMLEncodingCID.h"
|
||||
#include "nsIXMLEncodingService.h"
|
||||
|
||||
/* For implementing GetHiddenWindowAndJSContext */
|
||||
#include "nsIScriptGlobalObject.h"
|
||||
@@ -79,7 +77,6 @@ static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
|
||||
static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
|
||||
static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
|
||||
static NS_DEFINE_IID(kMetaCharsetCID, NS_META_CHARSET_CID);
|
||||
static NS_DEFINE_IID(kXMLEncodingCID, NS_XML_ENCODING_CID);
|
||||
|
||||
|
||||
/* Define Interface IDs */
|
||||
@@ -236,19 +233,6 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService )
|
||||
}
|
||||
rv = nsServiceManager::ReleaseService(kMetaCharsetCID, metacharset);
|
||||
|
||||
nsIXMLEncodingService* xmlencoding;
|
||||
rv = nsServiceManager::GetService(kXMLEncodingCID,
|
||||
nsIXMLEncodingService::GetIID(),
|
||||
(nsISupports **) &xmlencoding);
|
||||
if(NS_FAILED(rv)) {
|
||||
goto done;
|
||||
}
|
||||
rv = xmlencoding->Start();
|
||||
if(NS_FAILED(rv)) {
|
||||
goto done;
|
||||
}
|
||||
rv = nsServiceManager::ReleaseService(kXMLEncodingCID, xmlencoding);
|
||||
|
||||
// Create widget application shell
|
||||
rv = nsComponentManager::CreateInstance(kAppShellCID, nsnull, kIAppShellIID,
|
||||
(void**)&mAppShell);
|
||||
|
||||
Reference in New Issue
Block a user