jsdialog: enable sort dialog

Change-Id: I694bf3ea9982032b0202e408f8121a6407427cca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148789
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149820
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>

3 files changed, 41 insertions, 3 deletions

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 13023420b8c9..9b391101693d 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -97,6 +97,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile)
         || rUIFile == u"modules/scalc/ui/rowheightdialog.ui"
         || rUIFile == u"modules/scalc/ui/samplingdialog.ui"
         || rUIFile == u"modules/scalc/ui/selectsource.ui"
+        || rUIFile == u"modules/scalc/ui/sortcriteriapage.ui"
+        || rUIFile == u"modules/scalc/ui/sortdialog.ui"
+        || rUIFile == u"modules/scalc/ui/sortkey.ui"
+        || rUIFile == u"modules/scalc/ui/sortoptionspage.ui"
         || rUIFile == u"modules/scalc/ui/standardfilterdialog.ui"
         || rUIFile == u"modules/scalc/ui/textimportcsv.ui"
         || rUIFile == u"modules/scalc/ui/ttestdialog.ui"
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 94f2ad058bde..326bf35aaa90 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -552,20 +552,20 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM
         }
         else if (sControlType == "scrolledwindow")
         {
-            auto pScrolledWindow = dynamic_cast<weld::ScrolledWindow*>(pWidget);
+            auto pScrolledWindow = dynamic_cast<JSScrolledWindow*>(pWidget);
             if (pScrolledWindow)
             {
                 if (sAction == "scrollv")
                 {
                     sal_Int32 nValue = o3tl::toInt32(rData["data"]);
-                    pScrolledWindow->vadjustment_set_value(nValue);
+                    pScrolledWindow->vadjustment_set_value_no_notification(nValue);
                     LOKTrigger::trigger_scrollv(*pScrolledWindow);
                     return true;
                 }
                 else if (sAction == "scrollh")
                 {
                     sal_Int32 nValue = o3tl::toInt32(rData["data"]);
-                    pScrolledWindow->hadjustment_set_value(nValue);
+                    pScrolledWindow->hadjustment_set_value_no_notification(nValue);
                     LOKTrigger::trigger_scrollh(*pScrolledWindow);
                     return true;
                 }
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 9a0f61d90caa..c33107c34570 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1424,6 +1424,23 @@ void JSScrolledWindow::vadjustment_configure(int value, int lower, int upper, in
     sendUpdate();
 }
 
+void JSScrolledWindow::vadjustment_set_value(int value)
+{
+    SalInstanceScrolledWindow::vadjustment_set_value(value);
+    sendUpdate();
+}
+
+void JSScrolledWindow::vadjustment_set_value_no_notification(int value)
+{
+    SalInstanceScrolledWindow::vadjustment_set_value(value);
+}
+
+void JSScrolledWindow::vadjustment_set_page_size(int size)
+{
+    SalInstanceScrolledWindow::vadjustment_set_page_size(size);
+    sendUpdate();
+}
+
 void JSScrolledWindow::set_vpolicy(VclPolicyType eVPolicy)
 {
     SalInstanceScrolledWindow::set_vpolicy(eVPolicy);
@@ -1438,6 +1455,23 @@ void JSScrolledWindow::hadjustment_configure(int value, int lower, int upper, in
     sendUpdate();
 }
 
+void JSScrolledWindow::hadjustment_set_value(int value)
+{
+    SalInstanceScrolledWindow::hadjustment_set_value(value);
+    sendUpdate();
+}
+
+void JSScrolledWindow::hadjustment_set_value_no_notification(int value)
+{
+    SalInstanceScrolledWindow::hadjustment_set_value(value);
+}
+
+void JSScrolledWindow::hadjustment_set_page_size(int size)
+{
+    SalInstanceScrolledWindow::hadjustment_set_page_size(size);
+    sendUpdate();
+}
+
 void JSScrolledWindow::set_hpolicy(VclPolicyType eVPolicy)
 {
     SalInstanceScrolledWindow::set_hpolicy(eVPolicy);