From c11bdf4df133e15e824cafa72662dffb80561535 Mon Sep 17 00:00:00 2001
From: "tbogard%aol.net" <tbogard%aol.net>
Date: Wed, 1 Sep 1999 08:15:23 +0000
Subject: [PATCH] Fixed bad NSGetFactory.

---
 intl/locale/src/nsLocaleFactory.cpp     | 2 +-
 intl/locale/src/windows/nsLocaleDLL.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/intl/locale/src/nsLocaleFactory.cpp b/intl/locale/src/nsLocaleFactory.cpp
index fc80407625b4..c1fada286f59 100644
--- a/intl/locale/src/nsLocaleFactory.cpp
+++ b/intl/locale/src/nsLocaleFactory.cpp
@@ -49,7 +49,7 @@ NS_DEFINE_CID(kPosixLocaleFactoryCID,NS_POSIXLOCALEFACTORY_CID);
 NS_DEFINE_IID(kIPosixLocaleIID, NS_IPOSIXLOCALE_IID);
 #endif
 
-NS_IMPL_ISUPPORTS(nsLocaleFactory,kILocaleFactoryIID)
+NS_IMPL_ISUPPORTS2(nsLocaleFactory,nsIFactory, nsILocaleFactory)
 
 #define LOCALE_CATEGORY_LISTLEN 6
 char* localeCategoryList[LOCALE_CATEGORY_LISTLEN] = 
diff --git a/intl/locale/src/windows/nsLocaleDLL.cpp b/intl/locale/src/windows/nsLocaleDLL.cpp
index 755ddb72e97c..54f0aa533174 100644
--- a/intl/locale/src/windows/nsLocaleDLL.cpp
+++ b/intl/locale/src/windows/nsLocaleDLL.cpp
@@ -87,7 +87,7 @@ extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports* serviceMgr,
 	if (aClass.Equals(kLocaleFactoryCID))
 	{
 		factoryInstance = new nsLocaleFactory();
-		res = factoryInstance->QueryInterface(kILocaleFactoryIID, (void **) aFactory);
+		res = CallQueryInterface(factoryInstance, aFactory);
 
 		if (NS_FAILED(res))
 		{
@@ -100,7 +100,7 @@ extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports* serviceMgr,
 
 	if (aClass.Equals(kLocaleServiceCID)) {
 		factoryInstance = new nsLocaleServiceFactory();
-		res = factoryInstance->QueryInterface(kIFactoryIID,(void**)aFactory);
+		res = CallQueryInterface(factoryInstance, aFactory);
 		if (NS_FAILED(res)) { *aFactory=NULL; delete factoryInstance; }
 		return res;
 	}
@@ -110,7 +110,7 @@ extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports* serviceMgr,
 	if (aClass.Equals(kWin32LocaleFactoryCID))
 	{
 		factoryInstance = new nsIWin32LocaleFactory();
-		res = factoryInstance->QueryInterface(kIFactoryIID,(void**)aFactory);
+		res = CallQueryInterface(factoryInstance, aFactory);
 		if (NS_FAILED(res))
 		{
 			*aFactory=NULL;
@@ -129,7 +129,7 @@ extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports* serviceMgr,
 		return NS_ERROR_OUT_OF_MEMORY;  
 	}
 
-	res = factoryInstance->QueryInterface(kIFactoryIID, (void**)aFactory);
+	res = CallQueryInterface(factoryInstance, aFactory);
 	if (NS_FAILED(res))
 	{
 		*aFactory = NULL;