CWS-TOOLING: integrate CWS jsc320

2009-07-31 11:40:04 +0200 jsc  r274518 : #103926# apply patch
2009-07-16 17:17:01 +0200 jsc  r274063 : #i103311# check new Solaris compiler version ox5100
2009-07-07 17:20:41 +0200 jsc  r273811 : cleanup
2009-07-07 15:21:26 +0200 jsc  r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac
2009-07-07 15:07:05 +0200 jsc  r273798 : #i98322# correct link
2009-07-07 09:43:57 +0200 jsc  r273773 : #i98322# correct link path
2009-07-06 15:49:07 +0200 jsc  r273749 : #i98322# correct typo
2009-07-06 14:17:27 +0200 jsc  r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100)
2009-07-03 13:54:58 +0200 jsc  r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake
2009-07-02 13:12:02 +0200 jsc  r273643 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:11:30 +0200 jsc  r273642 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:05:35 +0200 jsc  r273640 : #i103260# correct typo for windows
2009-07-02 13:01:34 +0200 jsc  r273639 : #i103260# provide regview with path as argument
2009-07-01 07:18:01 +0200 jsc  r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 08:01:13 +0200 jsc  r273485 : #98322# include import purpenvhelper lib under windows
2009-06-10 15:07:29 +0200 jsc  r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk@272291 (milestone: DEV300:m49)
2009-05-27 09:36:23 +0200 jsc  r272329 : #i98322# create link for purpenvhelper library in SDK
2009-05-27 09:35:41 +0200 jsc  r272328 : #i98322# create link for purpenvhelpr library in SDK
2009-05-14 16:19:41 +0200 jsc  r271900 : increase version number in SDK header image
2009-05-14 16:11:05 +0200 jsc  r271899 : #i101408# new version 3.2
2009-05-14 15:33:47 +0200 jsc  r271894 : #i99163# apply patch to correct wrong tags for autodoc
2009-05-14 14:49:58 +0200 jsc  r271889 : #i99707# apply patch to remove unused code

1 files changed, 8 insertions, 38 deletions

diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 5e4be4ec69f5..662bd3ae05f4 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -33,9 +33,6 @@ stdout.WriteLine("\n" +
 var oo_sdk_name=WshSysEnv("OO_SDK_NAME");
 var stldebug="";
 var oo_sdk_home=getSdkHome();
-var oo_major=""; 
-var oo_minor=""; 
-var oo_version=getOOBaseVersion();
 var oo_user_sdk_dir=WshSysEnv("APPDATA") + "\\" + oo_sdk_name;
 var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat";
 
@@ -220,51 +217,24 @@ function getOfficeHome()
     }
 }
 
-function getOOBaseVersion()
-{
-	var ooversion = oo_sdk_home;
-	var major = "";
-	var minor = "";
-	var index= ooversion.lastIndexOf("\\");
-
-	ooversion = ooversion.substr(0, index);
-
-    if ((index = ooversion.lastIndexOf("Basis")) != -1)  
-	   ooversion = ooversion.substr(index+6);
-
-	index = ooversion.lastIndexOf(".");
-	oo_major = ooversion.substr(0, index);
-	oo_minor = ooversion.substr(index+1);
-
-	return ooversion;
-}
-
 function searchOffice()
 {
 	var tmp = oo_sdk_home;
 	var officepath ="";
-	var index=tmp.lastIndexOf("\\OpenOffice.org");
-	
-	tmp = tmp.substr(0, index);
-
-	var sov = parseInt(oo_major) + 6;
+	var index=-1;
 
-    if (aFileSystemObject.FileExists(tmp + "\\OpenOffice.org " + oo_version + "\\program\\soffice.exe")) {
-	   return tmp + "\\OpenOffice.org " + oo_version;
-	}
-    if (aFileSystemObject.FileExists(tmp + "\\OpenOffice.org " + oo_major + "\\program\\soffice.exe")) {
-	   return tmp + "\\OpenOffice.org " + oo_major;
-	}
-    if (aFileSystemObject.FileExists(tmp + "\\StarOffice " + sov + "\\program\\soffice.exe")) {
-	   return tmp + "\\StarOffice " + sov;
-	}
-    if (aFileSystemObject.FileExists(tmp + "\\StarSuite " + sov + "\\program\\soffice.exe")) {
-	   return tmp + "\\StarSuite " + sov;
+	if ((index = tmp.lastIndexOf("\\Basis")) != -1) {
+	   tmp = tmp.substr(0, index);
 	}
 
+	if (aFileSystemObject.FileExists(tmp + "\\program\\soffice.exe")) {
+	   return tmp;
+	}
+  
 	return "";
 }
 
+
 function getOfficeBaseHome()
 {
 	var officebase = oo_sdk_home;