core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/jsdialogbuilder.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 03136175df2ce6b82e7b814ba2308aba3d4915a8
Author: Caolán McNamara
AuthorDate: Wed Feb 21 12:30:41 2024 +
Commit: Caolán McNamara
CommitDate: Wed Feb 21 14:31:42 2024 +0100
use after free on clicking cancel in a calc spelling message dialog
e.g. the calc subdialog "Should the spellcheck be continued from the
beginning of the current sheet" seen from the "spelling" dialog when
starting spelling from some cell beyond used sheet bounds.
With a local asan build, and hello-world.ods, load, put cursor in A2,
review, spelling to get the spelling dialog. There should then be a sub
dialog with "Should the spellcheck be continued ..." with "No" and "Yes"
options, hammer the "no" button a few times in rapid succession.
2715237==ERROR: AddressSanitizer: heap-use-after-free on address
0x6140007a8118 at pc 0x7fdf28e73ce1 bp 0x7ffd012c88d0 sp 0x7ffd012c88c8
READ of size 8 at 0x6140007a8118 thread T0 (kitbroker_003)
#0 0x7fdf28e73ce0 (instdir/program/libvcllo.so+0x2473ce0)
JSMessageDialog::~JSMessageDialog has:
JSMessageDialog::~JSMessageDialog()
{
if (m_pOK || m_pCancel)
JSInstanceBuilder::RemoveWindowWidget(m_sWindowId);
}
but has
int JSMessageDialog::run()
{
if (GetLOKNotifier())
{
RememberMessageDialog();
sendFullUpdate();
}
...
}
where RememberMessageDialog has
JSInstanceBuilder::InsertWindowToMap(sWindowId);
this dialog doesn't have ok or cancel, so while it is inserted in that
map when the dialog is run, it doesn't get removed from the map when the
dtor is called, which goes on to cause use-after-free.
Given that we only set m_pCancel and/or m_pOK if there is no "builder"
it looks a more straight forward approach to simply call
JSInstanceBuilder::RemoveWindowWidget based on if there was no builder.
Change-Id: Icf04f0e9f3c3c864955e9d4ee41589f4d2aa4cb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163691
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index c2cea61a6197..a55c7b9fbf5b 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1836,8 +1836,13 @@ JSMessageDialog::JSMessageDialog(::MessageDialog*
pDialog, SalInstanceBuilder* p
JSMessageDialog::~JSMessageDialog()
{
-if (m_pOK || m_pCancel)
+if (!m_pBuilder)
+{
+// For Message Dialogs created from Application::CreateMessageDialog
+// (where there is no builder to take care of this for us) explicitly
+// remove this window id on tear down
JSInstanceBuilder::RemoveWindowWidget(m_sWindowId);
+}
}
void JSMessageDialog::RememberMessageDialog()
core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 21bb5813271f294f2de82ebba8ca89d2a7474d5f Author: Hubert Figuière AuthorDate: Fri Feb 9 14:56:49 2024 -0500 Commit: Michael Meeks CommitDate: Sat Feb 10 10:38:28 2024 +0100 vcl: Enable sheet protection dialog Change-Id: Ib8e8209225d027472c1f2eef57839df5784acf30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163205 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index d792128f3360..beb12b5dd081 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -128,6 +128,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/scalc/ui/pastespecial.ui" || rUIFile == u"modules/scalc/ui/pivotfielddialog.ui" || rUIFile == u"modules/scalc/ui/pivottablelayoutdialog.ui" +|| rUIFile == u"modules/scalc/ui/protectsheetdlg.ui" || rUIFile == u"modules/scalc/ui/regressiondialog.ui" || rUIFile == u"modules/scalc/ui/rowheightdialog.ui" || rUIFile == u"modules/scalc/ui/samplingdialog.ui"
core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 035476042f52712911f457841a3757dac90361f7 Author: Szymon Kłos AuthorDate: Sun Jan 28 22:15:49 2024 +0100 Commit: Michael Meeks CommitDate: Mon Jan 29 22:15:30 2024 +0100 jsdialog: enable paste special in calc to test: - copy few cells in calc - ctrl + shift + alt + v Signed-off-by: Szymon Kłos Change-Id: Iac3a98c50355e2390a36195ba92ef25a30d73e75 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162673 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index c8ed0d73efad..d792128f3360 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -125,6 +125,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || 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/pastespecial.ui" || rUIFile == u"modules/scalc/ui/pivotfielddialog.ui" || rUIFile == u"modules/scalc/ui/pivottablelayoutdialog.ui" || rUIFile == u"modules/scalc/ui/regressiondialog.ui"
core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 545d512a5f7b866696b3a4dfc0e00748029d Author: Jaume Pujantell AuthorDate: Mon Jan 8 17:20:28 2024 +0100 Commit: Miklos Vajna CommitDate: Wed Jan 10 14:54:42 2024 +0100 cool#7996 enable jsdialog for font page in document properties The checkboxes of font page on the document properties dialog were not saving the changes after pressing ok. Change-Id: I5e7d16de267dd5d6874a84b518f6ec769db4fcc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161795 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index d5997c9c6a9f..058880a97835 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -227,6 +227,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"sfx/ui/custominfopage.ui" || rUIFile == u"sfx/ui/descriptioninfopage.ui" || rUIFile == u"sfx/ui/documentinfopage.ui" +|| rUIFile == u"sfx/ui/documentfontspage.ui" || rUIFile == u"sfx/ui/documentpropertiesdialog.ui" || rUIFile == u"sfx/ui/editdurationdialog.ui" || rUIFile == u"svx/ui/headfootformatpage.ui"
core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 56ae4e455d6a8ac2116700c7b8913d64c665f362 Author: codewithvk AuthorDate: Wed Jan 3 22:25:10 2024 +0530 Commit: Szymon Kłos CommitDate: Thu Jan 4 12:28:03 2024 +0100 jsdialog: enable calc formula error dialog Signed-off-by: codewithvk Change-Id: Ib4d1b3d4d869b5be194c90e50c60cc89d8257b53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161592 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index cbeaf3335cbf..d5997c9c6a9f 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -145,6 +145,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/scalc/ui/validationcriteriapage.ui" || rUIFile == u"modules/scalc/ui/validationdialog.ui" || rUIFile == u"modules/scalc/ui/validationhelptabpage.ui" +|| rUIFile == u"modules/scalc/ui/warnautocorrect.ui" || rUIFile == u"modules/scalc/ui/ztestdialog.ui" // schart || rUIFile == u"modules/schart/ui/attributedialog.ui"
core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit e03b03128a4cfe853258f649f8ff6f96a2c8b851 Author: Darshan11 AuthorDate: Wed Jan 3 16:19:39 2024 +0530 Commit: Szymon Kłos CommitDate: Wed Jan 3 14:16:43 2024 +0100 jsdialog: enabled objectdialog (Writer -> Chart -> properties jsdialog) - before this patch we were getting tunneled dialog in chart `properties` options - which causes to have multiple dialogs appear on screen - objectdialog is not enabled Change-Id: I083c3d05ded528412c36d917bc500e55778a01c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161582 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 993a6f45685e..cbeaf3335cbf 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -197,6 +197,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/linenumbering.ui" || rUIFile == u"modules/swriter/ui/newuserindexdialog.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" +|| rUIFile == u"modules/swriter/ui/objectdialog.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/picturedialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit fc2e0b49a6fa69a116e7a43c3c6ecb428a88f4c7 Author: Szymon Kłos AuthorDate: Tue Oct 24 15:15:20 2023 +0200 Commit: Szymon Kłos CommitDate: Thu Oct 26 09:31:50 2023 +0200 jsdialog: enable simple conditional formatting dialog Signed-off-by: Szymon Kłos Change-Id: Id9dad789bb772f7454f4bb35c42f4fde4d9a89c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158389 Tested-by: Jenkins CollaboraOffice Reviewed-by: Attila Szűcs diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index c8e5ab93511c..14627b3a6424 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -100,6 +100,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/scalc/ui/chardialog.ui" || rUIFile == u"modules/scalc/ui/chisquaretestdialog.ui" || rUIFile == u"modules/scalc/ui/colwidthdialog.ui" +|| rUIFile == u"modules/scalc/ui/conditionaleasydialog.ui" +|| rUIFile == u"modules/scalc/ui/condformatmanager.ui" || rUIFile == u"modules/scalc/ui/correlationdialog.ui" || rUIFile == u"modules/scalc/ui/covariancedialog.ui" || rUIFile == u"modules/scalc/ui/datafielddialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/executor.cxx | 48 --
1 file changed, 34 insertions(+), 14 deletions(-)
New commits:
commit 58c02b478df89dfd46f1b2a5a7c509f3a9ea4635
Author: Caolán McNamara
AuthorDate: Mon Oct 16 10:47:05 2023 +0100
Commit: Caolán McNamara
CommitDate: Wed Oct 18 09:29:48 2023 +0200
check return of get_iter_abs_pos
Change-Id: Ifdabd65dc9fa5bc6d0c5c6eee1318f99bf918cd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158034
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Attila Szűcs
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index ed424912f377..6ab4f9d35d2c 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -471,9 +471,14 @@ bool ExecuteAction(const std::string& nWindowId, const
OString& rWidget, StringM
pTreeView->unselect_all();
std::unique_ptr
itEntry(pTreeView->make_iterator());
-pTreeView->get_iter_abs_pos(*itEntry, nAbsPos);
-pTreeView->select(*itEntry);
-pTreeView->set_cursor_without_notify(*itEntry);
+if (pTreeView->get_iter_abs_pos(*itEntry, nAbsPos))
+{
+pTreeView->select(*itEntry);
+pTreeView->set_cursor_without_notify(*itEntry);
+}
+else
+SAL_WARN("vcl",
+ "No absolute position found for " << nAbsPos
<< " in treeview");
pTreeView->grab_focus();
LOKTrigger::trigger_changed(*pTreeView);
return true;
@@ -484,9 +489,14 @@ bool ExecuteAction(const std::string& nWindowId, const
OString& rWidget, StringM
pTreeView->unselect_all();
std::unique_ptr
itEntry(pTreeView->make_iterator());
-pTreeView->get_iter_abs_pos(*itEntry, nRow);
-pTreeView->select(nRow);
-pTreeView->set_cursor_without_notify(*itEntry);
+if (pTreeView->get_iter_abs_pos(*itEntry, nRow))
+{
+pTreeView->select(nRow);
+pTreeView->set_cursor_without_notify(*itEntry);
+}
+else
+SAL_WARN("vcl",
+ "No absolute position found for " << nRow <<
" in treeview");
pTreeView->grab_focus();
LOKTrigger::trigger_changed(*pTreeView);
LOKTrigger::trigger_row_activated(*pTreeView);
@@ -496,20 +506,30 @@ bool ExecuteAction(const std::string& nWindowId, const
OString& rWidget, StringM
{
sal_Int32 nAbsPos = o3tl::toInt32(rData["data"]);
std::unique_ptr
itEntry(pTreeView->make_iterator());
-pTreeView->get_iter_abs_pos(*itEntry, nAbsPos);
-pTreeView->set_cursor_without_notify(*itEntry);
-pTreeView->grab_focus();
-pTreeView->expand_row(*itEntry);
+if (pTreeView->get_iter_abs_pos(*itEntry, nAbsPos))
+{
+pTreeView->set_cursor_without_notify(*itEntry);
+pTreeView->grab_focus();
+pTreeView->expand_row(*itEntry);
+}
+else
+SAL_WARN("vcl",
+ "No absolute position found for " << nAbsPos
<< " in treeview");
return true;
}
else if (sAction == "collapse")
{
sal_Int32 nAbsPos = o3tl::toInt32(rData["data"]);
std::unique_ptr
itEntry(pTreeView->make_iterator());
-pTreeView->get_iter_abs_pos(*itEntry, nAbsPos);
-pTreeView->set_cursor_without_notify(*itEntry);
-pTreeView->grab_focus();
-pTreeView->collapse_row(*itEntry);
+if (pTreeView->get_iter_abs_pos(*itEntry, nAbsPos))
+{
+pTreeView->set_cursor_without_notify(*itEntry);
+pTreeView->grab_focus();
+pTreeView->collapse_row(*itEntry);
+}
+else
+SAL_WARN("vcl",
+ "No absolute position found for " << nAbsPos
<< " in treeview");
return true;
}
else if (sAction == "dragstart")
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 5806561d370ac8008da8aee2a2588dcdc0a6bee3 Author: Szymon Kłos AuthorDate: Mon Sep 18 20:57:24 2023 +0200 Commit: Attila Szűcs CommitDate: Tue Sep 19 09:40:17 2023 +0200 jsdialog: enable chart trend line tab Change-Id: I89bae89a703fbd3ac07fc4e23659b092402e8a71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157031 Tested-by: Jenkins CollaboraOffice Reviewed-by: Attila Szűcs diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index d63f6903e01e..c8e5ab93511c 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -153,8 +153,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/schart/ui/smoothlinesdlg.ui" || rUIFile == u"modules/schart/ui/steppedlinesdlg.ui" || rUIFile == u"modules/schart/ui/tp_ChartType.ui" -|| rUIFile == u"modules/schart/ui/tp_RangeChooser.ui" || rUIFile == u"modules/schart/ui/tp_DataSource.ui" +|| rUIFile == u"modules/schart/ui/tp_RangeChooser.ui" +|| rUIFile == u"modules/schart/ui/tp_Trendline.ui" || rUIFile == u"modules/schart/ui/wizelementspage.ui" // sdraw || rUIFile == u"modules/sdraw/ui/drawchardialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/jsdialogbuilder.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 63e9f5334a61c9f34572bb2ebebfdaa651d36c19
Author: Szymon Kłos
AuthorDate: Thu Aug 24 12:28:32 2023 +0200
Commit: Szymon Kłos
CommitDate: Mon Aug 28 16:25:42 2023 +0200
jsdialog: don't send update if we not change selection
Change-Id: I3eb1e5df4133f010d0c4f7abde0f73bfeda75a82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156046
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index e147049c6f56..fc875c72ae34 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1668,6 +1668,9 @@ void JSComboBox::set_entry_text(const OUString& rText)
void JSComboBox::set_active(int pos)
{
+if (pos == get_active())
+return;
+
SalInstanceComboBoxWithEdit::set_active(pos);
sendUpdate();
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 666e0bfccecd743f8a269363b38dbe5dd9faa481 Author: Szymon Kłos AuthorDate: Wed May 31 11:16:36 2023 +0200 Commit: Szymon Kłos CommitDate: Thu Jun 1 15:16:48 2023 +0200 jsdialog: enable sparkline dialog Change-Id: Iaf5de5c1c15313075afdf8dbc48dcb22da448fea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152417 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 3a6ec1d1e943..cd2cd4d2a5eb 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -130,6 +130,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || 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/sparklinedialog.ui" || rUIFile == u"modules/scalc/ui/standardfilterdialog.ui" || rUIFile == u"modules/scalc/ui/textimportcsv.ui" || rUIFile == u"modules/scalc/ui/ttestdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/jsdialogbuilder.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 905a112fb2c7500ed2dc5c2876f97cca4edaa8f5 Author: Szymon Kłos AuthorDate: Wed May 10 08:27:01 2023 +0200 Commit: Szymon Kłos CommitDate: Wed May 10 16:07:13 2023 +0200 jsdialog: don't send full update on message dialog close this fixes regression introduced in: commit 09976bda9c196b2426b8826941f21384a58bf536 jsdialog: don't close dialog on tab page destroy when enable macro warning was shown it required to close manually the dialog with 'x' button because after click on "enable' or 'disable' it wasn't closed Change-Id: I4741a874f93481ad03d043349520a1bf91a882be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151602 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index caba64a60c32..359368f2a702 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -908,6 +908,7 @@ std::unique_ptr JSInstanceBuilder::weld_message_dialog(cons m_bHasTopLevelDialog = true; initializeSender(GetNotifierWindow(), GetContentWindow(), GetTypeOfJSON()); +m_bSentInitialUpdate = true; } pRet.reset(pMessageDialog ? new JSMessageDialog(this, pMessageDialog, this, false) : nullptr);
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit 880828b028c68ae4654322c98cc60d0c0cec3855 Author: Szymon Kłos AuthorDate: Tue May 9 09:13:13 2023 +0200 Commit: Szymon Kłos CommitDate: Tue May 9 12:08:13 2023 +0200 jsdialog: enable image properties dialogs Change-Id: Id3bf64e38093e7c068871029599a13f64891b6fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151557 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 807f1d14a580..3a6ec1d1e943 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -38,6 +38,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/charnamepage.ui" || rUIFile == u"cui/ui/colorpage.ui" || rUIFile == u"cui/ui/colorpickerdialog.ui" +|| rUIFile == u"cui/ui/croppage.ui" || rUIFile == u"cui/ui/effectspage.ui" || rUIFile == u"cui/ui/eventassigndialog.ui" || rUIFile == u"cui/ui/fontfeaturesdialog.ui" @@ -71,6 +72,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/rotationtabpage.ui" || rUIFile == u"cui/ui/shadowtabpage.ui" || rUIFile == u"cui/ui/slantcornertabpage.ui" +|| rUIFile == u"cui/ui/spinbox.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/specialcharacters.ui" @@ -172,6 +174,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnotepage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/formattablepage.ui" +|| rUIFile == u"modules/swriter/ui/frmaddpage.ui" +|| rUIFile == u"modules/swriter/ui/frmurlpage.ui" +|| rUIFile == u"modules/swriter/ui/frmtypepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/indexentry.ui" || rUIFile == u"modules/swriter/ui/inforeadonlydialog.ui" @@ -183,6 +188,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" +|| rUIFile == u"modules/swriter/ui/picturedialog.ui" +|| rUIFile == u"modules/swriter/ui/picturepage.ui" || rUIFile == u"modules/swriter/ui/sectionpage.ui" || rUIFile == u"modules/swriter/ui/sortdialog.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" @@ -200,6 +207,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/translationdialog.ui" || rUIFile == u"modules/swriter/ui/watermarkdialog.ui" || rUIFile == u"modules/swriter/ui/wordcount.ui" +|| rUIFile == u"modules/swriter/ui/wrappage.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" || rUIFile == u"sfx/ui/custominfopage.ui" @@ -214,6 +222,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) // svx || rUIFile == u"svx/ui/accessibilitycheckdialog.ui" || rUIFile == u"svx/ui/accessibilitycheckentry.ui" +|| rUIFile == u"svx/ui/compressgraphicdialog.ui" || rUIFile == u"svx/ui/findreplacedialog.ui" || rUIFile == u"svx/ui/fontworkgallerydialog.ui" || rUIFile == u"svx/ui/headfootformatpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/executor.cxx |4 1 file changed, 4 insertions(+) New commits: commit d9d2e4b1c1b660e4727edd21b0c83b7534b6171c Author: Attila Szűcs AuthorDate: Wed May 3 04:46:20 2023 +0200 Commit: Szymon Kłos CommitDate: Fri May 5 09:38:00 2023 +0200 LOK: Navi-6 page selector SpinField Grab the focus back to the spinfield in sidebar, so the document will be able to scroll to the right page. It seems there is a condition check, on move to page, that focus must be not on document, or else it does not move. AFAIK in lok code we dont try to simulate the focus of the core, but maybe we should, for cases like this. Change-Id: Ie9a30e6bd944cfa1729861eb0ac1924b946f4185 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151309 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx index a178d60fc2c3..737ae2f961b9 100644 --- a/vcl/jsdialog/executor.cxx +++ b/vcl/jsdialog/executor.cxx @@ -311,6 +311,10 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM if (rData["data"] == "undefined") return true; +// The Document will not scroll if that is in focus +// maybe we could send a message with: sAction == "grab_focus" +pWidget->grab_focus(); + double nValue = o3tl::toDouble(rData["data"]); pSpinField->set_value(nValue * weld::SpinButton::Power10(pSpinField->get_digits()));
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 30ea6a4e634e838af01cbadf591125e1ddbf3eef Author: Tomaž Vajngerl AuthorDate: Wed Apr 26 16:26:55 2023 +0900 Commit: Tomaž Vajngerl CommitDate: Wed Apr 26 16:26:55 2023 +0900 jsdialog: enable themedialog.ui and themecoloreditdialog.ui Change-Id: Ie6c6af3e3a98548cad8b5bfb067382a03296b278 diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 73dc2bec6a4f..d620b537c93c 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -216,6 +216,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"svx/ui/findreplacedialog.ui" || rUIFile == u"svx/ui/fontworkgallerydialog.ui" || rUIFile == u"svx/ui/headfootformatpage.ui" +|| rUIFile == u"svx/ui/themecoloreditdialog.ui" +|| rUIFile == u"svx/ui/themedialog.ui" // uui || rUIFile == u"uui/ui/macrowarnmedium.ui" // vcl
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 515417105729c69e9eef76a48c39f97affce19a9 Author: Szymon Kłos AuthorDate: Wed Apr 12 15:13:13 2023 +0200 Commit: Szymon Kłos CommitDate: Wed Apr 12 15:15:02 2023 +0200 jsdialog: enable area dialog Change-Id: I915414c55c0b008c018bc2376760eaa85f653384 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150282 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index fbc6441a5271..73dc2bec6a4f 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -30,6 +30,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) if (// cui rUIFile == u"cui/ui/areatabpage.ui" +|| rUIFile == u"cui/ui/areadialog.ui" || rUIFile == u"cui/ui/asiantypography.ui" || rUIFile == u"cui/ui/borderpage.ui" || rUIFile == u"cui/ui/bulletandposition.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 48c83a18c4b9f82348d064f9301ba03655dcac4b Author: Pranam Lashkari AuthorDate: Tue Mar 21 21:22:13 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:50:55 2023 +0200 jsdialog: enabled readonly content warning dialog Change-Id: I12e9af2e55902862df557ea4fe36a7463d6a95f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149277 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 847fd360a518..fbc6441a5271 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -173,6 +173,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/indexentry.ui" +|| rUIFile == u"modules/swriter/ui/inforeadonlydialog.ui" || rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 4bd57ffda77c884ea1104755af098730f04ef178 Author: Pranam Lashkari AuthorDate: Tue Mar 21 21:19:12 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:47:08 2023 +0200 jsdialog: enabled bullets and numbering dialog (writer) Change-Id: I6d5ca75c7f2a91bd1716083fa9929fbeb3bd2e07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149276 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index fab409b85076..847fd360a518 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -51,6 +51,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/linetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" +|| rUIFile == u"cui/ui/numberingpositionpage.ui" || rUIFile == u"cui/ui/optlingupage.ui" || rUIFile == u"cui/ui/pageformatpage.ui" || rUIFile == u"cui/ui/paragalignpage.ui" @@ -59,6 +60,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/password.ui" || rUIFile == u"cui/ui/pastespecial.ui" || rUIFile == u"cui/ui/patterntabpage.ui" +|| rUIFile == u"cui/ui/pickbulletpage.ui" +|| rUIFile == u"cui/ui/pickgraphicpage.ui" +|| rUIFile == u"cui/ui/picknumberingpage.ui" +|| rUIFile == u"cui/ui/pickoutlinepage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/positionsizedialog.ui" || rUIFile == u"cui/ui/possizetabpage.ui" @@ -150,6 +155,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/simpress/ui/headerfooterdialog.ui" || rUIFile == u"modules/simpress/ui/headerfootertab.ui" // swriter +|| rUIFile == u"modules/swriter/ui/bulletsandnumbering.ui" || rUIFile == u"modules/swriter/ui/captionoptions.ui" || rUIFile == u"modules/swriter/ui/characterproperties.ui" || rUIFile == u"modules/swriter/ui/charurlpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 451939ac9a8cf182ab563412d561562957a60499 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:24:12 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:43:07 2023 +0200 jsdialog: enabled footnote endnote settings dialog(writer) Change-Id: I85c6eb0db6ad7123df1c8596951be5bb8ed5ef3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149171 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index f6289271269b..fab409b85076 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -159,7 +159,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/endnotepage.ui" +|| rUIFile == u"modules/swriter/ui/footendnotedialog.ui" || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" +|| rUIFile == u"modules/swriter/ui/footnotepage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 062f0ff0a43a6d5ce610742a73d5b18562168a00 Author: Pranam Lashkari AuthorDate: Mon Mar 20 19:58:28 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:41:20 2023 +0200 jsdialog: enabled insert index entry dialog (writer) Change-Id: I2540620f7c4f9f640d943fb9e7b0e8661c706c7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149170 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 797d185638f8..f6289271269b 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -163,10 +163,12 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" +|| rUIFile == u"modules/swriter/ui/indexentry.ui" || rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" +|| rUIFile == u"modules/swriter/ui/newuserindexdialog.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 6c204682d3b69bdcbb215fa10fbcd66253d0cdba Author: Pranam Lashkari AuthorDate: Mon Mar 20 19:47:38 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:39:30 2023 +0200 jsdialog: enable table of content dialog (writer) Change-Id: I21af621a10e6d483af0174304e3457775068ab2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149169 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 5249e2e1ffdb..797d185638f8 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -176,9 +176,14 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/tablecolumnpage.ui" || rUIFile == u"modules/swriter/ui/tableproperties.ui" || rUIFile == u"modules/swriter/ui/tabletextflowpage.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog1.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" +|| rUIFile == u"modules/swriter/ui/tocdialog.ui" +|| rUIFile == u"modules/swriter/ui/tocentriespage.ui" +|| rUIFile == u"modules/swriter/ui/tocindexpage.ui" +|| rUIFile == u"modules/swriter/ui/tocstylespage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" || rUIFile == u"modules/swriter/ui/watermarkdialog.ui" // sfx
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit c187f0a77614b8a9419c1dad5c2d5114f1629c27 Author: Szymon Kłos AuthorDate: Wed Mar 29 15:03:47 2023 +0200 Commit: Szymon Kłos CommitDate: Wed Mar 29 13:04:52 2023 + jsdialog: enable table related dialogs Change-Id: Ibcbd175e9b7c04f30acd4c5d23998b00889e7b0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149714 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 2e65814fedd5..5efd2a15d921 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -40,6 +40,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/effectspage.ui" || rUIFile == u"cui/ui/eventassigndialog.ui" || rUIFile == u"cui/ui/fontfeaturesdialog.ui" +|| rUIFile == u"cui/ui/formatcellsdialog.ui" || rUIFile == u"cui/ui/formatnumberdialog.ui" || rUIFile == u"cui/ui/gradientpage.ui" || rUIFile == u"cui/ui/hatchpage.ui" @@ -62,6 +63,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/positionsizedialog.ui" || rUIFile == u"cui/ui/possizetabpage.ui" || rUIFile == u"cui/ui/rotationtabpage.ui" +|| rUIFile == u"cui/ui/shadowtabpage.ui" || rUIFile == u"cui/ui/slantcornertabpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" @@ -157,6 +159,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" +|| rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" @@ -166,7 +169,11 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/sectionpage.ui" +|| rUIFile == u"modules/swriter/ui/sortdialog.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" +|| rUIFile == u"modules/swriter/ui/tablecolumnpage.ui" +|| rUIFile == u"modules/swriter/ui/tableproperties.ui" +|| rUIFile == u"modules/swriter/ui/tabletextflowpage.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 551cb82464333baecf1a1a548c893808bd93bc98 Author: Szymon Kłos AuthorDate: Wed Mar 29 12:28:11 2023 +0200 Commit: Szymon Kłos CommitDate: Wed Mar 29 10:31:04 2023 + jsdialog: enable pick color dialog Change-Id: I45c086ce652487017817fcdb2a3c5329a8f2a30f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149689 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 22c538ebf80c..2e65814fedd5 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -36,6 +36,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/cellalignment.ui" || rUIFile == u"cui/ui/charnamepage.ui" || rUIFile == u"cui/ui/colorpage.ui" +|| rUIFile == u"cui/ui/colorpickerdialog.ui" || rUIFile == u"cui/ui/effectspage.ui" || rUIFile == u"cui/ui/eventassigndialog.ui" || rUIFile == u"cui/ui/fontfeaturesdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 375784d6bf0e6208cd122e0766277bea36268faf Author: Szymon Kłos AuthorDate: Fri Mar 24 12:34:46 2023 +0100 Commit: Szymon Kłos CommitDate: Wed Mar 29 10:03:05 2023 + jsdialog: enable missing chart related dialogs Change-Id: Ia33980d3536b3a52a24161e789f04ee4de75f2e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149540 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 106f222097b7..22c538ebf80c 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -114,6 +114,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || 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/simplerefdialog.ui" || rUIFile == u"modules/scalc/ui/sortcriteriapage.ui" || rUIFile == u"modules/scalc/ui/sortdialog.ui" || rUIFile == u"modules/scalc/ui/sortkey.ui" @@ -127,7 +128,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/scalc/ui/validationhelptabpage.ui" || rUIFile == u"modules/scalc/ui/ztestdialog.ui" // schart +|| rUIFile == u"modules/schart/ui/attributedialog.ui" || rUIFile == u"modules/schart/ui/charttypedialog.ui" +|| rUIFile == u"modules/schart/ui/datarangedialog.ui" || rUIFile == u"modules/schart/ui/insertaxisdlg.ui" || rUIFile == u"modules/schart/ui/inserttitledlg.ui" || rUIFile == u"modules/schart/ui/tp_ChartType.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 517b089acd2099a2a755f65ef2cae7076399ee6e Author: Szymon Kłos AuthorDate: Thu Mar 23 11:53:03 2023 +0100 Commit: Szymon Kłos CommitDate: Thu Mar 23 14:17:14 2023 + jsdialog: enable impress format dialogs Change-Id: If7bcdf7afdf6e272e47531c2b2b0b75046c561a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149425 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 9d549bc294c9..106f222097b7 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -32,6 +32,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) rUIFile == u"cui/ui/areatabpage.ui" || rUIFile == u"cui/ui/asiantypography.ui" || rUIFile == u"cui/ui/borderpage.ui" +|| rUIFile == u"cui/ui/bulletandposition.ui" || rUIFile == u"cui/ui/cellalignment.ui" || rUIFile == u"cui/ui/charnamepage.ui" || rUIFile == u"cui/ui/colorpage.ui" @@ -42,6 +43,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/gradientpage.ui" || rUIFile == u"cui/ui/hatchpage.ui" || rUIFile == u"cui/ui/imagetabpage.ui" +|| rUIFile == u"cui/ui/linedialog.ui" +|| rUIFile == u"cui/ui/lineendstabpage.ui" +|| rUIFile == u"cui/ui/linestyletabpage.ui" +|| rUIFile == u"cui/ui/linetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" || rUIFile == u"cui/ui/optlingupage.ui" @@ -53,6 +58,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/pastespecial.ui" || rUIFile == u"cui/ui/patterntabpage.ui" || rUIFile == u"cui/ui/positionpage.ui" +|| rUIFile == u"cui/ui/positionsizedialog.ui" +|| rUIFile == u"cui/ui/possizetabpage.ui" +|| rUIFile == u"cui/ui/rotationtabpage.ui" +|| rUIFile == u"cui/ui/slantcornertabpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/specialcharacters.ui" @@ -126,7 +135,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/schart/ui/tp_DataSource.ui" || rUIFile == u"modules/schart/ui/wizelementspage.ui" // sdraw +|| rUIFile == u"modules/sdraw/ui/drawchardialog.ui" || rUIFile == u"modules/sdraw/ui/drawpagedialog.ui" +|| rUIFile == u"modules/sdraw/ui/drawparadialog.ui" // simpress || rUIFile == u"modules/simpress/ui/headerfooterdialog.ui" || rUIFile == u"modules/simpress/ui/headerfootertab.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 2e75e849e85da86ea33b447350b0e2f7eaede69e Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:36:45 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 13:22:52 2023 + jsdialog: enabled thesaurus dialog Change-Id: I01059e7a4aaffd5c4a2f5ccff55f83ed3db9bf38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149173 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index c93e80eb17fd..529cffe1dfb7 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -60,6 +60,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/spelloptionsdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" +|| rUIFile == u"cui/ui/thesaurus.ui" || rUIFile == u"cui/ui/transparencytabpage.ui" || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 41b7f70981cffb9a04b6b132317915ca51519eab Author: Pranam Lashkari AuthorDate: Mon Mar 20 17:47:17 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 13:02:59 2023 + jsdialog: enabled insert break(manual break) dialog(writer) Signed-off-by: Pranam Lashkari Change-Id: I65213cd8822e574eff333b96a8718ebff2946f5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149166 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 7efb9de2bb84..c93e80eb17fd 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -137,6 +137,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" +|| rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 8c358c1616a16beb10752f0a60bbacccba15d6ea Author: Pranam Lashkari AuthorDate: Mon Mar 20 18:50:12 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 12:39:25 2023 + jsdialog: enable watermark dialog (writer) Change-Id: Ie1f5a299fd68bdfd21c04d1ef79514953a2ac5c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149168 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 935a81ba6e6d..6595cf7971c0 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -148,6 +148,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" +|| rUIFile == u"modules/swriter/ui/watermarkdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" || rUIFile == u"sfx/ui/custominfopage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 38eaa71245954d0dd8805b2140039f126a8ea0e3 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:32:32 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 08:41:03 2023 + jsdialog: enabled spelling dialog Change-Id: I36c35e82aa17d8e6cb76dbb24f33344870c49629 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149172 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 116cc6a5b768..4e5c79c1bf9b 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -55,6 +55,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/specialcharacters.ui" +|| rUIFile == u"cui/ui/spellingdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" || rUIFile == u"cui/ui/transparencytabpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |4 1 file changed, 4 insertions(+) New commits: commit fcc6e504ff968923f0b17d9e59be56dc5f342711 Author: Pranam Lashkari AuthorDate: Fri Mar 17 21:46:00 2023 +0530 Commit: Szymon Kłos CommitDate: Mon Mar 20 07:31:24 2023 + jsdialog: enabled page format dialog (writer) Change-Id: I352214af08e7f5f8470aeccc49932d0ea5b191a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149061 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index a219ede196b1..116cc6a5b768 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -130,6 +130,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" @@ -141,6 +142,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/sectionpage.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog8.ui" +|| rUIFile == u"modules/swriter/ui/textgridpage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" @@ -158,6 +161,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"svx/ui/accessibilitycheckentry.ui" || rUIFile == u"svx/ui/findreplacedialog.ui" || rUIFile == u"svx/ui/fontworkgallerydialog.ui" +|| rUIFile == u"svx/ui/headfootformatpage.ui" // uui || rUIFile == u"uui/ui/macrowarnmedium.ui" // vcl
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 8665bd300f60a3934d9991a877097112edda325f Author: Pranam Lashkari AuthorDate: Wed Mar 15 17:48:09 2023 +0530 Commit: Szymon Kłos CommitDate: Thu Mar 16 13:06:05 2023 + jsdialog: enabled paste special dialog Change-Id: I20833a2d138208ad139d0a4c673f87a0f7eb8f5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148920 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 09e3747183a4..61a05cac6b24 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -48,6 +48,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/paraindentspacing.ui" || rUIFile == u"cui/ui/paratabspage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/pastespecial.ui" || rUIFile == u"cui/ui/patterntabpage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit cd428e3e564b9bca0badb5e947f78a6fe3ea39ec Author: Pranam Lashkari AuthorDate: Wed Mar 15 19:15:46 2023 +0530 Commit: Szymon Kłos CommitDate: Thu Mar 16 13:03:26 2023 + jsdialog: enabled insert section dialog (writer) Change-Id: I556973587c2c7f4baab4cf696afe980186e82f6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148930 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 3142fba2db59..09e3747183a4 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -116,15 +116,20 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/captionoptions.ui" || rUIFile == u"modules/swriter/ui/characterproperties.ui" || rUIFile == u"modules/swriter/ui/charurlpage.ui" +|| rUIFile == u"modules/swriter/ui/columnpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" +|| rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" +|| rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" +|| rUIFile == u"modules/swriter/ui/sectionpage.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit cdde18194a02b51d946ef696ce7f2d5901160e66 Author: Szymon Kłos AuthorDate: Thu Mar 16 13:56:59 2023 +0100 Commit: Szymon Kłos CommitDate: Thu Mar 16 12:57:47 2023 + jsdialog: enable Format cell dialog Change-Id: I19722ac3e8b3f58ba916aa21513ba7ee34ef0bb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148990 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index a7e750eb56f2..3142fba2db59 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -32,6 +32,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) rUIFile == u"cui/ui/areatabpage.ui" || rUIFile == u"cui/ui/asiantypography.ui" || rUIFile == u"cui/ui/borderpage.ui" +|| rUIFile == u"cui/ui/cellalignment.ui" || rUIFile == u"cui/ui/charnamepage.ui" || rUIFile == u"cui/ui/colorpage.ui" || rUIFile == u"cui/ui/effectspage.ui" @@ -78,6 +79,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/scalc/ui/descriptivestatisticsdialog.ui" || rUIFile == u"modules/scalc/ui/erroralerttabpage.ui" || rUIFile == u"modules/scalc/ui/exponentialsmoothingdialog.ui" +|| rUIFile == u"modules/scalc/ui/formatcellsdialog.ui" || rUIFile == u"modules/scalc/ui/fourieranalysisdialog.ui" || rUIFile == u"modules/scalc/ui/goalseekdlg.ui" || rUIFile == u"modules/scalc/ui/groupdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a1a6a920ebd1092b412928bf5173681dc5c254aa Author: Szymon Kłos AuthorDate: Mon Mar 13 12:28:24 2023 +0100 Commit: Szymon Kłos CommitDate: Thu Mar 16 08:25:25 2023 + jsdialog: enable standard filter dialog Change-Id: Id29ec01a9ffefeb7da0c4e61011fff966d9cf3c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148787 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 1504f0eccd38..231d33f36059 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -92,6 +92,7 @@ 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/standardfilterdialog.ui" || rUIFile == u"modules/scalc/ui/textimportcsv.ui" || rUIFile == u"modules/scalc/ui/ttestdialog.ui" || rUIFile == u"modules/scalc/ui/ungroupdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog vcl/source
vcl/jsdialog/executor.cxx|2 +-
vcl/source/window/layout.cxx | 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 1ec36485afab326eb0ac0e2c96a0ed5320fb255c
Author: Szymon Kłos
AuthorDate: Tue Mar 14 15:32:29 2023 +0100
Commit: Szymon Kłos
CommitDate: Wed Mar 15 10:01:32 2023 +
jsdialog: render full edit engine content
Change-Id: I43c2deb75619956b95cdc1d2693a7540d5c8f894
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/14
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 6532f562e1ec..33e5884c74d2 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -206,7 +206,7 @@ bool ExecuteAction(const std::string& nWindowId, const
OString& rWidget, StringM
// We send OutPutSize for the drawing area bitmap
// get_size_request is not necessarily updated
// therefore it may be incorrect.
-Size size = rRefDevice.GetOutputSize();
+Size size = rRefDevice.GetOutputSizePixel();
posX = posX * size.Width();
posY = posY * size.Height();
if (sAction == "click")
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 73773192397f..787c794d0ff4 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -3056,10 +3056,17 @@ void
VclDrawingArea::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
rJsonWriter.put("type", "drawingarea");
ScopedVclPtrInstance pDevice;
-pDevice->SetOutputSize( GetSizePixel() );
-tools::Rectangle aRect(Point(0,0), GetSizePixel());
+OutputDevice* pRefDevice = GetOutDev();
+Size aRenderSize(pRefDevice->PixelToLogic(GetOutputSizePixel()));
+Size aOutputSize = GetSizePixel();
+pDevice->SetOutputSize(aRenderSize);
+tools::Rectangle aRect(Point(0,0), aRenderSize);
+
Paint(*pDevice, aRect);
-BitmapEx aImage = pDevice->GetBitmapEx( Point(0,0), GetSizePixel() );
+
+BitmapEx aImage = pDevice->GetBitmapEx(Point(0,0), aRenderSize);
+aImage.Scale(aOutputSize);
+
SvMemoryStream aOStm(65535, 65535);
if(GraphicConverter::Export(aOStm, aImage, ConvertDataFormat::PNG) ==
ERRCODE_NONE)
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit c23e2600684190db0f437959e70fc66e2e08fbc2 Author: Szymon Kłos AuthorDate: Tue Mar 14 13:12:08 2023 +0100 Commit: Szymon Kłos CommitDate: Wed Mar 15 09:56:07 2023 + jsdialog: enable insert special character dialog Change-Id: I535397ff7c5250989057dd8616ccc7c4eec6afad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148853 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index a779d45f13d2..459877a6afd6 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -51,6 +51,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" +|| rUIFile == u"cui/ui/specialcharacters.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" || rUIFile == u"cui/ui/transparencytabpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit ae69dc05d3de876dade4fa8a9b6f6f693cc7c865 Author: Pranam Lashkari AuthorDate: Mon Mar 13 20:40:04 2023 +0530 Commit: Szymon Kłos CommitDate: Wed Mar 15 09:45:40 2023 + jsdialog: enable style dialog (writer) Change-Id: Iaf664deeac5c5887f20c9579881cd921868b652f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148794 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 054a9fde4bef..a779d45f13d2 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -115,6 +115,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" @@ -124,6 +125,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"sfx/ui/documentpropertiesdialog.ui" || rUIFile == u"sfx/ui/editdurationdialog.ui" || rUIFile == u"sfx/ui/linefragment.ui" +|| rUIFile == u"sfx/ui/managestylepage.ui" || rUIFile == u"sfx/ui/password.ui" // svx || rUIFile == u"svx/ui/accessibilitycheckdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a78a7400931b88c1d46e56b611fe2ce72534bb1f Author: Szymon Kłos AuthorDate: Mon Mar 13 14:25:12 2023 +0100 Commit: Szymon Kłos CommitDate: Mon Mar 13 13:48:40 2023 + jsdialog: enable advanced filter dialog Change-Id: I629566eb3193bba1a56c058eca17a68ff1a84881 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148788 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 7e450e8e7de9..054a9fde4bef 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -57,6 +57,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc +|| rUIFile == u"modules/scalc/ui/advancedfilterdialog.ui" || rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui" || rUIFile == u"modules/scalc/ui/chardialog.ui" || rUIFile == u"modules/scalc/ui/chisquaretestdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b80cc95c5292b568dabd9ca0ca761ed8c26334a5 Author: Szymon Kłos AuthorDate: Mon Mar 13 14:47:35 2023 +0100 Commit: Szymon Kłos CommitDate: Mon Mar 13 13:48:00 2023 + jsdialog: enable goal seek dialog Change-Id: If3ec1d166b39720fd1307e1cc5472b839bf776e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148791 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index dcc5377f171c..7e450e8e7de9 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -72,6 +72,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/scalc/ui/erroralerttabpage.ui" || rUIFile == u"modules/scalc/ui/exponentialsmoothingdialog.ui" || rUIFile == u"modules/scalc/ui/fourieranalysisdialog.ui" +|| rUIFile == u"modules/scalc/ui/goalseekdlg.ui" || rUIFile == u"modules/scalc/ui/groupdialog.ui" || rUIFile == u"modules/scalc/ui/insertcells.ui" || rUIFile == u"modules/scalc/ui/managenamesdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit e5b32a88b42a370ee09653a0f70cdf5bc7f79599 Author: Szymon Kłos AuthorDate: Mon Mar 13 10:38:41 2023 +0100 Commit: Szymon Kłos CommitDate: Mon Mar 13 10:57:18 2023 + jsdialog: enable chart related dialogs Change-Id: Icb98ce84518d0f43b832ea05d7045f43bc194990 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148782 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 7e4fc5fd7e78..e4b487f6d6d0 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -93,6 +93,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/scalc/ui/ungroupdialog.ui" || rUIFile == u"modules/scalc/ui/ztestdialog.ui" // schart +|| rUIFile == u"modules/schart/ui/charttypedialog.ui" +|| rUIFile == u"modules/schart/ui/insertaxisdlg.ui" +|| rUIFile == u"modules/schart/ui/inserttitledlg.ui" || rUIFile == u"modules/schart/ui/tp_ChartType.ui" || rUIFile == u"modules/schart/ui/tp_RangeChooser.ui" || rUIFile == u"modules/schart/ui/tp_DataSource.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx | 13 + 1 file changed, 13 insertions(+) New commits: commit fdbf7b7d49e3b458969056478a1f235be9f08661 Author: Pranam Lashkari AuthorDate: Tue Mar 7 18:09:46 2023 +0530 Commit: Szymon Kłos CommitDate: Fri Mar 10 09:13:03 2023 + jsdialog: enabled Format Paragraph dialog (writer) can be found from: Tabbed view > Format > Paragraph sidebar > Paragraph Compact view > Format > Paragraph Change-Id: I5b0e59c88017cb039f9e441be76c350bf39f9614 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148418 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 70674c5523b1..7e4fc5fd7e78 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -35,6 +35,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) if (// cui rUIFile == u"cui/ui/areatabpage.ui" +|| rUIFile == u"cui/ui/asiantypography.ui" || rUIFile == u"cui/ui/borderpage.ui" || rUIFile == u"cui/ui/charnamepage.ui" || rUIFile == u"cui/ui/colorpage.ui" @@ -42,13 +43,22 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/eventassigndialog.ui" || rUIFile == u"cui/ui/fontfeaturesdialog.ui" || rUIFile == u"cui/ui/formatnumberdialog.ui" +|| rUIFile == u"cui/ui/gradientpage.ui" +|| rUIFile == u"cui/ui/hatchpage.ui" +|| rUIFile == u"cui/ui/imagetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" +|| rUIFile == u"cui/ui/paragalignpage.ui" +|| rUIFile == u"cui/ui/paraindentspacing.ui" +|| rUIFile == u"cui/ui/paratabspage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/patterntabpage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" +|| rUIFile == u"cui/ui/textflowpage.ui" +|| rUIFile == u"cui/ui/transparencytabpage.ui" || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc @@ -93,10 +103,13 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/charurlpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" +|| rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" +|| rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" +|| rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/jsdialogbuilder.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 66ece50023cf8e2514e27582c9575e1b1fe5
Author: Szymon Kłos
AuthorDate: Wed Mar 8 10:58:03 2023 +0100
Commit: Szymon Kłos
CommitDate: Wed Mar 8 10:24:31 2023 +
jsdialog: treeview selection should be an action
Change-Id: Iaaff603b647c18eb566cece272b0e93563c960b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148463
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 713920cff594..2bf0ad8e9e4e 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1800,7 +1800,11 @@ void JSTreeView::select(int pos)
}
}
enable_notify_events();
-sendUpdate();
+
+std::unique_ptr pMap =
std::make_unique();
+(*pMap)[ACTION_TYPE] = "select";
+(*pMap)["position"] = OUString::number(pos);
+sendAction(std::move(pMap));
}
weld::TreeView* JSTreeView::get_drag_source() const { return g_DragSource; }
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 5a913f39136a3513c8eaabdfa54a3421ac839d7e
Author: Pranam Lashkari
AuthorDate: Fri Mar 3 02:27:01 2023 +0530
Commit: Szymon Kłos
CommitDate: Tue Mar 7 09:12:40 2023 +
jsdialog: sort enabled UI files by name
this helps avoid repeating them
Change-Id: Iaa1d73ca1e396c18a0486ca89cb3b0a26571569d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148206
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index d58e08bf32d6..3f1abace986e 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -38,8 +38,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"cui/ui/macroselectordialog.ui"
|| rUIFile == u"cui/ui/numberingformatpage.ui"
|| rUIFile == u"cui/ui/password.ui"
-|| rUIFile == u"cui/ui/splitcellsdialog.ui"
|| rUIFile == u"cui/ui/similaritysearchdialog.ui"
+|| rUIFile == u"cui/ui/splitcellsdialog.ui"
|| rUIFile == u"cui/ui/widgettestdialog.ui"
// scalc
|| rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui"
@@ -75,12 +75,12 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
+|| rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui"
|| rUIFile == u"modules/swriter/ui/insertcaption.ui"
|| rUIFile == u"modules/swriter/ui/linenumbering.ui"
+|| rUIFile == u"modules/swriter/ui/pagenumberdlg.ui"
|| rUIFile == u"modules/swriter/ui/splittable.ui"
|| rUIFile == u"modules/swriter/ui/translationdialog.ui"
-|| rUIFile == u"modules/swriter/ui/pagenumberdlg.ui"
-|| rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui"
// sfx
|| rUIFile == u"sfx/ui/cmisinfopage.ui"
|| rUIFile == u"sfx/ui/custominfopage.ui"
@@ -98,19 +98,19 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
// uui
|| rUIFile == u"uui/ui/macrowarnmedium.ui"
// xmlsec
-|| rUIFile == u"xmlsec/ui/certgeneral.ui"
-|| rUIFile == u"xmlsec/ui/certpage.ui"
-|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
-|| rUIFile == u"xmlsec/ui/viewcertdialog.ui"
-|| rUIFile == u"filter/ui/pdfoptionsdialog.ui"
|| rUIFile == u"filter/ui/pdfgeneralpage.ui"
-|| rUIFile == u"filter/ui/pdfviewpage.ui"
-|| rUIFile == u"filter/ui/pdfuserinterfacepage.ui"
-|| rUIFile == u"filter/ui/pdfsecuritypage.ui"
|| rUIFile == u"filter/ui/pdflinkspage.ui"
-|| rUIFile == u"filter/ui/warnpdfdialog.ui"
+|| rUIFile == u"filter/ui/pdfoptionsdialog.ui"
+|| rUIFile == u"filter/ui/pdfsecuritypage.ui"
|| rUIFile == u"filter/ui/pdfsignpage.ui"
+|| rUIFile == u"filter/ui/pdfuserinterfacepage.ui"
+|| rUIFile == u"filter/ui/pdfviewpage.ui"
+|| rUIFile == u"filter/ui/warnpdfdialog.ui"
|| rUIFile == u"writerperfect/ui/exportepub.ui"
+|| rUIFile == u"xmlsec/ui/certgeneral.ui"
+|| rUIFile == u"xmlsec/ui/certpage.ui"
+|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
+|| rUIFile == u"xmlsec/ui/viewcertdialog.ui"
)
{
return true;
@@ -189,8 +189,8 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile)
// swriter
|| rUIFile == u"modules/swriter/ui/managechangessidebar.ui"
//|| rUIFile == u"modules/swriter/ui/navigatorpanel.ui"
-|| rUIFile == u"modules/swriter/ui/pageformatpanel.ui"
|| rUIFile == u"modules/swriter/ui/pagefooterpanel.ui"
+|| rUIFile == u"modules/swriter/ui/pageformatpanel.ui"
|| rUIFile == u"modules/swriter/ui/pageheaderpanel.ui"
|| rUIFile == u"modules/swriter/ui/pagestylespanel.ui"
|| rUIFile == u"modules/swriter/ui/sidebarstylepresets.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit fddade544feaeed62d3c6f7ca990fc9c1e1f5e09 Author: Hannah Meeks AuthorDate: Fri Feb 10 22:15:36 2023 + Commit: Szymon Kłos CommitDate: Tue Feb 21 11:13:22 2023 + jsdialog: enable line numbering Change-Id: I3d188abe79605f88739b0ee17a77c6c7f8ab7754 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147328 Tested-by: Jenkins Reviewed-by: Szymon Kłos (cherry picked from commit d6617bf6f6cebc68018f72ac38bb3dd7a43c766c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147355 Tested-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index c11365d6dcbc..d58e08bf32d6 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -76,6 +76,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" +|| rUIFile == u"modules/swriter/ui/linenumbering.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui"
