uitest: log more events

for Calc:
1) Delete some Cells
2) Remove content from some cells
3) Insert Cells
4) Cut Cells
5) Copy Cells
6) Paste Cells
7) Merge Cells
8) Split Cell ( Delete Merge )

for Writer:
1) Insert Table
2) Copy Text
3) Cut Text
4) Paste Text
5) Inser Break Page

Also, Solve some bugs in the UI logger and UNO Commands.

Change-Id: Ic7cacbc20e1e400900a9760b61e8b45ae96c84ff

1 files changed, 24 insertions, 1 deletions

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 2e9a0350ffa9..831e4c7dd8ee 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -41,6 +41,8 @@
 #include <vcl/waitobj.hxx>
 
 #include <viewfunc.hxx>
+#include <vcl/uitest/logger.hxx>
+#include <vcl/uitest/eventdescription.hxx>
 
 #include <sc.hrc>
 #include <globstr.hrc>
@@ -90,6 +92,21 @@
 using namespace com::sun::star;
 using ::editeng::SvxBorderLine;
 
+namespace {
+
+void collectUIInformation(const std::map<OUString, OUString>& aParameters,const OUString action)
+{
+    EventDescription aDescription;
+    aDescription.aID = "grid_window";
+    aDescription.aAction = action;
+    aDescription.aParameters = aParameters;
+    aDescription.aParent = "MainWindow";
+    aDescription.aKeyWord = "ScGridWinUIObject";
+
+    UITestLogger::getInstance().logEvent(aDescription);
+}
+}
+
 using ::std::vector;
 using ::std::unique_ptr;
 
@@ -1212,7 +1229,9 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bCenter )
             UpdateInputLine();
         }
     }
-
+    OUString aStartAddress =  aMarkRange.aStart.GetColRowString();
+    OUString aEndAddress = aMarkRange.aEnd.GetColRowString();
+    collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},"MERGE_CELLS");
     return bOk;
 }
 
@@ -1298,6 +1317,10 @@ bool ScViewFunc::RemoveMerge()
         if (bOk)
             pDocSh->UpdateOle(&GetViewData());
     }
+
+    OUString Cell_location =  aRange.aStart.GetColRowString();
+    collectUIInformation({{"CELL", Cell_location }},"UNMERGE_CELL");
+
     return true;        //! bOk ??
 }