sc/source/ui/dbgui/sortkeydlg.cxx | 10 +++++++---
vcl/inc/jsdialog/jsdialogbuilder.hxx | 13 +++++++++++++
vcl/jsdialog/enabled.cxx | 13 ++++++++++++-
vcl/jsdialog/executor.cxx | 6 +++---
vcl/jsdialog/jsdialogbuilder.cxx | 34 ++++++++++++++++++++++++++++++++++
vcl/source/window/layout.cxx | 2 ++
6 files changed, 71 insertions(+), 7 deletions(-)
New commits:
commit 078d8ce4d4add3c11df524ff92b337a58a75b004
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Mar 16 15:29:33 2023 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Mar 31 11:18:59 2023 +0000
jsdialog: enable page format (calc)
Change-Id: I2c40b1e6dbfcb8693afc27e65a75ef71e6a9b7e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148996
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149821
Tested-by: Jenkins
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 9b391101693d..4b0061ea17e7 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -44,6 +44,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"cui/ui/imagetabpage.ui"
|| rUIFile == u"cui/ui/macroselectordialog.ui"
|| rUIFile == u"cui/ui/numberingformatpage.ui"
+ || rUIFile == u"cui/ui/pageformatpage.ui"
|| rUIFile == u"cui/ui/paragalignpage.ui"
|| rUIFile == u"cui/ui/paraindentspacing.ui"
|| rUIFile == u"cui/ui/paratabspage.ui"
@@ -91,12 +92,15 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/scalc/ui/movingaveragedialog.ui"
|| rUIFile == u"modules/scalc/ui/optimalcolwidthdialog.ui"
|| rUIFile == u"modules/scalc/ui/optimalrowheightdialog.ui"
+ || rUIFile == u"modules/scalc/ui/pagetemplatedialog.ui"
+ || rUIFile == u"modules/scalc/ui/paratemplatedialog.ui"
|| rUIFile == u"modules/scalc/ui/pivotfielddialog.ui"
|| rUIFile == u"modules/scalc/ui/pivottablelayoutdialog.ui"
|| rUIFile == u"modules/scalc/ui/regressiondialog.ui"
|| 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/sheetprintpage.ui"
|| rUIFile == u"modules/scalc/ui/sortcriteriapage.ui"
|| rUIFile == u"modules/scalc/ui/sortdialog.ui"
|| rUIFile == u"modules/scalc/ui/sortkey.ui"
@@ -151,6 +155,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"sfx/ui/documentinfopage.ui"
|| rUIFile == u"sfx/ui/documentpropertiesdialog.ui"
|| rUIFile == u"sfx/ui/editdurationdialog.ui"
+ || rUIFile == u"svx/ui/headfootformatpage.ui"
|| rUIFile == u"sfx/ui/linefragment.ui"
|| rUIFile == u"sfx/ui/managestylepage.ui"
|| rUIFile == u"sfx/ui/password.ui"
@@ -163,7 +168,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"uui/ui/macrowarnmedium.ui"
// vcl
|| rUIFile == u"vcl/ui/wizard.ui"
- // xmlsec
+ // filter
|| rUIFile == u"filter/ui/pdfgeneralpage.ui"
|| rUIFile == u"filter/ui/pdflinkspage.ui"
|| rUIFile == u"filter/ui/pdfoptionsdialog.ui"
@@ -172,7 +177,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"filter/ui/pdfuserinterfacepage.ui"
|| rUIFile == u"filter/ui/pdfviewpage.ui"
|| rUIFile == u"filter/ui/warnpdfdialog.ui"
+ // writerperfect
|| rUIFile == u"writerperfect/ui/exportepub.ui"
+ // xmlsec
|| rUIFile == u"xmlsec/ui/certgeneral.ui"
|| rUIFile == u"xmlsec/ui/certpage.ui"
|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
commit e026ef65eed3c04df4d3dada09c4e1ef858d69a5
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Mar 13 14:34:49 2023 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Mar 31 11:18:51 2023 +0000
jsdialog: enable sort dialog
Change-Id: I694bf3ea9982032b0202e408f8121a6407427cca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148789
Reviewed-by: Pranam Lashkari <lpra...@collabora.com>
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149820
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx
b/sc/source/ui/dbgui/sortkeydlg.cxx
index 599280735be9..7e8397415018 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -9,6 +9,7 @@
#include <memory>
#include <sortkeydlg.hxx>
+#include <comphelper/lok.hxx>
#include <vcl/svapp.hxx>
#include <scresid.hxx>
@@ -65,10 +66,13 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber )
pSortKeyItem->m_xFrame->set_label(aLine);
// for ui-testing. Distinguish the sort keys
- if ( m_aSortKeyItems.size() > 0 )
+ if (!comphelper::LibreOfficeKit::isActive())
{
- pSortKeyItem->m_xLbSort->set_buildable_name(
- pSortKeyItem->m_xLbSort->get_buildable_name() +
OString::number(m_aSortKeyItems.size() + 1));
+ if ( m_aSortKeyItems.size() > 0 )
+ {
+ pSortKeyItem->m_xLbSort->set_buildable_name(
+ pSortKeyItem->m_xLbSort->get_buildable_name() +
OString::number(m_aSortKeyItems.size() + 1));
+ }
}
m_aSortKeyItems.push_back(std::unique_ptr<ScSortKeyItem>(pSortKeyItem));
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 6f59b7d5ca64..ac638e70eae5 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -488,6 +488,13 @@ public:
if (!m_bIsFreezed && m_pSender)
m_pSender->sendClosePopup(nWindowId);
}
+
+ virtual void set_buildable_name(const OString& rName) override
+ {
+ SalInstanceWidget::set_buildable_name(rName);
+ assert(false); // we remember old name in GetLOKWeldWidgetsMap()
+ // TODO: implement renaming or avoid it for LOK
+ }
};
class JSDialog final : public JSWidget<SalInstanceDialog, ::Dialog>
@@ -529,10 +536,16 @@ public:
virtual void vadjustment_configure(int value, int lower, int upper, int
step_increment,
int page_increment, int page_size)
override;
+ virtual void vadjustment_set_value(int value) override;
+ void vadjustment_set_value_no_notification(int value);
+ virtual void vadjustment_set_page_size(int size) override;
virtual void set_vpolicy(VclPolicyType eVPolicy) override;
virtual void hadjustment_configure(int value, int lower, int upper, int
step_increment,
int page_increment, int page_size)
override;
+ virtual void hadjustment_set_value(int value) override;
+ void hadjustment_set_value_no_notification(int value);
+ virtual void hadjustment_set_page_size(int size) override;
virtual void set_hpolicy(VclPolicyType eVPolicy) override;
};
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);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index f119b050d567..c56f782a0aee 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2188,6 +2188,8 @@ void
VclScrolledWindow::DumpAsPropertyTree(::tools::JsonWriter& rJsonWriter)
{
VclBin::DumpAsPropertyTree(rJsonWriter);
+ rJsonWriter.put("user_managed_scrolling", m_bUserManagedScrolling);
+
{
auto aVertical = rJsonWriter.startNode("vertical");
