boil down the use of OPERATING_SYSTEM to its unorc/uno.ini use

Change-Id: I9f0f98c989cb7ecf6227154e1d81d49abade66c2

1 files changed, 5 insertions, 22 deletions

diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index d5fdf5fb404f..b5d033b6ad48 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -159,7 +159,7 @@ public class TestParameters extends HashMap<String,Object> {
         put(PropertyName.AUTO_RESTART, Boolean.FALSE);
 
         // get the operating system
-        put(PropertyName.OPERATING_SYSTEM, getSOCompatibleOSName());
+        put(PropertyName.UNORC_NAME, getUnoRcName());
 
         //For compatibility Reasons
         System.setProperty("DOCPTH", DefaultTestDocumentPath);
@@ -193,31 +193,14 @@ public class TestParameters extends HashMap<String,Object> {
     }
 
     /**
-     * Convert the system dependent operating system name to a name according
-     * to OOo rules.
-     * @return A valid OS name, or "" if the name is not known.
+     * @return The uno rc file name uno.ini for windows and unorc for everything else
      */
-    private String getSOCompatibleOSName() {
+    private String getUnoRcName() {
         String osname = System.getProperty ("os.name").toLowerCase ();
-        String osarch = System.getProperty ("os.arch");
-        String operatingSystem = "";
         if (osname.indexOf ("windows")>-1) {
-            operatingSystem = PropertyName.WNTMSCI;
-        } else if (osname.indexOf ("linux")>-1 || osname.indexOf ("kfreebsd")>-1) {
-            operatingSystem = PropertyName.UNXLNGI;
-        } else if (osname.indexOf ("sunos")>-1) {
-            if (osarch.equals ("x86")) {
-                operatingSystem = PropertyName.UNXSOLI;
-            } else {
-                operatingSystem = PropertyName.UNXSOLS;
-            }
-        } else if (osname.indexOf ("mac")>-1) {
-            operatingSystem = PropertyName.UNXMACXI;
-        } else {
-            System.out.println("ERROR: not supported platform: " + osname);
-            System.exit(1);
+            return "uno.ini";
         }
-        return operatingSystem;
+        return "unorc";
     }
 
 }// finish class TestParamenters