Tag: cws_src680_mozab05 User: windly Date: 05/01/25 01:24:33 Modified: /dba/connectivity/source/drivers/mozab/bootstrap/ MNSFolders.cxx, MNSINIParser.cxx, MNSInit.cxx, MNSProfileDiscover.cxx, MNSProfileManager.cxx
Log: #i20088# now work on linux/solaris too File Changes: 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.2&r2=1.1.2.3 Delta lines: +0 -5 ------------------- --- MNSFolders.cxx 24 Jan 2005 08:04:57 -0000 1.1.2.2 +++ MNSFolders.cxx 25 Jan 2005 09:24:27 -0000 1.1.2.3 @@ -5,11 +5,6 @@ #ifdef UNIX #include <sys/types.h> #include <strings.h> -#ifdef NP_LINUX -#include <stdarg.h> -#else -#include <sys/varargs.h> -#endif #endif // End UNIX #ifdef WNT File [changed]: MNSINIParser.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +18 -8 -------------------- --- MNSINIParser.cxx 24 Jan 2005 08:04:57 -0000 1.1.2.2 +++ MNSINIParser.cxx 25 Jan 2005 09:24:27 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: MNSINIParser.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: windly $ $Date: 2005/01/24 08:04:57 $ + * last change: $Author: windly $ $Date: 2005/01/25 09:24:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,10 +69,8 @@ } IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException ) { - OUString curDirPth; OUString iniUrl; - osl_getProcessWorkingDir( &curDirPth.pData ); - if (osl_getAbsoluteFileURL( curDirPth.pData, rIniName.pData, &iniUrl.pData )) + if (osl_File_E_None != osl_getFileURLFromSystemPath(rIniName.pData, &iniUrl.pData)) throw ::com::sun::star::io::IOException(); @@ -81,8 +79,20 @@ OSL_TRACE(__FILE__" -- parser() - %s\n", sFile.getStr()); #endif oslFileHandle handle=NULL; - if (iniUrl.getLength() && - osl_File_E_None == osl_openFile(iniUrl.pData, &handle, osl_File_OpenFlag_Read)) + oslFileError fileError = osl_File_E_INVAL; + try{ + if (iniUrl.getLength()) + fileError = osl_openFile(iniUrl.pData, &handle, osl_File_OpenFlag_Read); + } + catch(::com::sun::star::io::IOException e) + { +#if OSL_DEBUG_LEVEL > 1 + OString file_tmp = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); + OSL_TRACE( __FILE__" -- couldn't open file: %s", file_tmp.getStr() ); +#endif + } + + if (osl_File_E_None == fileError) { rtl::ByteSequence seq; sal_uInt64 nSize = 0; File [changed]: MNSInit.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +6 -9 ------------------- --- MNSInit.cxx 24 Jan 2005 07:49:04 -0000 1.1.2.2 +++ MNSInit.cxx 25 Jan 2005 09:24:27 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: MNSInit.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: windly $ $Date: 2005/01/24 07:49:04 $ + * last change: $Author: windly $ $Date: 2005/01/25 09:24:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -188,14 +188,11 @@ if (env) { nsDependentCString sPath(env); - nsresult rv = NS_NewNativeLocalFile(sPath, PR_TRUE, getter_AddRefs(binDir)); + rv = NS_NewNativeLocalFile(sPath, PR_TRUE, getter_AddRefs(binDir)); if (NS_FAILED(rv)) return sal_False; } - if (NS_FAILED(rv)) - return rv; - // Initialise XPCOM @@ -220,7 +217,7 @@ if (NS_FAILED(rv)) return rv; -// eventQService->CreateThreadEventQueue(); + eventQService->CreateThreadEventQueue(); // nsCOMPtr<nsIObserver> mStartupNotifier = do_CreateInstance(NS_APPSTARTUPNOTIFIER_CONTRACTID, &rv); // if(NS_FAILED(rv)) @@ -266,7 +263,7 @@ if (NS_SUCCEEDED(rv)) { - rv = eventQService->GetThreadEventQueue(NS_UI_THREAD, getter_AddRefs(eventQ)); + rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD , getter_AddRefs(eventQ)); if (NS_FAILED(rv)) { rv = eventQService->CreateThreadEventQueue(); File [changed]: MNSProfileDiscover.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +15 -22 --------------------- --- MNSProfileDiscover.cxx 21 Jan 2005 06:30:53 -0000 1.1.2.2 +++ MNSProfileDiscover.cxx 25 Jan 2005 09:24:28 -0000 1.1.2.3 @@ -59,21 +59,9 @@ // Registry Keys -#define kRegistryYesString (NS_LITERAL_STRING("yes")) -#define kRegistryNoString (NS_LITERAL_STRING("no")) - -#define kRegistryProfileSubtreeString (NS_LITERAL_STRING("Profiles")) -#define kRegistryCurrentProfileString (NS_LITERAL_STRING("CurrentProfile")) -#define kRegistryMigratedString (NS_LITERAL_STRING("migrated")) -#define kRegistryDirectoryString (NS_LITERAL_STRING("directory")) -#define kRegistryNeedMigrationString (NS_LITERAL_STRING("NeedMigration")) -#define kRegistryMozRegDataMovedString (NS_LITERAL_STRING("OldRegDataMoved")) -#define kRegistryCreationTimeString (NS_LITERAL_CSTRING("CreationTime")) -#define kRegistryLastModTimeString (NS_LITERAL_CSTRING("LastModTime")) -#define kRegistryVersionString (NS_LITERAL_STRING("Version")) -#define kRegistryVersion_1_0 (NS_LITERAL_STRING("1.0")) -#define kRegistryCurrentVersion (NS_LITERAL_STRING("1.0")) -#define kRegistryStartWithLastString (NS_LITERAL_CSTRING("AutoStartWithLast")) +static ::rtl::OUString szProfileSubtreeString=::rtl::OUString::createFromAscii("Profiles"); +static ::rtl::OUString szCurrentProfileString= ::rtl::OUString::createFromAscii("CurrentProfile"); +static ::rtl::OUString szDirectoryString =::rtl::OUString::createFromAscii("directory"); #ifndef MAXPATHLEN #define MAXPATHLEN 1024 @@ -146,10 +134,15 @@ nsRegistryKey profilesTreeKey; rv = registry->GetKey(nsIRegistry::Common, - kRegistryProfileSubtreeString.get(), + szProfileSubtreeString.getStr(), &profilesTreeKey); - - NS_ENSURE_SUCCESS(rv,rv); + if (NS_FAILED(rv)) + { + rv = registry->AddKey(nsIRegistry::Common, + szProfileSubtreeString.getStr(), + &profilesTreeKey); + if (NS_FAILED(rv)) return rv; + } nsXPIDLString tmpCurrentProfile; @@ -158,7 +151,7 @@ // Get the current profile rv = registry->GetString(profilesTreeKey, - kRegistryCurrentProfileString.get(), + szCurrentProfileString.getStr(), getter_Copies(tmpCurrentProfile)); if (tmpCurrentProfile) @@ -203,7 +196,7 @@ nsXPIDLString regData; rv = registry->GetString(profKey, - kRegistryDirectoryString.get(), + szDirectoryString.getStr(), getter_Copies(regData)); if (NS_FAILED(rv)) continue; File [changed]: MNSProfileManager.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx?r1=1.1.2.5&r2=1.1.2.6 Delta lines: +0 -34 -------------------- --- MNSProfileManager.cxx 24 Jan 2005 09:47:16 -0000 1.1.2.5 +++ MNSProfileManager.cxx 25 Jan 2005 09:24:29 -0000 1.1.2.6 @@ -38,43 +38,9 @@ #include <rmsdef.h> #endif -#include "nsICharsetConverterManager.h" #include "nsIPlatformCharset.h" #include <MNSInit.hxx> -#if defined (XP_UNIX) -#define USER_ENVIRONMENT_VARIABLE "USER" -#define LOGNAME_ENVIRONMENT_VARIABLE "LOGNAME" -#define HOME_ENVIRONMENT_VARIABLE "HOME" -#define PROFILE_NAME_ENVIRONMENT_VARIABLE "PROFILE_NAME" -#define PROFILE_HOME_ENVIRONMENT_VARIABLE "PROFILE_HOME" -#define DEFAULT_UNIX_PROFILE_NAME "default" -#ifndef XP_MACOSX /* Don't use symlink-based locking on OS X */ -#define USE_SYMLINK_LOCKING -#endif -#elif defined (XP_BEOS) -#endif - -// IID and CIDs of all the services needed -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - -// Registry Keys - -#define kRegistryYesString (NS_LITERAL_STRING("yes")) -#define kRegistryNoString (NS_LITERAL_STRING("no")) - -#define kRegistryProfileSubtreeString (NS_LITERAL_STRING("Profiles")) -#define kRegistryCurrentProfileString (NS_LITERAL_STRING("CurrentProfile")) -#define kRegistryMigratedString (NS_LITERAL_STRING("migrated")) -#define kRegistryDirectoryString (NS_LITERAL_STRING("directory")) -#define kRegistryNeedMigrationString (NS_LITERAL_STRING("NeedMigration")) -#define kRegistryMozRegDataMovedString (NS_LITERAL_STRING("OldRegDataMoved")) -#define kRegistryCreationTimeString (NS_LITERAL_CSTRING("CreationTime")) -#define kRegistryLastModTimeString (NS_LITERAL_CSTRING("LastModTime")) -#define kRegistryVersionString (NS_LITERAL_STRING("Version")) -#define kRegistryVersion_1_0 (NS_LITERAL_STRING("1.0")) -#define kRegistryCurrentVersion (NS_LITERAL_STRING("1.0")) -#define kRegistryStartWithLastString (NS_LITERAL_CSTRING("AutoStartWithLast")) #ifndef MAXPATHLEN #define MAXPATHLEN 1024 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
