Tag: cws_src680_mozab05 User: windly Date: 05/01/24 01:47:20 Modified: /dba/connectivity/source/drivers/mozab/bootstrap/ MMozillaBootstrap.cxx, MNSProfileManager.cxx /dba/connectivity/source/drivers/mozab/mozillasrc/ MDatabaseMetaDataHelper.cxx
Log: #i20088# File Changes: Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: MMozillaBootstrap.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +7 -6 ------------------- --- MMozillaBootstrap.cxx 24 Jan 2005 07:49:03 -0000 1.1.2.2 +++ MMozillaBootstrap.cxx 24 Jan 2005 09:47:16 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: MMozillaBootstrap.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: windly $ $Date: 2005/01/24 07:49:03 $ + * last change: $Author: windly $ $Date: 2005/01/24 09:47:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -217,9 +217,10 @@ ::rtl::OUString profileName = aCode->getProfileName(); ::rtl::OUString currProfileName = getCurrentProfile(); ::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct(); - if (profileName.getLength() //if client does not provide a profileName, we will ignore the product too - && ( aCode->getProductType() != currProduct || profileName.equals(currProfileName)) - ) + + //if client does not provide a profileName, we will them + if (profileName.getLength() + && ( aCode->getProductType() != currProduct || !profileName.equals(currProfileName)) ) setCurrentProfile(aCode->getProductType(),profileName); MNSRunnable xRunnable; xRunnable.StartProxy(aCode); File [changed]: MNSProfileManager.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +1 -1 ------------------- Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MDatabaseMetaDataHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx?r1=1.9.46.3&r2=1.9.46.4 Delta lines: +4 -4 ------------------- --- MDatabaseMetaDataHelper.cxx 24 Jan 2005 08:04:59 -0000 1.9.46.3 +++ MDatabaseMetaDataHelper.cxx 24 Jan 2005 09:47:16 -0000 1.9.46.4 @@ -2,9 +2,9 @@ * * $RCSfile: MDatabaseMetaDataHelper.cxx,v $ * - * $Revision: 1.9.46.3 $ + * $Revision: 1.9.46.4 $ * - * last change: $Author: windly $ $Date: 2005/01/24 08:04:59 $ + * last change: $Author: windly $ $Date: 2005/01/24 09:47:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -369,8 +369,8 @@ retCode = rdfService->GetResource(nsDependentCString(aUri.getStr(),aUri.getLength()), getter_AddRefs(rdfResource)) ; NS_ENSURE_SUCCESS(retCode, retCode) ; - //retCode = rdfService->UnregisterResource(rdfResource) ; - //NS_ENSURE_SUCCESS(retCode, retCode) ; + retCode = rdfService->UnregisterResource(rdfResource) ; + NS_ENSURE_SUCCESS(retCode, retCode) ; nsCOMPtr<nsIAbDirectory> directory = do_QueryInterface(rdfResource, &retCode) ; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
