[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - sc/source vcl/source

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/dbgui/dapitype.cxx |   13 +++++++++++++
 sc/source/ui/inc/dapitype.hxx   |    3 +++
 vcl/source/window/builder.cxx   |    3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit f75fb605cb09a76fa19ef0c76b1020dd4f45fc5a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Dec 3 14:13:19 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Dec 3 15:47:04 2020 +0100

    jsdialog: enable Pivot Table Source Select dialog
    
    Change-Id: I4be843d9ea3f4cd76b1ac41f6be3bd212b60d3ec
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107166
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 46d1cae2583f..73385b6b6dfc 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -170,7 +170,8 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
             }
         }
 
-        if (rUIFile == "modules/scalc/ui/pivottablelayoutdialog.ui")
+        if (rUIFile == "modules/scalc/ui/pivottablelayoutdialog.ui"
+            || rUIFile == "modules/scalc/ui/selectsource.ui")
         {
             bUseJSBuilder = true;
         }
commit cb6fd518eccd2e121da39ec1a544d6dd8aee0af0
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Dec 3 14:07:59 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Dec 3 15:46:54 2020 +0100

    jsdialog: make source selector dialog buttons work
    
    Make sure buttons are welded so we will be able to
    execute actions.
    
    Change-Id: I1cb7bdcd80d1cd4d60751940e4d24ecf8e7be1ce
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107164
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index d4e817b2404d..411ff96872c0 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -30,12 +30,17 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool b
     , m_xBtnDatabase(m_xBuilder->weld_radio_button("database"))
     , m_xBtnExternal(m_xBuilder->weld_radio_button("external"))
     , m_xLbNamedRange(m_xBuilder->weld_combo_box("rangelb"))
+    , m_xBtnOk(m_xBuilder->weld_button("ok")) // for LOK jsdialog
+    , m_xBtnCancel(m_xBuilder->weld_button("cancel")) // for LOK jsdialog
 {
     m_xBtnSelection->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
     m_xBtnNamedRange->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
     m_xBtnDatabase->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
     m_xBtnExternal->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
 
+    m_xBtnOk->connect_clicked( LINK(this, ScDataPilotSourceTypeDlg, ResponseHdl ) );
+    m_xBtnCancel->connect_clicked( LINK(this, ScDataPilotSourceTypeDlg, ResponseHdl ) );
+
     if (!bEnableExternal)
         m_xBtnExternal->set_sensitive(false);
 
@@ -49,6 +54,14 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool b
     m_xBtnExternal->hide();
 }
 
+IMPL_LINK(ScDataPilotSourceTypeDlg, ResponseHdl, weld::Button&, rButton, void)
+{
+    if (&rButton == m_xBtnOk.get())
+        m_xDialog->response(RET_OK);
+    else
+        m_xDialog->response(RET_CANCEL);
+}
+
 ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
 {
 }
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index 2fea18054c62..171f724d1bda 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -30,6 +30,8 @@ private:
     std::unique_ptr<weld::RadioButton> m_xBtnDatabase;
     std::unique_ptr<weld::RadioButton> m_xBtnExternal;
     std::unique_ptr<weld::ComboBox> m_xLbNamedRange;
+    std::unique_ptr<weld::Button> m_xBtnOk;
+    std::unique_ptr<weld::Button> m_xBtnCancel;
 
 public:
     ScDataPilotSourceTypeDlg(weld::Window* pParent, bool bEnableExternal);
@@ -42,6 +44,7 @@ public:
 
 private:
     DECL_LINK(RadioClickHdl, weld::ToggleButton&, void);
+    DECL_LINK(ResponseHdl, weld::Button&, void);
 };
 
 class ScDataPilotServiceDlg : public weld::GenericDialogController