[Libreoffice-commits] core.git: 2 commits - chart2/source vcl/source

[Markus Mohrhard]

 chart2/source/controller/main/ChartWindow.cxx |    1 +
 vcl/source/uitest/uiobject.cxx                |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit bf748bb20fd949cc67661de20e6f53a842089f60
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 20 02:56:10 2016 +0200

    support typing into the spin field
    
    Change-Id: I2cae24d36d1eebf48f52646d84e7f6d291c8e473
    Reviewed-on: https://gerrit.libreoffice.org/26492
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 0f399f1..27c7af5 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -829,7 +829,7 @@ SpinFieldUIObject::~SpinFieldUIObject()
 }
 
 void SpinFieldUIObject::execute(const OUString& rAction,
-        const StringMap& /*rParameters*/)
+        const StringMap& rParameters)
 {
     if (rAction == "UP")
     {
@@ -839,6 +839,17 @@ void SpinFieldUIObject::execute(const OUString& rAction,
     {
         mxSpinField->Down();
     }
+    else if (rAction == "TYPE")
+    {
+        if (mxSpinField->GetSubEdit())
+        {
+            Edit* pSubEdit = mxSpinField->GetSubEdit();
+            EditUIObject aSubObject(pSubEdit);
+            aSubObject.execute(rAction, rParameters);
+        }
+    }
+    else
+        EditUIObject::execute(rAction, rParameters);
 }
 
 StringMap SpinFieldUIObject::get_state()
commit c4a6f300f5d529f2853930b1674bd63a4c953584
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 20 03:06:05 2016 +0200

    uitest: set id for chart window
    
    Change-Id: I443dcccf6d560c252da38a0f0c63cc48a212c127
    Reviewed-on: https://gerrit.libreoffice.org/26494
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 3d3b849..2372119 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -55,6 +55,7 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi
         , m_pOpenGLWindow(nullptr)
 #endif
 {
+    set_id("chart_window");
     this->SetHelpId( HID_SCH_WIN_DOCUMENT );
     this->SetMapMode( MapMode(MAP_100TH_MM) );
     adjustHighContrastMode();