fix prefix of command line switches (-- instead of -)

5 files changed, 13 insertions, 13 deletions

diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java
index a643b2b333c3..3716d5d8e39e 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -807,7 +807,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
 ////            "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF",      /* default: "OOo" */
 ////            "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */
 ////            "-OFFICE_VIEWABLE", "false",
-////            "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\"  -norestore -nocrashreport -accept=pipe,name=ll93751;urp;",
+////            "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\"  --norestore --nocrashreport --accept=pipe,name=ll93751;urp;",
 //            "-NoOffice"
 //        };
 //
diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java
index 7deee0d0d8f6..b8aa2722c2a5 100644
--- a/qadevOOo/runner/graphical/JPEGCreator.java
+++ b/qadevOOo/runner/graphical/JPEGCreator.java
@@ -446,7 +446,7 @@ private static void convertToWidth340(String _sFrom, String _To)
 //////            "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF",      /* default: "OOo" */
 //////            "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */
 //////            "-OFFICE_VIEWABLE", "false",
-////            "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\"  -norestore -nocrashreport -accept=pipe,name=ll93751;urp;",
+////            "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\"  --norestore --nocrashreport --accept=pipe,name=ll93751;urp;",
 ////            "-NoOffice"
 ////        };
 //
@@ -466,7 +466,7 @@ private static void convertToWidth340(String _sFrom, String _To)
 ////            "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF",      /* default: "OOo" */
 ////            "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */
 ////            "-OFFICE_VIEWABLE", "false",
-//            "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\"  -norestore -nocrashreport -accept=pipe,name=ll93751;urp;",
+//            "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\"  --norestore --nocrashreport --accept=pipe,name=ll93751;urp;",
 //            "-NoOffice"
 //        };
 //
diff --git a/qadevOOo/runner/graphical/PostscriptCreator.java b/qadevOOo/runner/graphical/PostscriptCreator.java
index 7109b4851b1b..7bd98333ef23 100644
--- a/qadevOOo/runner/graphical/PostscriptCreator.java
+++ b/qadevOOo/runner/graphical/PostscriptCreator.java
@@ -114,7 +114,7 @@ public class PostscriptCreator extends EnhancedComplexTestCase
 //////            "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF",      /* default: "OOo" */
 //////            "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */
 //////            "-OFFICE_VIEWABLE", "false",
-////            "-AppExecutionCommand", "\"C:/home/ll93751/staroffice9_DEV300_m25/Sun/StarOffice 9/program/soffice.exe\"  -norestore -nocrashreport -accept=pipe,name=ll93751;urp;",
+////            "-AppExecutionCommand", "\"C:/home/ll93751/staroffice9_DEV300_m25/Sun/StarOffice 9/program/soffice.exe\"  --norestore --nocrashreport --accept=pipe,name=ll93751;urp;",
 //////            "-NoOffice"
 //            "-DOC_COMPARATOR_PRINT_MAX_PAGE","9999",
 //            "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION","180",
@@ -127,7 +127,7 @@ public class PostscriptCreator extends EnhancedComplexTestCase
 //            "-OFFICE_VIEWABLE","true",
 //            "-wntmsci.DOC_COMPARATOR_INPUT_PATH","\\\\so-gfxcmp-lin\\doc-pool\\LLA_test\\issue_79214.odb",
 //            "-wntmsci.DOC_COMPARATOR_OUTPUT_PATH","\\\\so-gfxcmp-lin\\gfxcmp-data\\wntmsci\\convwatch-output\\LLA_test\\DEV300_m11",
