Tag: cws_src680_mozab05 User: windly Date: 05/01/27 23:21:47 Modified: /dba/connectivity/source/drivers/mozab/ MConfigAccess.cxx, MConnection.cxx, MConnection.hxx /dba/connectivity/source/drivers/mozab/bootstrap/ MMozillaBootstrap.cxx, MNSFolders.cxx, MNSFolders.hxx, MNSProfile.cxx, MNSProfile.hxx, MNSProfileDirServiceProvider.cxx, MNSProfileDirServiceProvider.hxx, MNSProfileDiscover.cxx, MNSProfileDiscover.hxx, MNSProfileManager.cxx, MNSProfileManager.hxx, MNSRunnable.cxx, MNSRunnable.hxx /dba/connectivity/source/drivers/mozab/mozillasrc/ MNSMozabProxy.cxx, MNSMozabProxy.hxx
Log: #i20088# thunderbird support File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MConfigAccess.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MConfigAccess.cxx?r1=1.4&r2=1.4.46.1 Delta lines: +4 -7 ------------------- --- MConfigAccess.cxx 25 Jun 2004 18:27:06 -0000 1.4 +++ MConfigAccess.cxx 28 Jan 2005 07:21:40 -0000 1.4.46.1 @@ -2,9 +2,9 @@ * * $RCSfile: MConfigAccess.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.46.1 $ * - * last change: $Author: hjs $ $Date: 2004/06/25 18:27:06 $ + * last change: $Author: windly $ $Date: 2005/01/28 07:21:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,8 +84,7 @@ Reference< XPropertySet > xNode; try { - //������������������������������������������������������������� - // create the config provider + //������������������������������������������������������������? // create the config provider Reference< XMultiServiceFactory > xConfigProvider( _rxORB->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider" )) ), UNO_QUERY @@ -97,7 +96,6 @@ ::rtl::OUString sCompleteNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Office.DataAccess/DriverSettings/" ); sCompleteNodePath += OConnection::getDriverImplementationName(); - //��������������������������������������������������������� // arguments for creating the config access Sequence< Any > aArguments(2); // the path to the node to open @@ -115,7 +113,6 @@ PropertyState_DIRECT_VALUE ); - //��������������������������������������������������������� // create the access Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess" )), File [changed]: MConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MConnection.cxx?r1=1.17.16.1&r2=1.17.16.2 Delta lines: +2 -12 -------------------- --- MConnection.cxx 17 Jan 2005 05:30:42 -0000 1.17.16.1 +++ MConnection.cxx 28 Jan 2005 07:21:41 -0000 1.17.16.2 @@ -2,9 +2,9 @@ * * $RCSfile: MConnection.cxx,v $ * - * $Revision: 1.17.16.1 $ + * $Revision: 1.17.16.2 $ * - * last change: $Author: windly $ $Date: 2005/01/17 05:30:42 $ + * last change: $Author: windly $ $Date: 2005/01/28 07:21:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,15 +79,9 @@ #ifndef _COM_SUN_STAR_SDBC_TRANSACTIONISOLATION_HPP_ #include <com/sun/star/sdbc/TransactionIsolation.hpp> #endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ -#include <com/sun/star/lang/DisposedException.hpp> -#endif #ifndef _DBHELPER_DBCHARSET_HXX_ #include <connectivity/dbcharset.hxx> #endif -#ifndef _COMPHELPER_EXTRACT_HXX_ -#include <comphelper/extract.hxx> -#endif #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> #endif @@ -105,7 +99,6 @@ using namespace connectivity::mozab; -// using namespace connectivity; using namespace dbtools; //------------------------------------------------------------------------------ @@ -159,7 +152,6 @@ : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_pDriver(_pDriver), m_xMetaData(NULL), - m_nAnonABCount( 0 ), m_nMaxResultRecords( -1 ), m_eSDBCAddressType(SDBCAddress::Unknown), m_aNameMapper(NULL) @@ -174,8 +166,6 @@ { if(!isClosed()) close(); - - m_pDriver->release(); m_pDriver = NULL; } File [changed]: MConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MConnection.hxx?r1=1.11.46.1&r2=1.11.46.2 Delta lines: +13 -16 --------------------- --- MConnection.hxx 17 Jan 2005 05:30:43 -0000 1.11.46.1 +++ MConnection.hxx 28 Jan 2005 07:21:41 -0000 1.11.46.2 @@ -2,9 +2,9 @@ * * $RCSfile: MConnection.hxx,v $ * - * $Revision: 1.11.46.1 $ + * $Revision: 1.11.46.2 $ * - * last change: $Author: windly $ $Date: 2005/01/17 05:30:43 $ + * last change: $Author: windly $ $Date: 2005/01/28 07:21:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -150,7 +150,6 @@ ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by // an operation - ::rtl::OUString m_sUser; // the user name MozabDriver* m_pDriver; // Pointer to the owning // driver object // Store Catalog @@ -159,13 +158,16 @@ OColumnAlias m_aColumnAlias; rtl::OUString m_sMozillaURI; rtl::OUString m_sMozillaProfile; - sal_Int32 m_nAnonABCount; sal_Int32 m_nMaxResultRecords; + MNameMapper* m_aNameMapper; + //LDAP only + rtl::OUString m_sHostName; sal_Bool m_bUseSSL; rtl::OUString m_sBindDN; + rtl::OUString m_sUser; // the user name rtl::OUString m_sPassword; - rtl::OUString m_sHostName; - MNameMapper* m_aNameMapper; + + SDBCAddress::sdbc_address_type m_eSDBCAddressType; @@ -218,13 +220,10 @@ // Additions from the land of mozilla - rtl::OUString getMozURI() const - { return m_sMozillaURI; } - // Additions from the land of mozilla - rtl::OUString getMozProfile() const - { return m_sMozillaProfile; } - void setMozProfile(rtl::OUString &aNewProfile) - { m_sMozillaProfile = aNewProfile; } + rtl::OUString getMozURI() const { return m_sMozillaURI; } + rtl::OUString getMozProfile() const { return m_sMozillaProfile; } + void setMozProfile(rtl::OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } + ::com::sun::star::mozilla::MozillaProductType getProduct() { if (m_eSDBCAddressType == SDBCAddress::ThunderBird) @@ -246,13 +245,11 @@ sal_Bool isThunderbird(void) const { return m_eSDBCAddressType == SDBCAddress::ThunderBird; } sal_Bool isOutlookExpress() const { return m_eSDBCAddressType == SDBCAddress::OutlookExp;} - sal_Int32 getNextAnonymousAB() { return (++m_nAnonABCount); } sal_Int32 getMaxResultRecords() const { return m_nMaxResultRecords; } SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} - const OColumnAlias & getColumnAlias() const - { return (m_aColumnAlias); } + const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } static const sal_Char* getSDBC_SCHEME_MOZILLA(); static const sal_Char* getSDBC_SCHEME_THUNDERBIRD(); 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.4&r2=1.1.2.5 Delta lines: +4 -7 ------------------- --- MMozillaBootstrap.cxx 27 Jan 2005 11:30:09 -0000 1.1.2.4 +++ MMozillaBootstrap.cxx 28 Jan 2005 07:21:41 -0000 1.1.2.5 @@ -2,9 +2,9 @@ * * $RCSfile: MMozillaBootstrap.cxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: windly $ $Date: 2005/01/27 11:30:09 $ + * last change: $Author: windly $ $Date: 2005/01/28 07:21:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,6 @@ pMozillaBootstrap->Init(); xMozillaBootstrap = pMozillaBootstrap; } - return pMozillaBootstrap; } @@ -109,6 +108,7 @@ { sal_Bool aProfileExists=sal_False; sal_Int32 nProduct = 0; + //This must be call before any mozilla code MNS_Init(aProfileExists,nProduct); m_ProfileManager = new ProfileManager(); @@ -120,7 +120,6 @@ void MozillaBootstrap::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - OMozillaBootstrap_BASE::disposing(); } @@ -129,8 +128,6 @@ rtl::OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeException) { return rtl::OUString::createFromAscii(MOZAB_MozillaBootstrap_IMPL_NAME); - // this name is referenced in the configuration and in the mozab.xml - // Please take care when changing it. } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException) @@ -226,7 +223,7 @@ ::rtl::OUString currProfileName = getCurrentProfile(); ::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct(); - //if client does not provide a profileName, we will them + //if client provides a profileName, we will use it if (profileName.getLength() && ( aCode->getProductType() != currProduct || !profileName.equals(currProfileName)) ) setCurrentProfile(aCode->getProductType(),profileName); File [changed]: MNSFolders.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +60 -0 -------------------- --- MNSFolders.cxx 25 Jan 2005 09:24:27 -0000 1.1.2.3 +++ MNSFolders.cxx 28 Jan 2005 07:21:42 -0000 1.1.2.4 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSFolders.cxx,v $ + * + * $Revision: 1.1.2.4 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:42 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #ifndef _MNSFOLDERS_HXX_ #include <MNSFolders.hxx> #endif File [changed]: MNSFolders.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +61 -0 -------------------- --- MNSFolders.hxx 24 Jan 2005 08:04:57 -0000 1.1.2.2 +++ MNSFolders.hxx 28 Jan 2005 07:21:42 -0000 1.1.2.3 @@ -1,3 +1,64 @@ +/************************************************************************* + * + * $RCSfile: MNSFolders.hxx,v $ + * + * $Revision: 1.1.2.3 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:42 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + #ifndef _MNSFOLDERS_HXX_ #define _MNSFOLDERS_HXX_ File [changed]: MNSProfile.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +60 -12 --------------------- --- MNSProfile.cxx 24 Jan 2005 07:49:04 -0000 1.1.2.2 +++ MNSProfile.cxx 28 Jan 2005 07:21:42 -0000 1.1.2.3 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSProfile.cxx,v $ + * + * $Revision: 1.1.2.3 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:42 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #include "nscore.h" #include "nsIPrefService.h" @@ -41,16 +101,9 @@ #include "MNSProfile.hxx" #include "MNSProfileDirServiceProvider.hxx" -#include <osl/diagnose.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/beans/Property.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <unotools/processfactory.hxx> #ifndef _COM_SUN_STAR_MOZILLA_XMOZILLABOOTSTRAP_HPP_ @@ -71,7 +124,6 @@ // Profile database to remember which profile has been // created with UILocale and contentLocale on profileManager -static nsHashtable *gLocaleProfiles = nsnull; static nsProfileDirServiceProvider *gDirServiceProvider = nsnull; @@ -110,10 +162,6 @@ nsresult rv = NS_OK; RegisterProfileManager(this); if (gInstanceCount++ == 0) { - gLocaleProfiles = new nsHashtable(); - if (!gLocaleProfiles) - return NS_ERROR_OUT_OF_MEMORY; - rv = NS_NewProfileDirServiceProvider( &gDirServiceProvider); if (NS_SUCCEEDED(rv)) rv = gDirServiceProvider->Register(); File [changed]: MNSProfile.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +60 -0 -------------------- --- MNSProfile.hxx 17 Jan 2005 05:30:49 -0000 1.1.2.1 +++ MNSProfile.hxx 28 Jan 2005 07:21:42 -0000 1.1.2.2 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSProfile.hxx,v $ + * + * $Revision: 1.1.2.2 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:42 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #include "nsIProfile.h" #include "nsIProfileInternal.h" File [changed]: MNSProfileDirServiceProvider.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +60 -0 -------------------- --- MNSProfileDirServiceProvider.cxx 17 Jan 2005 05:30:49 -0000 1.1.2.1 +++ MNSProfileDirServiceProvider.cxx 28 Jan 2005 07:21:42 -0000 1.1.2.2 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSProfileDirServiceProvider.cxx,v $ + * + * $Revision: 1.1.2.2 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:42 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #include "MNSProfileDirServiceProvider.hxx" #include "nsIAtom.h" File [changed]: MNSProfileDirServiceProvider.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +60 -0 -------------------- --- MNSProfileDirServiceProvider.hxx 17 Jan 2005 05:30:49 -0000 1.1.2.1 +++ MNSProfileDirServiceProvider.hxx 28 Jan 2005 07:21:43 -0000 1.1.2.2 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSProfileDirServiceProvider.hxx,v $ + * + * $Revision: 1.1.2.2 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:43 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ // Interfaces Needed #include "nsIDirectoryService.h" File [changed]: MNSProfileDiscover.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +80 -9 -------------------- --- MNSProfileDiscover.cxx 27 Jan 2005 11:30:10 -0000 1.1.2.4 +++ MNSProfileDiscover.cxx 28 Jan 2005 07:21:43 -0000 1.1.2.5 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSProfileDiscover.cxx,v $ + * + * $Revision: 1.1.2.5 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:43 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #include "MNSProfileDiscover.hxx" #include "MNSProfile.hxx" @@ -100,24 +160,29 @@ } ProfileAccess::ProfileAccess() { - FillProductInfo(); + LoadProductsInfo(); } - sal_Int32 ProfileAccess::FillProductInfo() + sal_Int32 ProfileAccess::LoadProductsInfo() { - FillMozillaProfile(); + //load mozilla profiles to m_ProductProfileList + LoadMozillaProfiles(); sal_Int32 index=MozillaProductType_Mozilla; sal_Int32 count=m_ProductProfileList[index].mProfileList.size(); - count += FillXPToolkitProfile(MozillaProductType_Thunderbird); - count += FillXPToolkitProfile(MozillaProductType_Firefox); + //load thunderbird profiles to m_ProductProfileList + count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird); + //load firefox profiles to m_ProductProfileList + //firefox profile does not containt address book, but maybe others need them + count += LoadXPToolkitProfiles(MozillaProductType_Firefox); return count; } - nsresult ProfileAccess::FillMozillaProfile() + nsresult ProfileAccess::LoadMozillaProfiles() { sal_Int32 index=MozillaProductType_Mozilla; ProductStruct &m_Product = m_ProductProfileList[index]; nsresult rv = NS_OK; + //step 1 : get mozilla registry file nsCOMPtr<nsILocalFile> localFile; ::rtl::OString regDir = getRegistryFileName(MozillaProductType_Mozilla); nsCAutoString registryDir(regDir.getStr()); @@ -131,12 +196,14 @@ return rv; nsCOMPtr<nsIRegistry> registry(do_CreateInstance(NS_REGISTRY_CONTRACTID, &rv)); NS_ENSURE_SUCCESS(rv,rv); + //step 2: open mozilla registry file rv = registry->Open(localFile); NS_ENSURE_SUCCESS(rv,rv); nsCOMPtr<nsIEnumerator> enumKeys; nsRegistryKey profilesTreeKey; + //step 3:Enumerator it rv = registry->GetKey(nsIRegistry::Common, szProfileSubtreeString.getStr(), &profilesTreeKey); @@ -202,7 +269,7 @@ #else rv = NS_NewLocalFile(regData, PR_TRUE, getter_AddRefs(tempLocal)); #endif - + //Add found profile to profile lists if (NS_SUCCEEDED(rv) && tempLocal) { ProfileStruct* profileItem = new ProfileStruct(MozillaProductType_Mozilla,NS_STATIC_CAST(const PRUnichar*, profile),tempLocal); @@ -212,7 +279,8 @@ } return rv; } - sal_Int32 ProfileAccess::FillXPToolkitProfile(MozillaProductType product) + //Thunderbird and firefox profiles are saved in profiles.ini + sal_Int32 ProfileAccess::LoadXPToolkitProfiles(MozillaProductType product) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; @@ -305,6 +373,7 @@ ProductStruct &m_Product = m_ProductProfileList[index]; if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { + //Profile not found return ::rtl::OUString(); } else @@ -339,10 +408,12 @@ ProductStruct &m_Product = m_ProductProfileList[index]; if (m_Product.mCurrentProfileName.getLength() != 0) { + //default profile setted in mozilla registry return m_Product.mCurrentProfileName; } if (m_Product.mProfileList.size() == 0) { + //there are not any profiles return ::rtl::OUString(); } ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second; File [changed]: MNSProfileDiscover.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +66 -3 -------------------- --- MNSProfileDiscover.hxx 27 Jan 2005 11:30:10 -0000 1.1.2.3 +++ MNSProfileDiscover.hxx 28 Jan 2005 07:21:43 -0000 1.1.2.4 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSProfileDiscover.hxx,v $ + * + * $Revision: 1.1.2.4 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:43 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #ifndef __MNSProfileDiscover_h___ #define __MNSProfileDiscover_h___ @@ -79,6 +139,7 @@ ProfileList mProfileList; }; + //Used to query profiles information class ProfileAccess { public: @@ -94,9 +155,11 @@ protected: ProductStruct m_ProductProfileList[4]; - sal_Int32 FillProductInfo(); - nsresult FillMozillaProfile(); - sal_Int32 FillXPToolkitProfile(MozillaProductType product); + sal_Int32 LoadProductsInfo(); + nsresult LoadMozillaProfiles(); + sal_Int32 LoadXPToolkitProfiles(MozillaProductType product); + + //used by isProfileLocked nsresult isExistFileOrSymlink(nsILocalFile* aFile,PRBool *bExist); nsresult isLockExist(nsILocalFile* aFile); }; File [changed]: MNSProfileManager.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx?r1=1.1.2.6&r2=1.1.2.7 Delta lines: +66 -2 -------------------- --- MNSProfileManager.cxx 25 Jan 2005 09:24:29 -0000 1.1.2.6 +++ MNSProfileManager.cxx 28 Jan 2005 07:21:43 -0000 1.1.2.7 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSProfileManager.cxx,v $ + * + * $Revision: 1.1.2.7 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:43 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #include "MNSProfileManager.hxx" #include "MNSProfile.hxx" @@ -77,7 +137,6 @@ } ::sal_Int32 ProfileManager::shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException) { -// MNS_Term(sal_False); return --nInitCounter; } ::com::sun::star::mozilla::MozillaProductType ProfileManager::getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException) @@ -99,17 +158,22 @@ ::rtl::OUString ProfileManager::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { ::rtl::OUString currentProfile = getCurrentProfile(); - if (!profileName.getLength()) + //if profileName not given, then skip and return curernt profile + if (!profileName.getLength() && m_CurrentProduct == product) return currentProfile; if (m_CurrentProduct == product && profileName.equals(currentProfile)) return currentProfile; + //set current product m_CurrentProduct = product; + + //get profile mozilla profile service nsresult rv; nsCOMPtr<nsIProfile> theProfile(do_GetService(NS_PROFILE_CONTRACTID,&rv)); if (NS_FAILED(rv)) return ::rtl::OUString(); const PRUnichar* pUsedProfile = profileName.getStr(); + //set current profile rv = theProfile->SetCurrentProfile( pUsedProfile ); if (NS_FAILED(rv)) return ::rtl::OUString(); return currentProfile; File [changed]: MNSProfileManager.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +60 -0 -------------------- --- MNSProfileManager.hxx 17 Jan 2005 05:30:51 -0000 1.1.2.1 +++ MNSProfileManager.hxx 28 Jan 2005 07:21:43 -0000 1.1.2.2 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSProfileManager.hxx,v $ + * + * $Revision: 1.1.2.2 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:43 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #ifndef __MNSProfileManager_h___ #define __MNSProfileManager_h___ File [changed]: MNSRunnable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +61 -10 --------------------- --- MNSRunnable.cxx 17 Jan 2005 05:30:52 -0000 1.1.2.1 +++ MNSRunnable.cxx 28 Jan 2005 07:21:43 -0000 1.1.2.2 @@ -1,3 +1,64 @@ +/************************************************************************* + * + * $RCSfile: MNSRunnable.cxx,v $ + * + * $Revision: 1.1.2.2 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:43 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + #ifndef _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_ #include "MNSRunnable.hxx" #endif @@ -25,16 +86,6 @@ #include "nsILDAPErrors.h" #include "nsILDAPConnection.h" #include "nsILDAPOperation.h" - -#ifndef _CONNECTIVITY_MAB_QUERY_HXX_ -#include "MQuery.hxx" -#endif -#ifndef _CONNECTIVITY_MAB_QUERYHELPER_HXX_ -#include <MQueryHelper.hxx> -#endif - - -#define TYPEASSERT(value,type) if (value != type) return !NS_OK; using namespace connectivity::mozab; File [changed]: MNSRunnable.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +61 -0 -------------------- --- MNSRunnable.hxx 17 Jan 2005 05:30:52 -0000 1.1.2.1 +++ MNSRunnable.hxx 28 Jan 2005 07:21:44 -0000 1.1.2.2 @@ -1,3 +1,64 @@ +/************************************************************************* + * + * $RCSfile: MNSRunnable.hxx,v $ + * + * $Revision: 1.1.2.2 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:44 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + #ifndef _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_ #define _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_ #ifndef _CONNECTIVITY_MAB_NS_DECLARES_HXX_ Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MNSMozabProxy.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx?r1=1.2.46.2&r2=1.2.46.3 Delta lines: +60 -0 -------------------- --- MNSMozabProxy.cxx 24 Jan 2005 08:04:59 -0000 1.2.46.2 +++ MNSMozabProxy.cxx 28 Jan 2005 07:21:44 -0000 1.2.46.3 @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: MNSMozabProxy.cxx,v $ + * + * $Revision: 1.2.46.3 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:44 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #ifndef _CONNECTIVITY_MAB_MOZABHELPER_HXX_ #include "MNSMozabProxy.hxx" #endif File [changed]: MNSMozabProxy.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx?r1=1.2.46.2&r2=1.2.46.3 Delta lines: +61 -0 -------------------- --- MNSMozabProxy.hxx 24 Jan 2005 08:04:59 -0000 1.2.46.2 +++ MNSMozabProxy.hxx 28 Jan 2005 07:21:44 -0000 1.2.46.3 @@ -1,3 +1,64 @@ +/************************************************************************* + * + * $RCSfile: MNSMozabProxy.hxx,v $ + * + * $Revision: 1.2.46.3 $ + * + * last change: $Author: windly $ $Date: 2005/01/28 07:21:44 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + #ifndef _CONNECTIVITY_MAB_MOZABHELPER_HXX_ #define _CONNECTIVITY_MAB_MOZABHELPER_HXX_ #ifndef _CONNECTIVITY_MAB_NS_DECLARES_HXX_ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
