User: hr Date: 06/06/19 18:47:13 Modified: /dba/connectivity/source/drivers/mozab/bootstrap/ MNSInit.cxx
Log: INTEGRATION: CWS warnings01 (1.3.30); FILE MERGED 2005/12/22 11:44:53 fs 1.3.30.4: #i57457# warning-free code 2005/11/21 10:07:53 fs 1.3.30.3: #i57457# warning-free code on unx* 2005/11/16 12:59:15 fs 1.3.30.2: #i57457# warning free code 2005/11/07 14:43:50 fs 1.3.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: MNSInit.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx?r1=1.3&r2=1.4 Delta lines: +18 -33 --------------------- --- MNSInit.cxx 8 Sep 2005 06:24:01 -0000 1.3 +++ MNSInit.cxx 20 Jun 2006 01:47:11 -0000 1.4 @@ -36,20 +36,9 @@ #ifndef _CONNECTIVITY_MAB_NS_INCLUDE_HXX_ #include <MNSInclude.hxx> #endif -#include "nsIServiceManager.h" -#include "nsIEventQueueService.h" -#include "nsIChromeRegistry.h" - -#include "nsIStringBundle.h" - -#include "nsIDirectoryService.h" -#include "nsIProfile.h" -#include "nsIProfileInternal.h" -#include "nsIPref.h" -#include "nsXPIDLString.h" -#include "nsString.h" -#include "nsEmbedAPI.h" +#include "mozilla_nsinit.h" + #include <sal/types.h> #include <osl/diagnose.h> #ifndef _OSL_CONDITN_HXX_ @@ -76,8 +65,6 @@ #include <MNSTerminateListener.hxx> #endif -#include "nsDirectoryService.h" - static nsIServiceManager* sServiceManager = nsnull; static sal_Int32 sInitCounter = 0; static sal_Bool s_bProfilePresentAfterInitialized = sal_False; @@ -137,7 +124,7 @@ } -sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists,sal_Int32 nProduct) +sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) { nsresult rv; OSL_TRACE( "IN : MNS_InitXPCOM() \n" ); @@ -189,7 +176,7 @@ nsCOMPtr<nsIEventQueueService> eventQService( do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv)); if (NS_FAILED(rv)) - return rv; + return NS_SUCCEEDED( rv ); eventQService->CreateThreadEventQueue(); @@ -205,7 +192,7 @@ if (NS_SUCCEEDED(rv)) { nsCOMPtr<nsIStringBundle> stringBundle; - char* propertyURL = "chrome://necko/locale/necko.properties"; + const char* propertyURL = "chrome://necko/locale/necko.properties"; rv = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); } @@ -265,18 +252,17 @@ OSL_TRACE( "OUT : MNS_XPCOM_EventLoop() \n" ); } -static void MNS_Mozilla_UI_Thread( void *arg ) +extern "C" void MNS_Mozilla_UI_Thread( void *arg ) { aLive=1; OSL_TRACE( "IN : MNS_Mozilla_UI_Thread() \n" ); UI_Thread_ARGS * args = (UI_Thread_ARGS*) arg; sal_Bool* aProfileExists=args->bProfileExists; - sal_Int32 nProduct = args->nProduct; delete args; args=NULL; //Init xpcom - if (!MNS_InitXPCOM(aProfileExists,nProduct)) + if (!MNS_InitXPCOM(aProfileExists)) { m_aUI_Thread_Condition.set(); // error happened return; @@ -303,7 +289,7 @@ } -sal_Bool MNS_Init(sal_Bool& aProfileExists,sal_Int32 nProduct) +sal_Bool MNS_Init(sal_Bool& aProfileExists) { aProfileExists = sal_False ; @@ -322,7 +308,6 @@ UI_Thread_ARGS * args = new UI_Thread_ARGS; args->bProfileExists = &aProfileExists; - args->nProduct = nProduct; m_aUI_Thread_Condition.reset(); m_Mozilla_UI_Thread=osl_createThread(MNS_Mozilla_UI_Thread, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
