Tag: cws_src680_mozab05 User: windly Date: 05/01/24 00:05:03 Modified: /dba/connectivity/source/drivers/mozab/ MServices.cxx /dba/connectivity/source/drivers/mozab/bootstrap/ MNSFolders.cxx, MNSFolders.hxx, MNSINIParser.cxx, MNSINIParser.hxx, MNSProfileDiscover.hxx, MNSProfileManager.cxx /dba/connectivity/source/drivers/mozab/mozillasrc/ MDatabaseMetaDataHelper.cxx, MNSMozabProxy.cxx, MNSMozabProxy.hxx
Log: #i20088# fix build bugs on solaris sparc File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MServices.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MServices.cxx?r1=1.2.46.1&r2=1.2.46.2 Delta lines: +4 -4 ------------------- --- MServices.cxx 17 Jan 2005 05:30:43 -0000 1.2.46.1 +++ MServices.cxx 24 Jan 2005 08:04:56 -0000 1.2.46.2 @@ -2,9 +2,9 @@ * * $RCSfile: MServices.cxx,v $ * - * $Revision: 1.2.46.1 $ + * $Revision: 1.2.46.2 $ * - * last change: $Author: windly $ $Date: 2005/01/17 05:30:43 $ + * last change: $Author: windly $ $Date: 2005/01/24 08:04:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -183,7 +183,7 @@ Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); REGISTER_PROVIDER( - L"com.sun.star.comp.mozilla.MozillaBootstrap", + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")), aSNS, xKey); return sal_True; @@ -240,7 +240,7 @@ MozabDriver::getSupportedServiceNames_Static(), MozabDriver_CreateInstance, ::cppu::createSingleFactory); } - else if (aImplName.equals( L"com.sun.star.comp.mozilla.MozillaBootstrap" )) + else if (aImplName.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")) )) { Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: MNSFolders.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +1 -0 ------------------- --- MNSFolders.cxx 17 Jan 2005 05:30:45 -0000 1.1.2.1 +++ MNSFolders.cxx 24 Jan 2005 08:04:57 -0000 1.1.2.2 @@ -71,3 +71,4 @@ return getRegistryDir(product) + ::rtl::OString(APP_REGISTRY_NAME); } + File [changed]: MNSFolders.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +2 -1 ------------------- --- MNSFolders.hxx 17 Jan 2005 05:30:46 -0000 1.1.2.1 +++ MNSFolders.hxx 24 Jan 2005 08:04:57 -0000 1.1.2.2 @@ -17,3 +17,4 @@ ::rtl::OString getRegistryFileName(::com::sun::star::mozilla::MozillaProductType product); #endif \ No newline at end of file + File [changed]: MNSINIParser.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +2 -1 ------------------- --- MNSINIParser.cxx 17 Jan 2005 05:30:46 -0000 1.1.2.1 +++ MNSINIParser.cxx 24 Jan 2005 08:04:57 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: MNSINIParser.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: windly $ $Date: 2005/01/17 05:30:46 $ + * last change: $Author: windly $ $Date: 2005/01/24 08:04:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,7 @@ * ************************************************************************/ #include <MNSINIParser.hxx> +#include <rtl/byteseq.hxx> ini_Section * IniParser::getSection(OUString const & secName) { File [changed]: MNSINIParser.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +3 -2 ------------------- --- MNSINIParser.hxx 17 Jan 2005 05:30:46 -0000 1.1.2.1 +++ MNSINIParser.hxx 24 Jan 2005 08:04:57 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: MNSINIParser.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: windly $ $Date: 2005/01/17 05:30:46 $ + * last change: $Author: windly $ $Date: 2005/01/24 08:04:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,3 +117,4 @@ }; #endif \ No newline at end of file + File [changed]: MNSProfileDiscover.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +11 -1 -------------------- --- MNSProfileDiscover.hxx 17 Jan 2005 05:30:50 -0000 1.1.2.1 +++ MNSProfileDiscover.hxx 24 Jan 2005 08:04:58 -0000 1.1.2.2 @@ -25,7 +25,10 @@ #include <com/sun/star/uno/Sequence.hxx> #endif +#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> +#endif + #include <vector> #include <map> @@ -44,6 +47,14 @@ { namespace mozab { + class ProfileStruct; + } +} +typedef ::std::map < ::rtl::OUString, ::connectivity::mozab::ProfileStruct* > ProfileList; +namespace connectivity +{ + namespace mozab + { class ProfileStruct { public: @@ -57,7 +68,6 @@ ::rtl::OUString profileName; nsCOMPtr<nsILocalFile> profilePath; }; - typedef ::std::map<::rtl::OUString ,ProfileStruct*> ProfileList; class ProductStruct { File [changed]: MNSProfileManager.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +1 -1 ------------------- --- MNSProfileManager.cxx 24 Jan 2005 07:49:04 -0000 1.1.2.3 +++ MNSProfileManager.cxx 24 Jan 2005 08:04:58 -0000 1.1.2.4 @@ -103,7 +103,7 @@ if (!aProfile) { aProfile=new nsProfile(); - aProfile->StartupWithArgs(NULL,FALSE); + aProfile->StartupWithArgs(NULL,sal_False); } setCurrentProfile(product,profileName); 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.2&r2=1.9.46.3 Delta lines: +11 -12 --------------------- --- MDatabaseMetaDataHelper.cxx 24 Jan 2005 07:49:06 -0000 1.9.46.2 +++ MDatabaseMetaDataHelper.cxx 24 Jan 2005 08:04:59 -0000 1.9.46.3 @@ -2,9 +2,9 @@ * * $RCSfile: MDatabaseMetaDataHelper.cxx,v $ * - * $Revision: 1.9.46.2 $ + * $Revision: 1.9.46.3 $ * - * last change: $Author: windly $ $Date: 2005/01/24 07:49:06 $ + * last change: $Author: windly $ $Date: 2005/01/24 08:04:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,7 +125,6 @@ using namespace connectivity::mozab; using namespace connectivity; -using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -516,8 +515,8 @@ ::std::vector< ::rtl::OUString >& _rTypes) { sal_Bool bGivenURI; - rtl::OUString sAbURI; - OString sAbURIString; + ::rtl::OUString sAbURI; + ::rtl::OString sAbURIString; OSL_TRACE( "IN MDatabaseMetaDataHelper::getTableStrings( 0x%08X, %s)\n", _pCon, _pCon->getForceLoadTables()?"True":"False" ); @@ -721,13 +720,13 @@ sal_Int32 pos = sAbURI.indexOf( MOZ_SCHEMA ); if ( pos != -1 ) { - sAbURI = sAbURI.replaceAt (pos, strlen( MOZ_SCHEMA ), OString(LDAP_SCHEMA) ); + sAbURI = sAbURI.replaceAt (pos, strlen( MOZ_SCHEMA ), ::rtl::OString(LDAP_SCHEMA) ); } pos = sAbURI.indexOf( QUERY_CHAR ); if ( pos != -1 ) { sal_Int32 len = sAbURI.getLength(); - sAbURI = sAbURI.replaceAt( pos, len - pos, OString("") ); + sAbURI = sAbURI.replaceAt( pos, len - pos, ::rtl::OString("") ); } const sal_Unicode* bindDN=nsnull; if (sAbBindDN.getLength() != 0) @@ -744,14 +743,14 @@ args.arg4 = (void*)&useSSL; MNSMozabProxy xMProxy; - if (xMProxy.StartProxy(&args,m_ProductType,OUString())) //Init LDAP,pass OUString() to StarProxy to ignore profile switch + if (xMProxy.StartProxy(&args,m_ProductType,::rtl::OUString())) //Init LDAP,pass OUString() to StarProxy to ignore profile switch { args.funcIndex = ProxiedFunc::FUNC_TESTLDAP_IS_LDAP_CONNECTED; TimeValue timeValue = { 1, 0 }; // 1 * 60 Seconds timeout sal_Int32 times=0; while( times < 60 ) { - rv = xMProxy.StartProxy(&args,m_ProductType,OUString()); //check whether ldap is connect + rv = xMProxy.StartProxy(&args,m_ProductType,::rtl::OUString()); //check whether ldap is connect if (!rv ) { osl_waitThread(&timeValue); @@ -761,7 +760,7 @@ break; } args.funcIndex = ProxiedFunc::FUNC_TESTLDAP_IS_LDAP_CONNECTED; - rv = xMProxy.StartProxy(&args,m_ProductType,OUString()); //release resource + rv = xMProxy.StartProxy(&args,m_ProductType,::rtl::OUString()); //release resource } return rv; } File [changed]: MNSMozabProxy.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx?r1=1.2.46.1&r2=1.2.46.2 Delta lines: +1 -1 ------------------- --- MNSMozabProxy.cxx 17 Jan 2005 05:30:55 -0000 1.2.46.1 +++ MNSMozabProxy.cxx 24 Jan 2005 08:04:59 -0000 1.2.46.2 @@ -79,7 +79,7 @@ OSL_ENSURE( xFactory.is(), "can't get service factory" ); ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); - xRunner = ::com::sun::star::uno::Reference<::com::sun::star::mozilla::XProxyRunner>(xInstance,UNO_QUERY); + xRunner = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner >(xInstance,UNO_QUERY); } const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy > aCode(this); return xRunner->Run(aCode); File [changed]: MNSMozabProxy.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx?r1=1.2.46.1&r2=1.2.46.2 Delta lines: +3 -2 ------------------- --- MNSMozabProxy.hxx 17 Jan 2005 05:30:55 -0000 1.2.46.1 +++ MNSMozabProxy.hxx 24 Jan 2005 08:04:59 -0000 1.2.46.2 @@ -60,7 +60,8 @@ } }; typedef RunArgs RunArgs; - typedef ::cppu::WeakImplHelper1<::com::sun::star::mozilla::XCodeProxy> MNSMozabProxy_BASE; + typedef ::cppu::WeakImplHelper1< ::com::sun::star::mozilla::XCodeProxy > MNSMozabProxy_BASE; + class MNSMozabProxy : public MNSMozabProxy_BASE { @@ -81,7 +82,7 @@ nsresult InitLDAP(sal_Char* sUri, sal_Unicode* sBindDN, sal_Unicode* sPasswd,sal_Bool * nUseSSL); nsresult QueryHelperStub(); private: - ::com::sun::star::uno::Reference<::com::sun::star::mozilla::XProxyRunner> xRunner; + ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner > xRunner; RunArgs * m_Args; ::com::sun::star::mozilla::MozillaProductType m_Product; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