-//            "-wntmsci.AppExecutionCommand","\"C:\\gfxcmp\\programs\\staroffice8_DEV300_m11\\Sun\\StarOffice 9\\program\\soffice.exe\"  -norestore -nocrashreport -accept=pipe,name=ll93751;urp;",
+//            "-wntmsci.AppExecutionCommand","\"C:\\gfxcmp\\programs\\staroffice8_DEV300_m11\\Sun\\StarOffice 9\\program\\soffice.exe\"  --norestore --nocrashreport --accept=pipe,name=ll93751;urp;",
 //            "-wntmsci.AppKillCommand","\"C:\\bin\\pskill.exe soffice.bin;C:\\bin\\pskill.exe winword;C:\\bin\\pskill.exe excel\"",
 //
 //        };
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 1d4950ee5404..3d469725b7ee 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -311,7 +311,7 @@ public class OfficeProvider implements AppProvider
             else
             {
                 System.out.println("Could not connect an Office and cannot start one.\n".concat("please start an office with following parameter:\n").
-                        concat("\nsoffice -accept=").concat((String) param.get("ConnectionString")).concat(";urp;\n"));
+                        concat("\nsoffice --accept=").concat((String) param.get("ConnectionString")).concat(";urp;\n"));
                 if (bAppExecutionHasWarning)
                 {
                     System.out.println(errorMessage);
@@ -751,7 +751,7 @@ public class OfficeProvider implements AppProvider
         if (command.indexOf(sysBinDir) == -1)
         {
             command = sysBinDir + System.getProperty("file.separator") + "soffice" +
-                    " -norestore -accept=" + connectionString + ";urp;";
+                    " --norestore --accept=" + connectionString + ";urp;";
         }
 
         dbg("update AppExecutionCommand: " + command);
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index f51b79aaad6c..541ca750e36c 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -816,14 +816,14 @@ public class utils {
                     boolean gotNoAccept = true;
                     while (commandTokens.hasMoreElements()) {
                         String officeParam = commandTokens.nextToken();
-                        if (officeParam.indexOf("-accept=") != -1) {
+                        if (officeParam.indexOf("--accept=") != -1) {
                             gotNoAccept = false;
                             errorMessage = validateConnectString(officeParam, true);
                         }
                     }
                     if (gotNoAccept) {
                         errorMessage = "Error: Your 'AppExecutionCommand' parameter does not " +
-                            "contain a '-accept' parameter for connecting the office.";
+                            "contain a '--accept' parameter for connecting the office.";
                     }
                 }
             }
@@ -841,7 +841,7 @@ public class utils {
     public static String validateConnectString(String connectString, boolean checkAppExecutionCommand) {
         String acceptPrefix = "";
         if (checkAppExecutionCommand) {
-            acceptPrefix = "-accept=";
+            acceptPrefix = "--accept=";
         }
 
         String errorMessage = "OK";
@@ -850,7 +850,7 @@ public class utils {
             if (connectString.indexOf(acceptPrefix + "socket,host=") == -1 ||
                 connectString.indexOf("port=") == -1) {
                 if (checkAppExecutionCommand) {
-                    errorMessage = "Error: The '-accept' parameter contains a syntax error: It should be like: '-accept=socket,host=localhost,port=8100;urp;";
+                    errorMessage = "Error: The '--accept' parameter contains a syntax error: It should be like: '--accept=socket,host=localhost,port=8100;urp;";
                 } else {
                     errorMessage = "Error: The 'ConnectionString' parameter contains a syntax error: It should be like: 'socket,host=localhost,port=8100'";
                 }
@@ -858,14 +858,14 @@ public class utils {
         } else if (connectString.indexOf("pipe") != -1) {
             if (connectString.indexOf(acceptPrefix + "pipe,name=") == -1) {
                 if (checkAppExecutionCommand) {
-                    errorMessage = "Error: The '-accept' parameter contains a syntax error: It should be like: '-accept=pipe,name=myuniquename;urp;'";
+                    errorMessage = "Error: The '--accept' parameter contains a syntax error: It should be like: '--accept=pipe,name=myuniquename;urp;'";
                 } else {
                     errorMessage = "Error: The 'ConnectionString' parameter contains a syntax error: It should be like: 'pipe,name=myuniquename'";
                 }
             }
         } else {
             if (checkAppExecutionCommand) {
-                errorMessage = "Warning: The '-accept' parameter contains an unknown connection method.";
+                errorMessage = "Warning: The '--accept' parameter contains an unknown connection method.";
             } else {
                 errorMessage = "Warning: The 'ConnectionString' parameter contains an unknown connection method.";
             }