diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 11:11:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 11:11:38 +0000 |
| commit | 5f2e8a93de0ea83a8361efdcc7ace2065fe741a6 (patch) | |
| tree | ddcde6c09ad527dc21d0bc67f5cb8d37aa471ba6 /desktop/win32 | |
| parent | 9d28bc52667f349318d96a5565c88da1a0b1fc03 (diff) | |
INTEGRATION: CWS sb86 (1.15.6); FILE MERGED
2008/03/27 16:14:57 sb 1.15.6.1: #i87511# no need to explicitly set INIFILEPATH
Diffstat (limited to 'desktop/win32')
| -rw-r--r-- | desktop/win32/source/officeloader/officeloader.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index 38311b648982..1a980a3aaa7d 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: officeloader.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.17 $ * * This file is part of OpenOffice.org. * @@ -304,8 +304,6 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) for (int i = 1; i < argc; ++i) { n += _tcslen(argv[i]) + 3; } - n += MY_LENGTH(" \"-env:INIFILEPATH=") + _tcslen(szIniDirectory) - + MY_LENGTH("soffice.ini\""); lpCommandLine = new TCHAR[n + 1]; } _tcscpy(lpCommandLine, _T("\"")); @@ -316,9 +314,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) _tcscat(lpCommandLine, argv[i]); } } - _tcscat(lpCommandLine, _T("\" \"-env:INIFILEPATH=")); - _tcscat(lpCommandLine, szIniDirectory); - _tcscat(lpCommandLine, _T("soffice.ini\"")); + _tcscat(lpCommandLine, _T("\"")); first = false; TCHAR szParentProcessId[64]; // This is more than large enough for a 128 bit decimal value |