summaryrefslogtreecommitdiff
path: root/testautomation/global
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-10-21 17:18:13 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-10-24 13:59:58 +0200
commitb786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch)
treea0adbba80933544e1912adeb29a8e79797b7fc1c /testautomation/global
parent3535ceeac6f1b4277279082998663feb84d05487 (diff)
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'testautomation/global')
-rw-r--r--testautomation/global/system/includes/iniinfo.inc42
1 files changed, 2 insertions, 40 deletions
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 93b4a22841f5..727763968076 100644
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -1130,44 +1130,6 @@ end function
function getOfficeBasisPath as string
const CFN = "global::system::iniinfo.inc:getOfficeBasisPath: "
- 'get the basis directory from the information of basis-link
- dim ltemp(5) as string
- dim sFile as string
- dim sTemp as string
- dim sPath as string
-
- sTemp = gNetzOfficePath
- sFile = gNetzOfficePath & "basis-link"
-
- if FileExists( sFile ) then
- if ( lcase( gPlatform ) = "osx" ) then
- 'MacOS X
- sTemp = sFile
- else
- if ( gPlatGroup = "unx" ) then
- 'Unixes
- sPath = getLinkDestination( sFile )
- sTemp = fRelativeToAbsolutePath( gNetzOfficePath & sPath )
- if ( NOT FileExists( sTemp ) ) then
- sTemp = fRelativeToAbsolutePath( sPath )
- endif
-
- else
- 'all other platforms are Windows/DOS style
- ListRead( lTemp, sFile )
- if lTemp(1) <> "" then
- stemp = lTemp(1)
- sTemp = fRelativeToAbsolutePath( gNetzOfficePath & sTemp )
- endif
- endif
- endif
- else
- warnlog( CFN & "Basis-link could not be found" )
- endif
-
- if ( NOT FileExists( sTemp ) ) then
- warnlog( CFN & "Retrieved invalid path" )
- endif
-
- getOfficeBasisPath = sTemp & gPathSigne
+ 'get the basis directory
+ getOfficeBasisPath = gNetzOfficePath & gPathSigne
end function