diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 11:32:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 11:32:09 +0000 |
| commit | 9e2ba9536bf5a079f7099d2e40e1491d8168d673 (patch) | |
| tree | b98a2bad73550579438e21d4700b953930bde473 /extensions/source | |
| parent | 6931523e783d3b48286a619e58d556494d724f0c (diff) | |
INTEGRATION: CWS sb87 (1.8.52); FILE MERGED
2008/04/24 13:12:52 sb 1.8.52.2: RESYNC: (1.8-1.9); FILE MERGED
2008/04/04 11:53:50 sb 1.8.52.1: #i87548# moved npsoplugin dynamic library to brand layer, kept nsplugin executable (called from plugin, in turn calling soffice) in basis layer
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/nsplugin/source/so_env.cxx | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index 304bd877e7ac..88015729f6de 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: so_env.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -159,6 +159,12 @@ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const ch lRet = RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0", 0, KEY_QUERY_VALUE, &hKey ); + if (lRet == ERROR_FILE_NOT_FOUND) { + lRet = RegOpenKeyEx( + HKEY_CURRENT_USER, + "SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0", 0, + KEY_QUERY_VALUE, &hKey); + } debug_fprintf(NSP_LOG_APPEND, "2 before before strstr realFileName is %s\n", realFileName); if( lRet != ERROR_SUCCESS ) return FALSE; @@ -211,21 +217,6 @@ const char* findProgramDir() return sProgram; } -// Return the nsplugin executable file path, return value like "/home/build/staroffice/program/nsplugin" -const char* findNsExeFile() -{ - static char sNsExe[NPP_BUFFER_SIZE] = {0}; - - if (!sNsExe[0]) - { - sprintf(sNsExe, "%s/%s", findProgramDir(), PLUGIN_EXE_FILE_NAME); -#ifdef WNT - UnixToDosPath(sNsExe); -#endif - } - return sNsExe; -} - // Return: "/home/build/staroffice/program" + original system library path const char* getNewLibraryPath() { |