From bd7cee66191a87a93b21f6d84397f233a9cadc80 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Wed, 2 Oct 2002 07:43:18 +0000 Subject: [PATCH] code cleanup, move from static cid to contract id. no bug. --- mailnews/absync/src/nsABSyncDriver.cpp | 3 +-- mailnews/absync/src/nsAbSync.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mailnews/absync/src/nsABSyncDriver.cpp b/mailnews/absync/src/nsABSyncDriver.cpp index f16db5041935..7f5b964b423f 100644 --- a/mailnews/absync/src/nsABSyncDriver.cpp +++ b/mailnews/absync/src/nsABSyncDriver.cpp @@ -48,7 +48,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbSyncDriver, nsIAbSyncDriver) //NS_IMPL_ISUPPORTS1(nsAbSyncDriver, nsIAbSyncDriver) static NS_DEFINE_CID(kAbSync, NS_ABSYNC_SERVICE_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); nsAbSyncDriver::nsAbSyncDriver() { @@ -247,7 +246,7 @@ nsAbSyncDriver::GetString(const PRUnichar *aStringName) static const char propertyURL[] = AB_STRING_URL; nsCOMPtr sBundleService = - do_GetService(kStringBundleServiceCID, &res); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); diff --git a/mailnews/absync/src/nsAbSync.cpp b/mailnews/absync/src/nsAbSync.cpp index 5347912d1874..fdec14b15851 100644 --- a/mailnews/absync/src/nsAbSync.cpp +++ b/mailnews/absync/src/nsAbSync.cpp @@ -69,7 +69,6 @@ static NS_DEFINE_CID(kCAbSyncPostEngineCID, NS_ABSYNC_POST_ENGINE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kAbCardPropertyCID, NS_ABCARDPROPERTY_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); /* Implementation file */ NS_IMPL_ISUPPORTS1(nsAbSync, nsIAbSync) @@ -3099,7 +3098,7 @@ nsAbSync::GetString(const PRUnichar *aStringName) static const char propertyURL[] = AB_STRING_URL; nsCOMPtr sBundleService = - do_GetService(kStringBundleServiceCID, &res); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle));