diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-10 14:39:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-10 14:39:45 +0000 |
| commit | 44805707bcc3225bb56a6e05e8f48fcbcadb81b8 (patch) | |
| tree | 1d945d57035aeefeae9a5882fc5c62d27821aa14 /testautomation | |
| parent | cb4441793bf14923be12267954965e4d82351390 (diff) | |
INTEGRATION: CWS firsttime (1.2.4); FILE MERGED
2008/07/01 19:09:45 tbo 1.2.4.1: Issue number: i91245
Diffstat (limited to 'testautomation')
| -rwxr-xr-x | testautomation/global/system/includes/iniinfo.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc index 32549210a1ae..c8dd4a2971cc 100755 --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc @@ -8,9 +8,9 @@ '* '* $RCSfile: iniinfo.inc,v $ '* -'* $Revision: 1.2 $ +'* $Revision: 1.3 $ '* -'* last change: $Author: tbo $ $Date: 2008-06-18 10:02:29 $ +'* last change: $Author: rt $ $Date: 2008-07-10 15:39:45 $ '* '* This file is part of OpenOffice.org. '* @@ -922,6 +922,10 @@ function getSofficeNative() as string if fileExists(sCandidates(i)) then '/// cut off program//soffice from link destination ///' y = instr(sCandidates(i), "program/soffice") + if gPlatform = lcase("osx") AND y < 1 then + ' Accept also MacOS in link to soffice binary + y = instr(sCandidates(i), "MacOS/soffice") + end if if (y > 0) then sCandidates(i) = left(sCandidates(i), y-1) else |