uitest: change small parts of the grammar and dialog logger

Change-Id: I615989baafe65a6f6ae26fcd452c1e21081168b4

6 files changed, 21 insertions, 14 deletions

diff --git a/uitest/ui_logger_dsl/General_commands.tx b/uitest/ui_logger_dsl/General_commands.tx
index fb8f6115f450..1eb15f17733d 100644
--- a/uitest/ui_logger_dsl/General_commands.tx
+++ b/uitest/ui_logger_dsl/General_commands.tx
@@ -4,18 +4,16 @@
     as we have starter command
     //====================================
     also I make set zoom to be general as it will be better
-*/
-
-SpecialCommand:
+*/ 
+GeneralCommand:
     SideBar | setZoom_command | Select_command
 ;
-
 SideBar:
     'From SIDEBAR ' 'Choose ' '{"PANEL":' name=STRING '}'
 ;
 setZoom_command:
-    'Set Zoom to ' zoom_value=INT 
+    'Set Zoom to ' zoom_value=INT
 ;
 Select_command:
     'Select ' '{"OBJECT":' name=STRING '}'
-;
\ No newline at end of file
+;
diff --git a/uitest/ui_logger_dsl/Special_commands.tx b/uitest/ui_logger_dsl/Special_commands.tx
index 40113495ac9e..c6f0a1d3305e 100644
--- a/uitest/ui_logger_dsl/Special_commands.tx
+++ b/uitest/ui_logger_dsl/Special_commands.tx
@@ -18,7 +18,7 @@ SpecialCommand:
   then we can add whatever we need in the future
 */
 writer_command:
-  Type_command | Select_command | setZoom_command | GOTO_command 
+  Type_command | Select_command | GOTO_command 
 ;
 Type_command:
   'Type on writer' what_to_type=Type_options
diff --git a/uitest/ui_logger_dsl/dialog_commands.tx b/uitest/ui_logger_dsl/dialog_commands.tx
index abe32a53a992..a752442e5f1f 100644
--- a/uitest/ui_logger_dsl/dialog_commands.tx
+++ b/uitest/ui_logger_dsl/dialog_commands.tx
@@ -5,9 +5,16 @@ DialogCommand:
 ;
 
 OpenDialog:
-  'Open' dialog_name=ID
+  OpenModalDialog | OpenModelessDialog
+;
+OpenModalDialog :
+  'Open Modal ' dialog_name=ID
+;
+OpenModelessDialog :
+  'Open Modeless ' dialog_name=ID
 ;
-
 CloseDialog:
-  'Close Dialog'
+  //the additional_note=STRING? if you need to add name in the future
+  //Also it's used to make instance of the command of type CloseDialog
+  'Close Dialog' additional_note=STRING?
 ;
diff --git a/uitest/ui_logger_dsl/starter_commands.tx b/uitest/ui_logger_dsl/starter_commands.tx
index c2d6296569b9..0461b8d149bd 100644
--- a/uitest/ui_logger_dsl/starter_commands.tx
+++ b/uitest/ui_logger_dsl/starter_commands.tx
@@ -9,3 +9,4 @@ Program:
   "writer"|"calc"|"impress"|"draw"|"math"|"database"
 ;
 
+
diff --git a/uitest/ui_logger_dsl/uno_commands.tx b/uitest/ui_logger_dsl/uno_commands.tx
index 5dca5514b237..1cf702de62a2 100644
--- a/uitest/ui_logger_dsl/uno_commands.tx
+++ b/uitest/ui_logger_dsl/uno_commands.tx
@@ -1,9 +1,10 @@
 UNOCommand:
-    'Send UNO Command' '(' uno_command=STRING ')'  prameters*=parameter
+    'Send UNO Command' '(' uno_command_name=STRING ')'  (prameters=parameter)?
 ;
 parameter:
     '{'  parameter_data *= data '}'
 ;
 data:
-    key=STRING ':' value=ID ','
+    key=STRING ':' value= INT|ID ','
 ;
+
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 08cffb2cca62..1377085a259e 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -989,9 +989,9 @@ bool Dialog::ImplStartExecute()
     aObject.EventName = "DialogExecute";
     xEventBroadcaster->documentEventOccured(aObject);
     if (bModal)
-        UITestLogger::getInstance().log("Open " + get_id());
+        UITestLogger::getInstance().log("Open Modal " + get_id());
     else
-        UITestLogger::getInstance().log("Open " + get_id());
+        UITestLogger::getInstance().log("Open Modeless " + get_id());
 
     if (comphelper::LibreOfficeKit::isActive())
     {