core.git: vcl/jsdialog

[Tomaž Vajngerl (via logerrit)]

 vcl/jsdialog/enabled.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit ce454f382d0d005dd3de021c7820be3ffa0bb582
Author: Tomaž Vajngerl 
AuthorDate: Tue Apr 30 12:48:40 2024 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed May 1 03:51:22 2024 +0200

jsdialog: enable a11y checker sidebar

Change-Id: I46f276f16ded08a55b6672d92c39924ec3c4a628
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166881
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index c7973fad4d57..fd05cc3ff569 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -327,7 +327,7 @@ bool isBuilderEnabledForPopup(std::u16string_view rUIFile)
 
 bool isBuilderEnabledForSidebar(std::u16string_view rUIFile)
 {
-if (// scalc
+return // scalc
 rUIFile == u"modules/scalc/ui/functionpanel.ui"
 || rUIFile == u"modules/scalc/ui/navigatorpanel.ui"
 || rUIFile == u"modules/scalc/ui/sidebaralignment.ui"
@@ -354,6 +354,7 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile)
 || rUIFile == u"modules/smath/ui/sidebarelements_math.ui"
 || rUIFile == u"modules/smath/ui/sidebarproperties_math.ui"
 // swriter
+|| rUIFile == u"modules/swriter/ui/a11ycheckissuespanel.ui"
 || rUIFile == u"modules/swriter/ui/managechangessidebar.ui"
 || rUIFile == u"modules/swriter/ui/navigatorpanel.ui"
 || rUIFile == u"modules/swriter/ui/pagefooterpanel.ui"
@@ -383,10 +384,7 @@ bool isBuilderEnabledForSidebar(std::u16string_view 
rUIFile)
 || rUIFile == u"svx/ui/sidebarpossize.ui"
 || rUIFile == u"svx/ui/sidebarshadow.ui"
 || rUIFile == u"svx/ui/sidebarstylespanel.ui"
-|| rUIFile == u"svx/ui/sidebartextpanel.ui")
-return true;
-
-return false;
+|| rUIFile == u"svx/ui/sidebartextpanel.ui";
 }
 
 bool isInterimBuilderEnabledForNotebookbar(std::u16string_view rUIFile)

core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 0feb1b2c4a11317159195e451bf7a1a0dd755dd8
Author: Szymon Kłos 
AuthorDate: Wed Feb 21 10:23:00 2024 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 23 11:54:09 2024 +0100

jsdialog: don't duplicate MessageDialog messages

Remove hardcoded out-of-queue message for MessageDialog.
Now we send the messages in JSMessageDialog::run().
This prevents us from overwriting correct jsdialog window
in Online when we see messages before document was loaded
(from interaction handlers, like: macro warning, corrupted
file, etc.)

Change-Id: I364ac8460507dd6613b978230c9cf61cc5dfe91d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163679
Reviewed-by: Michael Meeks 
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit 5ee46b44d207a0416623a5c506bb2052052500a7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163767
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index abd57bf32b85..a7199e2ed960 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1312,13 +1312,6 @@ JSInstanceBuilder::CreateMessageDialog(weld::Widget* 
pParent, VclMessageType eMe
 pNotifier = xMessageDialog->GetLOKNotifier();
 if (pNotifier)
 {
-tools::JsonWriter aJsonWriter;
-xMessageDialog->DumpAsPropertyTree(aJsonWriter);
-aJsonWriter.put("id", xMessageDialog->GetLOKWindowId());
-aJsonWriter.put("jsontype", "dialog");
-OString message(aJsonWriter.finishAndGetAsOString());
-pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message);
-
 OUString sWindowId = 
OUString::number(xMessageDialog->GetLOKWindowId());
 InsertWindowToMap(sWindowId);
 xMessageDialog->SetLOKTunnelingState(false);

core.git: vcl/jsdialog

[Caolán McNamara (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6b214f90bf6c66a7d2ed9cfb45ae8174e508fc45
Author: Caolán McNamara 
AuthorDate: Wed Feb 21 12:30:41 2024 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 21 16:18:30 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/+/163624
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index a65e66f96cea..abd57bf32b85 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1829,8 +1829,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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit b34c69dd09069c4bb34fe4fe3225d304317999f1
Author: Szymon Kłos 
AuthorDate: Sun Jan 28 22:28:40 2024 +0100
Commit: Szymon Kłos 
CommitDate: Mon Feb 12 22:48:02 2024 +0100

jsdialog: enable animation properties in impress

to test:
1. click on any shape in Impress
2. go to Animation tab in sidebar
3. "add" animation
4. double-click on added animation on the list

Signed-off-by: Szymon Kłos 
Change-Id: I009cbdd295fac4f4533101c89d5c0268fbbe633a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162725
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index beb12b5dd081..6d5acc3dc538 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -167,6 +167,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"modules/sdraw/ui/drawpagedialog.ui"
 || rUIFile == u"modules/sdraw/ui/drawparadialog.ui"
 // simpress
+|| rUIFile == u"modules/simpress/ui/customanimationeffecttab.ui"
+|| rUIFile == u"modules/simpress/ui/customanimationproperties.ui"
+|| rUIFile == u"modules/simpress/ui/customanimationtexttab.ui"
+|| rUIFile == u"modules/simpress/ui/customanimationtimingtab.ui"
 || rUIFile == u"modules/simpress/ui/headerfooterdialog.ui"
 || rUIFile == u"modules/simpress/ui/headerfootertab.ui"
 // swriter

core.git: vcl/jsdialog

[Hubert Figuière (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 46ea6ae814e83b380b5f6bd044119af8247583a8
Author: Hubert Figuière 
AuthorDate: Fri Feb 9 14:56:49 2024 -0500
Commit: Michael Meeks 
CommitDate: Sat Feb 10 12:51:50 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 
(cherry picked from commit 5c1c842863ee2a63ce69a75ef0820864864905f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163174
Tested-by: Jenkins

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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 650d65326627a5cfd5dd59f0876a22583bc52d3f
Author: Szymon Kłos 
AuthorDate: Sun Jan 28 22:15:49 2024 +0100
Commit: Szymon Kłos 
CommitDate: Tue Jan 30 14:46:43 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
(cherry picked from commit af171cd8ca13cfc6d530abc89c7c3b85d0204628)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162712
Tested-by: Jenkins

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: vcl/jsdialog

[Jaume Pujantell (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54ef7f9ea9e6d0c62076b4fc296ea1feb506b309
Author: Jaume Pujantell 
AuthorDate: Mon Jan 8 17:20:28 2024 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 11 13:45:55 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 
(cherry picked from commit 545d512a5f7b866696b3a4dfc0e00748029d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161863
Tested-by: Jenkins

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: vcl/jsdialog

[codewithvk (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 23e4c6bbe2a946268b443f434a49a90c5a9f8ff5
Author: codewithvk 
AuthorDate: Wed Jan 3 22:25:10 2024 +0530
Commit: Caolán McNamara 
CommitDate: Sat Jan 6 22:22:45 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 
(cherry picked from commit 56ae4e455d6a8ac2116700c7b8913d64c665f362)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161681
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

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: vcl/jsdialog

[Darshan11 (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 01c9240947f21dec283fa0cb4b8b95e313073790
Author: Darshan11 
AuthorDate: Wed Jan 3 16:19:39 2024 +0530
Commit: Szymon Kłos 
CommitDate: Thu Jan 4 09:18:56 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 
(cherry picked from commit e03b03128a4cfe853258f649f8ff6f96a2c8b851)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161567
Tested-by: Jenkins

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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 514b182086d493efd3785e2f3092216c74f43dec
Author: Szymon Kłos 
AuthorDate: Mon Oct 23 12:49:36 2023 +0200
Commit: Caolán McNamara 
CommitDate: Fri Oct 27 14:54:00 2023 +0200

jsdialog: send smaller messages for combobox

Signed-off-by: Szymon Kłos 
Change-Id: Ib514607ad56b965c33439ad548ec90d516acfcf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158345
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Gökay ŞATIR 
(cherry picked from commit 9e2da48ec3dbe541ff52f6d69f98afb57afaac3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158443
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 3dcfcdcbd391..f694a5778fe7 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1653,7 +1653,11 @@ void JSComboBox::set_entry_text_without_notify(const 
OUString& rText)
 void JSComboBox::set_entry_text(const OUString& rText)
 {
 SalInstanceComboBoxWithEdit::set_entry_text(rText);
-sendUpdate();
+
+std::unique_ptr pMap = 
std::make_unique();
+(*pMap)[ACTION_TYPE] = "setText";
+(*pMap)["text"] = rText;
+sendAction(std::move(pMap));
 }
 
 void JSComboBox::set_active(int pos)
@@ -1662,7 +1666,11 @@ void JSComboBox::set_active(int pos)
 return;
 
 SalInstanceComboBoxWithEdit::set_active(pos);
-sendUpdate();
+
+std::unique_ptr pMap = 
std::make_unique();
+(*pMap)[ACTION_TYPE] = "select";
+(*pMap)["position"] = OUString::number(pos);
+sendAction(std::move(pMap));
 }
 
 void JSComboBox::set_active_id(const OUString& rStr)

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6b3b85d3f7093bc591a710394d0e81262573d72b
Author: Szymon Kłos 
AuthorDate: Mon Oct 23 15:26:28 2023 +0200
Commit: Szymon Kłos 
CommitDate: Fri Oct 27 08:50:04 2023 +0200

jsdialog: don't send  update in toolbox when not modified

Change-Id: I74087b54f9844ea5d22de03caf8724d38d525646
(cherry picked from commit 9d44086770d9a1c625d42676033f47a698dfa572)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158446
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 47743ac5ffc7..3dcfcdcbd391 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1965,8 +1965,10 @@ void JSToolbar::set_menu_item_active(const OUString& 
rIdent, bool bActive)
 
 void JSToolbar::set_item_sensitive(const OUString& rIdent, bool bSensitive)
 {
+bool bWasSensitive = get_item_sensitive(rIdent);
 SalInstanceToolbar::set_item_sensitive(rIdent, bSensitive);
-sendUpdate();
+if (bWasSensitive != bSensitive)
+sendUpdate();
 }
 
 void JSToolbar::set_item_icon_name(const OUString& rIdent, const OUString& 
rIconName)

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 70fef783162f6bb9ddf14bd863b9a284f23e9d40
Author: Szymon Kłos 
AuthorDate: Tue Oct 24 15:15:20 2023 +0200
Commit: Szymon Kłos 
CommitDate: Fri Oct 27 08:49:41 2023 +0200

jsdialog: enable simple conditional formatting dialog

Signed-off-by: Szymon Kłos 
Change-Id: Id9dad789bb772f7454f4bb35c42f4fde4d9a89c4
(cherry picked from commit fc2e0b49a6fa69a116e7a43c3c6ecb428a88f4c7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158447
Tested-by: Jenkins

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: vcl/jsdialog vcl/qa vcl/source vcl/unx

[Stephan Bergmann (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx   |2 
 vcl/qa/cppunit/GraphicTest.cxx |4 
 vcl/qa/cppunit/PDFDocumentTest.cxx |2 
 vcl/qa/cppunit/TypeSerializerTest.cxx  |2 
 vcl/qa/cppunit/mnemonic.cxx|4 
 vcl/source/control/wizardmachine.cxx   |4 
 vcl/source/font/font.cxx   |4 
 vcl/source/fontsubset/cff.cxx  |  782 -
 vcl/source/gdi/formpdfexport.cxx   |   40 -
 vcl/source/image/ImplImageTree.cxx |2 
 vcl/source/treelist/transfer.cxx   |   22 
 vcl/unx/generic/dtrans/config.cxx  |2 
 vcl/unx/generic/printer/ppdparser.cxx  |2 
 vcl/unx/generic/printer/printerinfomanager.cxx |4 
 14 files changed, 438 insertions(+), 438 deletions(-)

New commits:
commit d49abee2132d6c572afa86898929fc2ad5b982b1
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:40 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 20 22:48:21 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: vcl

Change-Id: Iaeacacbbb0eec907d884219aa2bcfe7a86f00a2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158291
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 91e09663bef1..47743ac5ffc7 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1818,7 +1818,7 @@ JSMessageDialog::~JSMessageDialog()
 
 void JSMessageDialog::RememberMessageDialog()
 {
-static constexpr OUStringLiteral sWidgetName = u"__DIALOG__";
+static constexpr OUString sWidgetName = u"__DIALOG__"_ustr;
 OUString sWindowId = OUString::number(m_xMessageDialog->GetLOKWindowId());
 if (JSInstanceBuilder::FindWeldWidgetsMap(sWindowId, sWidgetName) != 
nullptr)
 return;
diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index ef9678e42197..94cbd654b5ce 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -146,8 +146,8 @@ bool checkBitmap(Graphic& rGraphic)
 return bResult;
 }
 
-constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/data/";
-constexpr OUStringLiteral PDFEXPORT_DATA_DIRECTORY = 
u"/vcl/qa/cppunit/pdfexport/data/";
+constexpr OUString DATA_DIRECTORY = u"/vcl/qa/cppunit/data/"_ustr;
+constexpr OUString PDFEXPORT_DATA_DIRECTORY = 
u"/vcl/qa/cppunit/pdfexport/data/"_ustr;
 
 Graphic loadGraphic(std::u16string_view const& rFilename)
 {
diff --git a/vcl/qa/cppunit/PDFDocumentTest.cxx 
b/vcl/qa/cppunit/PDFDocumentTest.cxx
index 35af8e66cd58..88fcdc0a765b 100644
--- a/vcl/qa/cppunit/PDFDocumentTest.cxx
+++ b/vcl/qa/cppunit/PDFDocumentTest.cxx
@@ -22,7 +22,7 @@ public:
 PDFDocumentTest() = default;
 };
 
-constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/data/";
+constexpr OUString DATA_DIRECTORY = u"/vcl/qa/cppunit/data/"_ustr;
 
 CPPUNIT_TEST_FIXTURE(PDFDocumentTest, testParseBasicPDF)
 {
diff --git a/vcl/qa/cppunit/TypeSerializerTest.cxx 
b/vcl/qa/cppunit/TypeSerializerTest.cxx
index 2ffa3ec1257f..726843e19a03 100644
--- a/vcl/qa/cppunit/TypeSerializerTest.cxx
+++ b/vcl/qa/cppunit/TypeSerializerTest.cxx
@@ -34,7 +34,7 @@
 
 namespace
 {
-constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/data/";
+constexpr OUString DATA_DIRECTORY = u"/vcl/qa/cppunit/data/"_ustr;
 
 std::vector calculateHash(SvStream& rStream)
 {
diff --git a/vcl/qa/cppunit/mnemonic.cxx b/vcl/qa/cppunit/mnemonic.cxx
index 05ef7366cd21..9b6ce7d073ac 100644
--- a/vcl/qa/cppunit/mnemonic.cxx
+++ b/vcl/qa/cppunit/mnemonic.cxx
@@ -60,11 +60,11 @@ void VclMnemonicTest::testMnemonic()
 }
 
 {
-static constexpr OUStringLiteral TEST = u"\u4E00";
+static constexpr OUString TEST = u"\u4E00"_ustr;
 OUString sResult = aGenerator.CreateMnemonic(TEST);
 CPPUNIT_ASSERT_EQUAL(OUString("(~C)"), 
sResult.copy(sResult.getLength() - 4));
 sResult = MnemonicGenerator::EraseAllMnemonicChars(sResult);
-CPPUNIT_ASSERT_EQUAL(OUString(TEST), sResult);
+CPPUNIT_ASSERT_EQUAL(TEST, sResult);
 }
 }
 
diff --git a/vcl/source/control/wizardmachine.cxx 
b/vcl/source/control/wizardmachine.cxx
index f52069404564..38cc87793675 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -28,8 +28,8 @@
 #include 
 #include "wizimpldata.hxx"
 
-constexpr OUStringLiteral HID_WIZARD_NEXT = u"SVT_HID_WIZARD_NEXT";
-constexpr OUStringLiteral HID_WIZARD_PREVIOUS = u"SVT_HID_WIZARD_PREVIOUS";
+constexpr OUString HID_WIZARD_NEXT = u"SVT_HID_WIZARD_NEXT"_ustr;
+constexpr OUString HID_WIZARD_PREVIOUS = u"SVT_HID_WIZARD_PREVIOUS"_ustr;
 
 #define WIZARDDIALOG_BUTTON_OFFSET_Y6
 #define WIZARDDIALOG_BUTTON_DLGOFFSET_X 6
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 7b48855f247a..6dfee423a998 100644
--- 

[Libreoffice-commits] core.git: vcl/jsdialog

[Caolán McNamara (via logerrit)]

 vcl/jsdialog/executor.cxx |   48 --
 1 file changed, 34 insertions(+), 14 deletions(-)

New commits:
commit 2b1aaa84e28d0def9f845deb4c105ea4c7b252c6
Author: Caolán McNamara 
AuthorDate: Mon Oct 16 10:47:05 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 16 16:13:30 2023 +0200

check return of get_iter_abs_pos

Change-Id: Ifdabd65dc9fa5bc6d0c5c6eee1318f99bf918cd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158025
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 46d5fb675366..7c36eb3bdc1e 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -467,9 +467,14 @@ bool ExecuteAction(const OUString& nWindowId, const 
OUString& rWidget, StringMap
 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;
@@ -480,9 +485,14 @@ bool ExecuteAction(const OUString& nWindowId, const 
OUString& rWidget, StringMap
 
 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);
@@ -492,20 +502,30 @@ bool ExecuteAction(const OUString& nWindowId, const 
OUString& rWidget, StringMap
 {
 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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f850458af4b09f6f860223254c95b2d3fb24fa49
Author: Szymon Kłos 
AuthorDate: Mon Sep 18 20:57:24 2023 +0200
Commit: Szymon Kłos 
CommitDate: Tue Sep 19 11:21:14 2023 +0200

jsdialog: enable chart trend line tab

Change-Id: I89bae89a703fbd3ac07fc4e23659b092402e8a71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157050
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 5ca69398634d..db4bd04f9f46 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -148,8 +148,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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 62d5a5c376f06a22fdfd8708d2aefd7e987a4478
Author: Szymon Kłos 
AuthorDate: Thu Aug 24 12:28:32 2023 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 29 15:21:55 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156237
Tested-by: Jenkins

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 2e0fc28e544b..8f7949c474ca 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1655,6 +1655,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: vcl/jsdialog

[Andrea Gelmini (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6717532b37a5895206820e6429048ae2df3626f9
Author: Andrea Gelmini 
AuthorDate: Tue Aug 29 14:10:01 2023 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 29 14:54:41 2023 +0200

Fix typo

Change-Id: I2a3c65f012558aa388d02f88f9a359d6433a91f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156248
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 40f014d7cdc5..997cf90d45bf 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -118,7 +118,7 @@ void JSDialogNotifyIdle::sendMessage(jsdialog::MessageType 
eType, VclPtrm_eType == eType && it->m_pWindow == pWindow)
 {
-// actions should be always sent, eg. renrering of custom entries 
in combobox
+// actions should be always sent, eg. rendering of custom entries 
in combobox
 if (eType == jsdialog::MessageType::Action)
 {
 it++;

[Libreoffice-commits] core.git: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f5dbb93f102033b552ecfc0b959b45c1e9b3bacb
Author: Pranam Lashkari 
AuthorDate: Tue Mar 21 21:22:13 2023 +0530
Commit: Szymon Kłos 
CommitDate: Wed Jul 12 15:41:46 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154330
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index d58839e33af7..bc80fa12109f 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -180,6 +180,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || 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"
 || 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: vcl/jsdialog

[Attila Szűcs (via logerrit)]

 vcl/jsdialog/executor.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9c8e38ef8c69d519d72737b404d54d6413a98518
Author: Attila Szűcs 
AuthorDate: Wed May 3 04:46:20 2023 +0200
Commit: Szymon Kłos 
CommitDate: Fri May 12 13:47:22 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151701
Tested-by: Jenkins

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index f387a64ffc37..2784acf0cae8 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -310,6 +310,10 @@ bool ExecuteAction(const OUString& nWindowId, const 
OUString& rWidget, StringMap
 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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit d01f432d283631cf99766ccbb315238f013b79d1
Author: Szymon Kłos 
AuthorDate: Tue May 9 09:13:13 2023 +0200
Commit: Szymon Kłos 
CommitDate: Fri May 12 12:27:20 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151693
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 86528c4c6ca8..73a4eedf96b4 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/insertbreak.ui"
@@ -182,6 +187,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"
@@ -199,6 +206,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"
@@ -212,6 +220,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"sfx/ui/password.ui"
 // svx
 || 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: vcl/jsdialog

[Tomaž Vajngerl (via logerrit)]

 vcl/jsdialog/enabled.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f222ea7cac653bb2319bb1d3196dea6ce062026a
Author: Tomaž Vajngerl 
AuthorDate: Wed Apr 26 16:26:55 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Apr 26 11:25:27 2023 +0200

jsdialog: enable themedialog.ui and themecoloreditdialog.ui

Change-Id: Ie6c6af3e3a98548cad8b5bfb067382a03296b278
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151033
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 0619e79785ea..0ed9c299bc00 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -214,6 +214,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: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 066b23115c2a360507e306a88da572554daefab7
Author: Pranam Lashkari 
AuthorDate: Mon Mar 20 19:58:28 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Apr 17 10:59:22 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 
(cherry picked from commit 062f0ff0a43a6d5ce610742a73d5b18562168a00)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150088
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index acb6e4fd14b3..0619e79785ea 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -173,10 +173,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: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d1c24db3f8329bd798d4f80a94f191e6b43678f6
Author: Pranam Lashkari 
AuthorDate: Mon Mar 20 20:24:12 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Apr 14 17:21:10 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 
(cherry picked from commit 451939ac9a8cf182ab563412d561562957a60499)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150089
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 92399366af15..95868c19963f 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -160,7 +160,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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b9ad48f1939145105ee57470b5c9210bacc8ee45
Author: Szymon Kłos 
AuthorDate: Wed Apr 12 15:13:13 2023 +0200
Commit: Szymon Kłos 
CommitDate: Fri Apr 14 10:45:54 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150388

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index e135ca06d646..92399366af15 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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 591e96c29d15bd511645897e86ea3c9b4a20d9d7
Author: Szymon Kłos 
AuthorDate: Wed Mar 29 15:03:47 2023 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 5 08:51:48 2023 +0200

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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150040

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index b1c6a46d1ce8..e135ca06d646 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"
@@ -159,6 +161,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"
@@ -168,7 +171,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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1389150fb1d72ca431139177e5f31088ebf985e8
Author: Szymon Kłos 
AuthorDate: Wed Mar 29 12:28:11 2023 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 5 08:51:30 2023 +0200

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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150039

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 2069890bad2a..b1c6a46d1ce8 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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f4a0b43d729fff169a2152a04aaa1369a4d4f9d6
Author: Szymon Kłos 
AuthorDate: Fri Mar 24 12:34:46 2023 +0100
Commit: Szymon Kłos 
CommitDate: Tue Apr 4 10:23:52 2023 +0200

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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/14

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 60ad9aad8dbe..4eacaf3312b7 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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bd3bc03ef82e77fbb577a69a92da2690a5ef384f
Author: Szymon Kłos 
AuthorDate: Thu Mar 23 11:37:27 2023 +0100
Commit: Szymon Kłos 
CommitDate: Fri Mar 31 14:36:54 2023 +

jsdialog: enable header and footer dialog in impress

Change-Id: Iac64dea2811b8a784ff237d72eb02b36b29d042b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149422
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149837
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 6023a1692423..c595873ee3fc 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -123,6 +123,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"modules/schart/ui/tp_RangeChooser.ui"
 || rUIFile == u"modules/schart/ui/tp_DataSource.ui"
 || rUIFile == u"modules/schart/ui/wizelementspage.ui"
+// simpress
+|| rUIFile == u"modules/simpress/ui/headerfooterdialog.ui"
+|| rUIFile == u"modules/simpress/ui/headerfootertab.ui"
 // swriter
 || rUIFile == u"modules/swriter/ui/captionoptions.ui"
 || rUIFile == u"modules/swriter/ui/characterproperties.ui"

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d34f1b24005b0b142ae3b5f6505852fcbd5abcac
Author: Szymon Kłos 
AuthorDate: Thu Mar 16 13:56:59 2023 +0100
Commit: Szymon Kłos 
CommitDate: Fri Mar 31 09:40:25 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149366

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 26892ede3bcc..13023420b8c9 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"
@@ -81,6 +82,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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 676602a1a4e53e88d9f4664579497d534f6ae9c2
Author: Szymon Kłos 
AuthorDate: Mon Mar 13 12:28:24 2023 +0100
Commit: Szymon Kłos 
CommitDate: Thu Mar 23 14:18:06 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149364
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 9522cd09b7a9..3f18cfea078f 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -95,6 +95,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: vcl/jsdialog vcl/source

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx|2 +-
 vcl/source/window/layout.cxx |   13 ++---
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 584c9914fc4da76839ecdb3efed36381bee21954
Author: Szymon Kłos 
AuthorDate: Tue Mar 14 15:32:29 2023 +0100
Commit: Szymon Kłos 
CommitDate: Thu Mar 23 07:01:00 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149326
Tested-by: Jenkins

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 4668193cb579..94f2ad058bde 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 6befd3399520..f119b050d567 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -3089,10 +3089,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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0ad9327f3f8d94da1e932fcba23437fb4c126704
Author: Szymon Kłos 
AuthorDate: Tue Mar 14 13:12:08 2023 +0100
Commit: Szymon Kłos 
CommitDate: Wed Mar 22 16:04:08 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149232
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index fd82be31c56a..32651ad2f4a2 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/positionpage.ui"
 || 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"

[Libreoffice-commits] core.git: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7e476a24d1f9d58617e3e94630c931dfa0ab3c84
Author: Pranam Lashkari 
AuthorDate: Mon Mar 20 20:32:32 2023 +0530
Commit: Szymon Kłos 
CommitDate: Wed Mar 22 07:42:47 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149275
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 47b975fab586..fd82be31c56a 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/positionpage.ui"
 || rUIFile == u"cui/ui/queryduplicatedialog.ui"
 || rUIFile == u"cui/ui/similaritysearchdialog.ui"
+|| rUIFile == u"cui/ui/spellingdialog.ui"
 || rUIFile == u"cui/ui/splitcellsdialog.ui"
 || rUIFile == u"cui/ui/textflowpage.ui"
 || rUIFile == u"cui/ui/thesaurus.ui"

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2dae66968750af7ec1337b8a0431c478f043f6e8
Author: Szymon Kłos 
AuthorDate: Mon Mar 13 14:25:12 2023 +0100
Commit: Szymon Kłos 
CommitDate: Wed Mar 22 07:33:30 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149230

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 3acd22282fff..47b975fab586 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -64,6 +64,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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5b30ce463476653d7ef6fc6dc88653d409544694
Author: Szymon Kłos 
AuthorDate: Mon Mar 13 14:47:35 2023 +0100
Commit: Szymon Kłos 
CommitDate: Wed Mar 22 07:33:13 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149220

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index ff68b22b2b39..3acd22282fff 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -78,6 +78,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"modules/scalc/ui/descriptivestatisticsdialog.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: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ba15e267f092139d7362ec6867e147c2957bd068
Author: Szymon Kłos 
AuthorDate: Mon Mar 13 10:38:41 2023 +0100
Commit: Szymon Kłos 
CommitDate: Wed Mar 22 07:32:45 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149218

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 54ffe823aecf..ff68b22b2b39 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -95,6 +95,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: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 11fc8254548d241a972a5f1483609497d8d93ea2
Author: Pranam Lashkari 
AuthorDate: Mon Mar 20 20:36:45 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Tue Mar 21 17:03:16 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 
(cherry picked from commit 2e75e849e85da86ea33b447350b0e2f7eaede69e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149237
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index fdb587c8b1e1..a99417b50a27 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -59,6 +59,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"cui/ui/similaritysearchdialog.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: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 87210002a3ea9c785262166efbed59cdf44bb4a6
Author: Pranam Lashkari 
AuthorDate: Fri Mar 17 21:46:00 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Mar 20 13:03:26 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 
(cherry picked from commit fcc6e504ff968923f0b17d9e59be56dc5f342711)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149103
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index efb8362c414c..9a3699301de1 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -107,6 +107,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"
@@ -118,6 +119,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"
@@ -134,6 +137,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: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b12c6c938450dee5092378b543da8bd8e2f1227f
Author: Pranam Lashkari 
AuthorDate: Wed Mar 15 17:48:09 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Mar 17 16:17:00 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 
(cherry picked from commit 8665bd300f60a3934d9991a877097112edda325f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149015
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 2eb5a8e0c51b..efb8362c414c 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -52,6 +52,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: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 529c5494c256138c32996d8d95cf7ef542af7900
Author: Pranam Lashkari 
AuthorDate: Mon Mar 13 20:40:04 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Mar 17 10:45:07 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 
(cherry picked from commit ae69dc05d3de876dade4fa8a9b6f6f693cc7c865)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148973
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 2cb523fab28a..2eb5a8e0c51b 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -116,6 +116,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || 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"
 // sfx
 || rUIFile == u"sfx/ui/cmisinfopage.ui"
@@ -125,6 +126,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: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit ca12d483ba4c764cf5e9ba083c5376dba772547f
Author: Pranam Lashkari 
AuthorDate: Wed Mar 15 19:15:46 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Thu Mar 16 17:17:22 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 
(cherry picked from commit cd428e3e564b9bca0badb5e947f78a6fe3ea39ec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149014
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 7e4fc5fd7e78..2cb523fab28a 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -101,15 +101,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/translationdialog.ui"
 // sfx

[Libreoffice-commits] core.git: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit f973d0259de40e77709f487e87db5f29437d60db
Author: Pranam Lashkari 
AuthorDate: Tue Mar 7 18:09:46 2023 +0530
Commit: Szymon Kłos 
CommitDate: Fri Mar 10 09:13:15 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/+/148398
Tested-by: Jenkins
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: vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0ba5a856fc8c24d9612bd9a78e9a4f11365571e7
Author: Pranam Lashkari 
AuthorDate: Fri Mar 3 07:00:22 2023 +0530
Commit: Szymon Kłos 
CommitDate: Tue Mar 7 08:52:48 2023 +

jsdialog: enabled format Character dialog (calc)

can be found from:
Tabbed view > Format > Character
Compact view > Format > Character

Change-Id: I80c15237a29ef19303c71101965df9a18791cb4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148243
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index b76bd70597b0..70674c5523b1 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -53,6 +53,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"cui/ui/widgettestdialog.ui"
 // scalc
 || rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui"
+|| 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/correlationdialog.ui"

[Libreoffice-commits] core.git: vcl/jsdialog

[Hannah Meeks (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d6617bf6f6cebc68018f72ac38bb3dd7a43c766c
Author: Hannah Meeks 
AuthorDate: Fri Feb 10 22:15:36 2023 +
Commit: Szymon Kłos 
CommitDate: Tue Feb 21 08:34:15 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 

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"

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 887b2eb4583549d104c03747405e1f925ab6168a
Author: Szymon Kłos 
AuthorDate: Thu Feb 2 11:57:48 2023 +0100
Commit: Szymon Kłos 
CommitDate: Mon Feb 6 14:26:37 2023 +

jsdialog: weld all message boxes

This fixes regression from:
commit 9785cebe4cfdc296143757da6098a74b0252c618
jsdialog: fix validation error dialog in Calc

When inserting autofilter without header data
- message box should appear

Change-Id: Id5d26604a67f43700310cc0f51954b886c9de0f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146495
Reviewed-by: Henry Castro 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146575
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 69300b516698..f9fd939b38a8 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1182,8 +1182,7 @@ weld::MessageDialog* 
JSInstanceBuilder::CreateMessageDialog(weld::Widget* pParen
 else
 SAL_WARN("vcl", "No notifier in 
JSInstanceBuilder::CreateMessageDialog");
 
-// fallback
-return new SalInstanceMessageDialog(xMessageDialog, nullptr, true);
+return new JSMessageDialog(xMessageDialog, nullptr, true);
 }
 
 JSDialog::JSDialog(JSDialogSender* pSender, ::Dialog* pDialog, 
SalInstanceBuilder* pBuilder,

[Libreoffice-commits] core.git: vcl/jsdialog

[Gökay Şatır (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5f489f84935b4f92415998bb7ba2d9ccd550b82d
Author: Gökay Şatır 
AuthorDate: Fri Jan 20 12:06:47 2023 +0300
Commit: Andras Timar 
CommitDate: Sun Jan 29 08:58:02 2023 +

Add dropdownfielddialog.ui to JSON dialogues.

Signed-off-by: Gökay Şatır 
Change-Id: I4cfc792f0b1269936723285cc5ff1324bc22c161
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145871
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit 23e6f05a8ee80c33dd624dd6582f26b3dcf8f490)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146212
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 2dff20b7263d..e0791954d5f8 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -78,6 +78,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || 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"

[Libreoffice-commits] core.git: vcl/jsdialog

[Michael Meeks (via logerrit)]

 vcl/jsdialog/enabled.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 254e56c0c05015db1cbfd20c1e5a48703d3bd136
Author: Michael Meeks 
AuthorDate: Fri Nov 25 19:08:38 2022 +
Commit: Michael Meeks 
CommitDate: Fri Nov 25 22:15:13 2022 +0100

jsdialog: white-list calc group/un-group & row/col metric dialogs.

They're simple dialogs, and are testd.

Change-Id: I5a34314f57e058bc66a718c1e85ed52b265752e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143262
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 47d8e0e08df5..79960d687f14 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -52,6 +52,13 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"modules/scalc/ui/datafieldoptionsdialog.ui"
 || rUIFile == u"modules/scalc/ui/insertcells.ui"
 || rUIFile == u"modules/scalc/ui/deletecells.ui"
+|| rUIFile == u"modules/scalc/ui/deletecontents.ui"
+|| rUIFile == u"modules/scalc/ui/ungroupdialog.ui"
+|| rUIFile == u"modules/scalc/ui/groupdialog.ui"
+|| rUIFile == u"modules/scalc/ui/rowheightdialog.ui"
+|| rUIFile == u"modules/scalc/ui/optimalrowheightdialog.ui"
+|| rUIFile == u"modules/scalc/ui/colwidthdialog.ui"
+|| rUIFile == u"modules/scalc/ui/optimalcolwidthdialog.ui"
 || rUIFile == u"svx/ui/fontworkgallerydialog.ui"
 || rUIFile == u"svx/ui/findreplacedialog.ui" || rUIFile == 
u"svx/ui/findreplacedialog.ui"
 || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == 
u"uui/ui/macrowarnmedium.ui"

[Libreoffice-commits] core.git: vcl/jsdialog

[Mike Kaganski (via logerrit)]

 vcl/jsdialog/enabled.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2fc16dc84d0b1b1bd7978a30e1b79ff3100fefdf
Author: Mike Kaganski 
AuthorDate: Mon Jun 6 12:16:06 2022 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jul 28 07:37:14 2022 +0200

Enable Math sidebar panels for JSInstanceBuilder

Change-Id: I9c71dd3cad1e45d0a01ab187c652711c19fe3b89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135444
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 380fb2d3e9d2..6dbc32cdaf2f 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -139,7 +139,9 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile)
 || rUIFile == u"modules/swriter/ui/sidebarstylepresets.ui"
 || rUIFile == u"modules/swriter/ui/sidebartheme.ui"
 || rUIFile == u"modules/swriter/ui/sidebartableedit.ui"
-|| rUIFile == u"modules/simpress/ui/customanimationfragment.ui")
+|| rUIFile == u"modules/simpress/ui/customanimationfragment.ui"
+|| rUIFile == u"modules/smath/ui/sidebarelements_math.ui"
+|| rUIFile == u"modules/smath/ui/sidebarproperties_math.ui")
 return true;
 
 return false;

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 19807d4f31a1f58fe434dfe638e1f3c9a0d8e921
Author: Szymon Kłos 
AuthorDate: Thu Jul 14 16:51:28 2022 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jul 26 13:33:38 2022 +0200

jsdialog: handle grab_focus action

Change-Id: I20ec0ac75dfb6260cdd603f9dec7cd5001cb5650
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137085
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mert Tumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137456
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 0f8a2722bdac..a389e3ab0739 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -75,6 +75,12 @@ bool ExecuteAction(const std::string& nWindowId, const 
OString& rWidget, StringM
 
 if (pWidget != nullptr)
 {
+if (sAction == "grab_focus")
+{
+pWidget->grab_focus();
+return true;
+}
+
 if (sControlType == "tabcontrol")
 {
 auto pNotebook = dynamic_cast(pWidget);

[Libreoffice-commits] core.git: vcl/jsdialog

[Andrea Gelmini (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 84b096680fa7a4f15656ce5694796285034ae1e2
Author: Andrea Gelmini 
AuthorDate: Wed Jul 13 13:11:13 2022 +0200
Commit: Julien Nabet 
CommitDate: Thu Jul 21 16:11:00 2022 +0200

Removed duplicated include

Change-Id: I4c12d6f27957b344b2f04215ef4e76595bd5c21f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137020
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index bb8919b7241f..02436f16d360 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 
 static std::map& GetLOKPopupsMap()
 {

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 001d9a20ae3607e618a8fb0889ab2f2bcb612f4f
Author: Szymon Kłos 
AuthorDate: Thu Jun 9 17:41:15 2022 +0200
Commit: Szymon Kłos 
CommitDate: Wed Jun 29 12:42:52 2022 +0200

jsdialog: toggle toolbox buttons correctly

Change-Id: Ic02f9ceab29257ebc4cb6261aae10c4f1a7ef176
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135562
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
(cherry picked from commit b6b7b3a5a46790baf2266aaeb10976753dfe0fce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135539
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136605
Tested-by: Jenkins

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 4489949a91b5..24a5f9ba596d 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -314,8 +314,9 @@ bool ExecuteAction(const std::string& nWindowId, const 
OString& rWidget, StringM
 }
 else if (sAction == "togglemenu")
 {
-pToolbar->set_menu_item_active(
-OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US), true);
+OString sId = OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US);
+bool bIsActive = pToolbar->get_menu_item_active(sId);
+pToolbar->set_menu_item_active(sId, !bIsActive);
 return true;
 }
 }

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |   36 +++-
 1 file changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 61f5c991a97de8990badfed6ef840941b5aa8c7f
Author: Szymon Kłos 
AuthorDate: Wed Jun 1 14:52:33 2022 +0200
Commit: Szymon Kłos 
CommitDate: Wed Jun 29 07:27:52 2022 +0200

jsdialog: correctly parse click position for drawingarea

Change-Id: I8f0739cea8d2a3472926682f205bc5f5227bdc4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135241
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mert Tumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136593
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 58ec87cf0197..0145c91f8eee 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -175,27 +175,29 @@ bool ExecuteAction(const std::string& nWindowId, const 
OString& rWidget, StringM
 if (sAction == "click")
 {
 OUString sClickData = rData["data"];
-int separatorPos = sClickData.indexOf(';');
-if (separatorPos > 0)
+int nSeparatorPos = sClickData.indexOf(';');
+if (nSeparatorPos > 0)
 {
 // x;y
-std::u16string_view clickPosX = sClickData.subView(0, 
separatorPos);
-std::u16string_view clickPosY = 
sClickData.subView(separatorPos + 1);
-if (!clickPosX.empty() && !clickPosY.empty())
-{
-double posX = o3tl::toDouble(clickPosX);
-double posY = o3tl::toDouble(clickPosY);
-OutputDevice& rRefDevice = pArea->get_ref_device();
-// We send OutPutSize for the drawing area bitmap
-// get_size_request is not necessarily updated
-// therefore it may be incorrect.
-Size size = rRefDevice.GetOutputSize();
-posX = posX * size.Width();
-posY = posY * size.Height();
-LOKTrigger::trigger_click(*pArea, Point(posX, 
posY));
+std::u16string_view nClickPosX = sClickData.subView(0, 
nSeparatorPos);
+std::u16string_view nClickPosY = 
sClickData.subView(nSeparatorPos + 1);
+
+if (nClickPosX.empty() || nClickPosY.empty())
 return true;
-}
+
+double posX = o3tl::toDouble(nClickPosX);
+double posY = o3tl::toDouble(nClickPosY);
+OutputDevice& rRefDevice = pArea->get_ref_device();
+// We send OutPutSize for the drawing area bitmap
+// get_size_request is not necessarily updated
+// therefore it may be incorrect.
+Size size = rRefDevice.GetOutputSize();
+posX = posX * size.Width();
+posY = posY * size.Height();
+LOKTrigger::trigger_click(*pArea, Point(posX, posY));
+return true;
 }
+
 LOKTrigger::trigger_click(*pArea, Point(10, 10));
 return true;
 }

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit feb8e7c58dc72d01febc914fd6575757f3f7e746
Author: Szymon Kłos 
AuthorDate: Tue Mar 15 10:09:43 2022 +0100
Commit: Szymon Kłos 
CommitDate: Thu Mar 17 20:08:08 2022 +0100

jsdialog: enable dialog on demand by env var

It will be possible to enable some dialogs by environment variable:


SAL_JSDIALOG_ENABLE=modules/scalc/ui/validationdialog.ui:modules/scalc/ui/validationcriteriapage.ui

(you can specify multiple items with ':' separator)

Change-Id: Iba1e6b7ac77716f40c9073a8064206c420f2d081
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131597
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 31b18a3ae347..100741447b6e 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -7,7 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
 #include 
+#include 
 
 namespace jsdialog
 {
@@ -60,6 +62,19 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 return true;
 }
 
+const char* pEnabledDialog = getenv("SAL_JSDIALOG_ENABLE");
+if (pEnabledDialog)
+{
+OUString sAllEnabledDialogs(pEnabledDialog, strlen(pEnabledDialog), 
RTL_TEXTENCODING_UTF8);
+std::vector aEnabledDialogsVector
+= comphelper::string::split(sAllEnabledDialogs, ':');
+for (const auto& rDialog : aEnabledDialogsVector)
+{
+if (rUIFile == rDialog)
+return true;
+}
+}
+
 return false;
 }
 

[Libreoffice-commits] core.git: vcl/jsdialog

[Caolán McNamara (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1c722a1fc02a76c9e503d36d66598aa5ca4dc2e1
Author: Caolán McNamara 
AuthorDate: Sun Mar 6 12:40:20 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Mar 6 15:23:02 2022 +0100

cid#1502882 silence Unchecked dynamic_cast

Change-Id: I30c2edd4df8175b9c5bbda91f6046d631193245d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131073
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 0a49f20a9b82..7854e81360fe 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -718,6 +718,7 @@ void JSInstanceBuilder::RememberWidget(OString sId, 
weld::Widget* pWidget)
 // found duplicated it -> add some number to the id and apply 
to the widget
 sId = sId + OString::number(nIndex);
 SalInstanceWidget* pSalWidget = 
dynamic_cast(pWidget);
+assert(pSalWidget && "can only be a SalInstanceWidget");
 vcl::Window* pVclWidget = pSalWidget->getWidget();
 pVclWidget->set_id(pVclWidget->get_id() + 
OUString::number(nIndex));
 }

[Libreoffice-commits] core.git: vcl/jsdialog xmlsecurity/inc xmlsecurity/source

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |3 ++-
 xmlsecurity/inc/certificateviewer.hxx|2 ++
 xmlsecurity/source/dialogs/certificateviewer.cxx |   13 +++--
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 98d2c965aca67f59a27c0a9a7a3bc6e4fdb90950
Author: Szymon Kłos 
AuthorDate: Mon Oct 25 12:03:26 2021 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jan 24 13:46:42 2022 +0100

Make View Certificate sub-dialog async

Change-Id: I0e1a6a59d856ab266511fc3d6be87fe04c5afdfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124143
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128840
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index dc5857afda61..e51b44493527 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -52,7 +52,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == 
u"uui/ui/macrowarnmedium.ui"
 || rUIFile == u"modules/scalc/ui/textimportcsv.ui"
 || rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
-|| rUIFile == u"xmlsec/ui/viewcertdialog.ui")
+|| rUIFile == u"xmlsec/ui/viewcertdialog.ui" || rUIFile == 
u"xmlsec/ui/certgeneral.ui"
+|| rUIFile == u"xmlsec/ui/certpage.ui")
 {
 return true;
 }
diff --git a/xmlsecurity/inc/certificateviewer.hxx 
b/xmlsecurity/inc/certificateviewer.hxx
index 1d0ec5f72e2d..ea47c41029a8 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -134,6 +134,7 @@ private:
 boolmbFirstActivateDone;
 
 std::vector> maUserData;
+std::shared_ptr mxCertificateViewer;
 
 std::unique_ptr mxCertPathLB;
 std::unique_ptr mxScratchIter;
@@ -150,6 +151,7 @@ private:
 
 public:
 CertificateViewerCertPathTP(weld::Container* pParent, CertificateViewer* 
pDlg);
+~CertificateViewerCertPathTP();
 void ActivatePage();
 };
 
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx 
b/xmlsecurity/source/dialogs/certificateviewer.cxx
index c252024ed954..3e0480b9317b 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -271,6 +271,12 @@ 
CertificateViewerCertPathTP::CertificateViewerCertPathTP(weld::Container* pParen
 mxViewCertPB->connect_clicked( LINK( this, CertificateViewerCertPathTP, 
ViewCertHdl ) );
 }
 
+CertificateViewerCertPathTP::~CertificateViewerCertPathTP()
+{
+if (mxCertificateViewer)
+mxCertificateViewer->response(RET_OK);
+}
+
 void CertificateViewerCertPathTP::ActivatePage()
 {
 if ( mbFirstActivateDone )
@@ -322,10 +328,13 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl, 
weld::Button&, void)
 std::unique_ptr xIter = mxCertPathLB->make_iterator();
 if (mxCertPathLB->get_selected(xIter.get()))
 {
+if (mxCertificateViewer)
+mxCertificateViewer->response(RET_OK);
+
 CertPath_UserData* pData = 
reinterpret_cast(mxCertPathLB->get_id(*xIter).toInt64());
-CertificateViewer aViewer(mpDlg->getDialog(), 
mpDlg->mxSecurityEnvironment,
+mxCertificateViewer = 
std::make_shared(mpDlg->getDialog(), 
mpDlg->mxSecurityEnvironment,
 pData->mxCert, false, nullptr);
-aViewer.run();
+weld::DialogController::runAsync(mxCertificateViewer, [this] 
(sal_Int32) { mxCertificateViewer = nullptr; });
 }
 }
 

[Libreoffice-commits] core.git: vcl/jsdialog xmlsecurity/inc xmlsecurity/source

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx   |3 ++-
 xmlsecurity/inc/digitalsignaturesdialog.hxx|3 +++
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |9 +++--
 3 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit c13ec26f6a20bc9a0e3e4fd8f03d8f4e1d46c7d1
Author: Szymon Kłos 
AuthorDate: Fri Oct 22 13:08:46 2021 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jan 24 09:44:19 2022 +0100

Make View Certificate dialog async

Change-Id: Id93145ecf6be3cb558f0ce8d3cc340bbc67095e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124061
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128839
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index e60e31db382c..dc5857afda61 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -51,7 +51,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"svx/ui/fontworkgallerydialog.ui"
 || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == 
u"uui/ui/macrowarnmedium.ui"
 || rUIFile == u"modules/scalc/ui/textimportcsv.ui"
-|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui")
+|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
+|| rUIFile == u"xmlsec/ui/viewcertdialog.ui")
 {
 return true;
 }
diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx 
b/xmlsecurity/inc/digitalsignaturesdialog.hxx
index f8a59adaf9b5..f8ace3d976a6 100644
--- a/xmlsecurity/inc/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -37,6 +37,7 @@ namespace com::sun::star {
 
 
 class HeaderBar;
+class CertificateViewer;
 
 class DigitalSignaturesDialog final : public weld::GenericDialogController
 {
@@ -72,6 +73,8 @@ private:
 std::unique_ptr  m_xStartCertMgrBtn;
 std::unique_ptr  m_xCloseBtn;
 
+std::shared_ptr m_xViewer;
+
 DECL_LINK(AdESCompliantCheckBoxHdl, weld::Toggleable&, void);
 DECL_LINK(ViewButtonHdl, weld::Button&, void);
 DECL_LINK(AddButtonHdl, weld::Button&, void);
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 621ea4170649..fc7cf6b2a534 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -204,6 +204,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
 
 DigitalSignaturesDialog::~DigitalSignaturesDialog()
 {
+if (m_xViewer)
+m_xViewer->response(RET_OK);
 }
 
 bool DigitalSignaturesDialog::Init()
@@ -774,9 +776,12 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
 
 if ( xCert.is() )
 {
+if (m_xViewer)
+m_xViewer->response(RET_OK);
+
 uno::Reference xSecEnv = 
getSecurityEnvironmentForCertificate(xCert);
-CertificateViewer aViewer(m_xDialog.get(), xSecEnv, xCert, false, 
nullptr);
-aViewer.run();
+m_xViewer = std::make_shared(m_xDialog.get(), 
xSecEnv, xCert, false, nullptr);
+weld::DialogController::runAsync(m_xViewer, [this] (sal_Int32) { 
m_xViewer = nullptr; });
 }
 else
 {

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit fc4b25b3dad62f9e25462e43177ad8d081f855b2
Author: Szymon Kłos 
AuthorDate: Mon Oct 25 15:02:30 2021 +0200
Commit: Szymon Kłos 
CommitDate: Wed Dec 29 13:22:31 2021 +0100

jsdialog: activate tabpage after switch

Change-Id: Ib9f61f9e219f1775bdb2304cc7ce9fc8a1ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124150
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127675
Tested-by: Jenkins

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 9792ce9dd1aa..8036f3d004e5 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1236,6 +1236,8 @@ void JSNotebook::set_current_page(int nPage)
 
 SalInstanceNotebook::set_current_page(nPage);
 sendFullUpdate(bForce);
+
+m_aEnterPageHdl.Call(get_current_page_ident());
 }
 
 void JSNotebook::set_current_page(const OString& rIdent)
@@ -1247,6 +1249,8 @@ void JSNotebook::set_current_page(const OString& rIdent)
 
 SalInstanceNotebook::set_current_page(rIdent);
 sendFullUpdate(bForce);
+
+m_aEnterPageHdl.Call(get_current_page_ident());
 }
 
 void JSNotebook::remove_page(const OString& rIdent)

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d99c7586edf41e1b22f1ef363859a86bf397e35f
Author: Szymon Kłos 
AuthorDate: Thu Sep 23 16:33:27 2021 +0200
Commit: Szymon Kłos 
CommitDate: Wed Oct 6 11:09:40 2021 +0200

jsdialog: send full update for autofilter

Change-Id: I64baa5fea03f96350fe4db86ea0e42e02d41e8be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122531
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123105
Tested-by: Jenkins

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index b38753fb1815..164aa3a4fb0d 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -599,6 +599,7 @@ JSInstanceBuilder::JSInstanceBuilder(vcl::Window* pParent, 
const OUString& rUIRo
 }
 
 initializeSender(GetNotifierWindow(), GetContentWindow(), GetTypeOfJSON());
+sendFullUpdate();
 }
 
 JSInstanceBuilder* JSInstanceBuilder::CreateDialogBuilder(weld::Widget* 
pParent,

[Libreoffice-commits] core.git: vcl/jsdialog

[Julien Nabet (via logerrit)]

 vcl/jsdialog/enabled.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit da4c16ec008d0b21817be46396a5e5b3b509c637
Author: Julien Nabet 
AuthorDate: Sat Sep 4 19:23:56 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Sep 4 21:55:43 2021 +0200

duplicate modules/scalc/ui/ttestdialog.ui test in vcl/jsdialog/enabled.cxx

Change-Id: Ic8e7ebb59cace56fdd8202b7d1c7eec7f62368a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121639
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index b32f9a01d672..6aa323ed38df 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -42,7 +42,6 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"modules/scalc/ui/movingaveragedialog.ui"
 || rUIFile == u"modules/scalc/ui/regressiondialog.ui"
 || rUIFile == u"modules/scalc/ui/ttestdialog.ui"
-|| rUIFile == u"modules/scalc/ui/ttestdialog.ui"
 || rUIFile == u"modules/scalc/ui/ztestdialog.ui"
 || rUIFile == u"modules/scalc/ui/chisquaretestdialog.ui"
 || rUIFile == u"modules/scalc/ui/fourieranalysisdialog.ui"

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f5d3cfbc0b9bc34cc3297b8a1c179e4c158271b7
Author: Szymon Kłos 
AuthorDate: Wed Jul 7 11:13:06 2021 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 17 17:13:55 2021 +0200

jsdialog: don't send unnecessary close message

Change-Id: I4077c0871c7e6faf4917ad22a1a3aae8eb972961
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118549
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120569
Tested-by: Jenkins

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 03087e4fd82a..a376faed407d 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1352,6 +1352,7 @@ JSToolbar::JSToolbar(JSDialogSender* pSender, ::ToolBox* 
pToolbox, SalInstanceBu
 
 void JSToolbar::set_menu_item_active(const OString& rIdent, bool bActive)
 {
+bool bWasActive = get_menu_item_active(rIdent);
 SalInstanceToolbar::set_menu_item_active(rIdent, bActive);
 
 ToolBoxItemId nItemId = m_xToolBox->GetItemId(OUString::fromUtf8(rIdent));
@@ -1370,7 +1371,7 @@ void JSToolbar::set_menu_item_active(const OString& 
rIdent, bool bActive)
 if (bActive)
 sendPopup(pPopupRoot, m_xToolBox->get_id(),
   OStringToOUString(rIdent, 
RTL_TEXTENCODING_ASCII_US));
-else
+else if (bWasActive)
 sendClosePopup(pPopupRoot->GetLOKWindowId());
 }
 }

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 962b6307da5d1248481bf9efa534a7bbd37f3a41
Author: Szymon Kłos 
AuthorDate: Tue Jun 29 12:34:18 2021 +0200
Commit: Szymon Kłos 
CommitDate: Thu Jul 29 14:38:03 2021 +0200

jsdialog: use original container type for popups

Change-Id: I6cffa33d7bfbc9087b8fff08b993c2a87b8811c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118080
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119659
Tested-by: Jenkins

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index e250dcfe875e..db1e08173996 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -226,7 +226,13 @@ 
JSDialogNotifyIdle::generatePopupMessage(VclPtr pWindow, OUString s
 if (!pWindow->GetParentWithLOKNotifier())
 return aJsonWriter;
 
-pWindow->DumpAsPropertyTree(*aJsonWriter);
+{
+auto aChildren = aJsonWriter->startArray("children");
+{
+auto aStruct = aJsonWriter->startStruct();
+pWindow->DumpAsPropertyTree(*aJsonWriter);
+}
+}
 
 aJsonWriter->put("jsontype", "dialog");
 aJsonWriter->put("type", "modalpopup");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/enabled.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b206dda731e7c4390d6c9fe9c66feb8e903d3786
Author: Szymon Kłos 
AuthorDate: Mon Jun 28 11:54:56 2021 +0200
Commit: Szymon Kłos 
CommitDate: Thu Jul 29 12:25:01 2021 +0200

jsdialog: enable line end style popup

Change-Id: I6c9bc4bf651ba130ec87348ac0e12cbe0265b3e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118006
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119653
Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 90ffcdc8dd5d..81cc808ceb7c 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -67,8 +67,8 @@ bool isBuilderEnabledForPopup(std::u16string_view rUIFile)
 || rUIFile == u"modules/scalc/ui/floatingborderstyle.ui"
 || rUIFile == u"svx/ui/textunderlinecontrol.ui" || rUIFile == 
u"svx/ui/numberingwindow.ui"
 || rUIFile == u"svx/ui/paralinespacingcontrol.ui"
-|| rUIFile == u"svx/ui/floatinglineproperty.ui"
-|| rUIFile == u"svx/ui/floatinglinestyle.ui")
+|| rUIFile == u"svx/ui/floatinglineproperty.ui" || rUIFile == 
u"svx/ui/floatinglinestyle.ui"
+|| rUIFile == u"svx/ui/floatinglineend.ui")
 return true;
 
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[merttumer (via logerrit)]

 vcl/jsdialog/executor.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c18d2b46a37893acb7922c5dc49ddc4631a2c05d
Author: merttumer 
AuthorDate: Mon Jun 7 20:16:50 2021 +0300
Commit: Mert Tumer 
CommitDate: Tue Jul 6 11:26:37 2021 +0200

Fix click on the drawing area of CSV dialog

Change-Id: I8c13698b5e9e2e9c8869aa9094ce93c38bf2276f
Signed-off-by: merttumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116796
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117968
Tested-by: Jenkins

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 39d39601c02f..13cc7591d587 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -153,7 +153,11 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 {
 double posX = std::atof(clickPosX.data());
 double posY = std::atof(clickPosY.data());
-Size size = pArea->get_size_request();
+OutputDevice& rRefDevice = pArea->get_ref_device();
+// We send OutPutSize for the drawing area bitmap
+// get_size_request is not necessarily updated
+// therefore it may be incorrect.
+Size size = rRefDevice.GetOutputSize();
 posX = posX * size.Width();
 posY = posY * size.Height();
 LOKTrigger::trigger_click(*pArea, Point(posX, 
posY));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Mert Tumer (via logerrit)]

 vcl/jsdialog/executor.cxx |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit 2779e669fd54695ace5a9425280d1efca93729b6
Author: Mert Tumer 
AuthorDate: Wed Dec 16 23:01:25 2020 +0300
Commit: Mert Tumer 
CommitDate: Tue Jul 6 09:02:18 2021 +0200

jsdialogs: send click pos for drawingarea

Change-Id: I91aae808fe17f47fe9fa75dca069e4919c2ce4c3
Signed-off-by: Mert Tumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108685
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109216
Tested-by: Jenkins

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index c8659b22158e..39d39601c02f 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -141,6 +141,25 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 {
 if (sAction == "click")
 {
+int separatorPos = rData["data"].indexOf(';');
+if (separatorPos > 0)
+{
+// x;y
+std::string_view clickPosX = OUStringToOString(
+rData["data"].subView(0, separatorPos), 
RTL_TEXTENCODING_ASCII_US);
+std::string_view clickPosY = OUStringToOString(
+rData["data"].subView(separatorPos + 1), 
RTL_TEXTENCODING_ASCII_US);
+if (!clickPosX.empty() && !clickPosY.empty())
+{
+double posX = std::atof(clickPosX.data());
+double posY = std::atof(clickPosY.data());
+Size size = pArea->get_size_request();
+posX = posX * size.Width();
+posY = posY * size.Height();
+LOKTrigger::trigger_click(*pArea, Point(posX, 
posY));
+return true;
+}
+}
 LOKTrigger::trigger_click(*pArea, Point(10, 10));
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |   22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 8ff946045138fde19c0656129da611729aa98cb1
Author: Szymon Kłos 
AuthorDate: Wed Apr 21 10:31:07 2021 +0200
Commit: Szymon Kłos 
CommitDate: Tue Apr 27 16:06:01 2021 +0200

jsdialog: handle response buttons

Change-Id: I4e8efc4ef2d27e655208ff505167da8360f91a6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114379
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mert Tumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114597
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 0e3fdc358eaa..72faac5c639c 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -45,11 +45,27 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 {
 weld::Widget* pWidget = JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, 
rWidget);
 
-if (pWidget != nullptr)
+OUString sControlType = rData["type"];
+OUString sAction = rData["cmd"];
+
+if (sControlType == "responsebutton")
 {
-OUString sControlType = rData["type"];
-OUString sAction = rData["cmd"];
+if (pWidget == nullptr)
+{
+// welded wrapper not found - use response code instead
+pWidget = JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, 
"__DIALOG__");
+sControlType = "dialog";
+sAction = "response";
+}
+else
+{
+// welded wrapper for button found - use it
+sControlType = "pushbutton";
+}
+}
 
+if (pWidget != nullptr)
+{
 if (sControlType == "tabcontrol")
 {
 auto pNotebook = dynamic_cast(pWidget);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit d4437f5071422b8f64f18c4be3b1a0208ee49da3
Author: Szymon Kłos 
AuthorDate: Mon Mar 15 16:23:48 2021 +0100
Commit: Szymon Kłos 
CommitDate: Wed Apr 7 12:31:00 2021 +0200

jsdialog: simplify unselect for treeview

Change-Id: Iaadd8122d735103d89e4acb65bef1ca8c1ad2e1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112532
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113679
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 7462f6aa3095..0e3fdc358eaa 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -221,9 +221,7 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 OString nRowString
 = OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US);
 
-std::unique_ptr 
itSelected(pTreeView->make_iterator());
-pTreeView->get_selected(itSelected.get());
-pTreeView->unselect(*itSelected);
+pTreeView->unselect_all();
 
 int nAbsPos = std::atoi(nRowString.getStr());
 
@@ -240,7 +238,7 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 = OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US);
 int nRow = std::atoi(nRowString.getStr());
 
-pTreeView->unselect(pTreeView->get_selected_index());
+pTreeView->unselect_all();
 pTreeView->select(nRow);
 pTreeView->set_cursor(nRow);
 LOKTrigger::trigger_changed(*pTreeView);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c5153e90784af25890487dd00bcd1f8ac28cc346
Author: Szymon Kłos 
AuthorDate: Fri Mar 12 09:35:30 2021 +0100
Commit: Szymon Kłos 
CommitDate: Wed Apr 7 09:03:59 2021 +0200

jsdialog: unselect treeview entry by iterator

avoid crash when using relative position from
deeper levels returned by get_selected_index
to unselect entry using unselect function
on root level

Change-Id: Iaaddb131031eb5273cb06412c976f310f7323f52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112374
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113678
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index de055a9c1700..7462f6aa3095 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -220,7 +220,10 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 {
 OString nRowString
 = OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US);
-pTreeView->unselect(pTreeView->get_selected_index());
+
+std::unique_ptr 
itSelected(pTreeView->make_iterator());
+pTreeView->get_selected(itSelected.get());
+pTreeView->unselect(*itSelected);
 
 int nAbsPos = std::atoi(nRowString.getStr());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Henry Castro (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6af317bb64bdfa8a36dd4b3734dd882e853f748a
Author: Henry Castro 
AuthorDate: Mon Feb 22 15:16:06 2021 -0400
Commit: Henry Castro 
CommitDate: Tue Apr 6 19:52:50 2021 +0200

jsdialog: fix missing update for "treeview" action "select"

When Treeview control selects an item, the state of the control
has changed and it should update the new changes to the client side.

Change-Id: I27d6a215148fcef260799d76ffe209460f38c559
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111355
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113683
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index c2c1ee2f0078..8414f3f9e262 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1121,6 +1121,7 @@ void JSTreeView::select(int pos)
 }
 }
 enable_notify_events();
+sendUpdate();
 }
 
 weld::TreeView* JSTreeView::get_drag_source() const { return g_DragSource; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Henry Castro (via logerrit)]

 vcl/jsdialog/executor.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit a7f1439ca765384b8352a054ea2da28ef68c02ff
Author: Henry Castro 
AuthorDate: Mon Feb 15 19:43:17 2021 -0400
Commit: Henry Castro 
CommitDate: Tue Apr 6 19:37:22 2021 +0200

lok: fix treeview action "select"

Unfortunately the Macros dialog has a treeview control
that fill on demand and the position is absolute and
it has a side effect to deselect the item since the relative
entry position is nullptr.

Change-Id: Ie442f6d634437a293cde65da0764d3f433a70155
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110963
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113677
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 3644dc1bcf9b..de055a9c1700 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -220,11 +220,14 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 {
 OString nRowString
 = OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US);
-int nRow = std::atoi(nRowString.getStr());
-
 pTreeView->unselect(pTreeView->get_selected_index());
-pTreeView->select(nRow);
-pTreeView->set_cursor(nRow);
+
+int nAbsPos = std::atoi(nRowString.getStr());
+
+std::unique_ptr 
itEntry(pTreeView->make_iterator());
+pTreeView->get_iter_abs_pos(*itEntry, nAbsPos);
+pTreeView->select(*itEntry);
+pTreeView->set_cursor(*itEntry);
 LOKTrigger::trigger_changed(*pTreeView);
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit eaa06413554be4ef4c73686c185c3d49e9defba4
Author: Szymon Kłos 
AuthorDate: Mon Mar 8 07:43:55 2021 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 8 09:00:21 2021 +0100

jsdialog: fix free JsonWriter assertion

Change-Id: I4bf1606d4f14fbaf9b63d5b06ff115a0f4d7eb21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112150
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 5c379952a634..c2c1ee2f0078 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -83,6 +83,10 @@ void JSDialogNotifyIdle::send(tools::JsonWriter& aJsonWriter)
 free(aJsonWriter.extractData());
 }
 }
+else
+{
+free(aJsonWriter.extractData());
+}
 }
 
 namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Caolán McNamara (via logerrit)]

 vcl/jsdialog/executor.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 38ed6b173ce3cc11b3b4f99344e75edaf6ab735d
Author: Caolán McNamara 
AuthorDate: Wed Feb 10 09:51:55 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 10 15:45:29 2021 +0100

cid#1472858 Unchecked dynamic_cast

Change-Id: I3103719f6184efb7b9ecfb6d589d6757449814cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110693
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 53f70630fe1c..8c76e77d8b37 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -37,12 +37,8 @@ StringMap jsonToStringMap(const char* pJSON)
 void SendFullUpdate(sal_uInt64 nWindowId, const OString& rWidget)
 {
 weld::Widget* pWidget = JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, 
rWidget);
-
-if (pWidget != nullptr)
-{
-auto pJSWidget = dynamic_cast(pWidget);
+if (auto pJSWidget = dynamic_cast(pWidget))
 pJSWidget->sendFullUpdate();
-}
 }
 
 bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& 
rData)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 12a78b0c6c3db1df823d90e0359d84a549f2e894
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 14:08:35 2021 +0100
Commit: Szymon Kłos 
CommitDate: Fri Jan 22 08:50:58 2021 +0100

jsdialog: enqueue update on dialog weld

Change-Id: I01f14cdf0aa3ea16cd311aed9abe14423e2ec846
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109727
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 836c73f3edea..658ee5ae18d6 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -484,16 +484,8 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 
 RememberWidget("__DIALOG__", pRet.get());
 
-const vcl::ILibreOfficeKitNotifier* pNotifier = 
pDialog->GetLOKNotifier();
-if (pNotifier)
-{
-tools::JsonWriter aJsonWriter;
-m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);
-aJsonWriter.put("id", m_aOwnedToplevel->GetLOKWindowId());
-pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
aJsonWriter.extractData());
-}
-
 initializeSender(GetNotifierWindow(), GetContentWindow(), 
GetTypeOfJSON());
+sendFullUpdate();
 }
 
 return pRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit e64784c4e8775d0c831ad71c70e73854a4b9aaa4
Author: Szymon Kłos 
AuthorDate: Wed Jan 20 17:48:18 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 21 07:53:42 2021 +0100

jsdialog: don't send multiple updates with the same content

Change-Id: I601511a85386a8a35cbc6a121a4719928f585794
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109726
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index e8c8ff4d4232..836c73f3edea 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -68,6 +68,18 @@ void JSDialogNotifyIdle::send(tools::JsonWriter& aJsonWriter)
 
 void JSDialogNotifyIdle::sendMessage(jsdialog::MessageType eType, 
VclPtr pWindow)
 {
+// we want only the latest update of same type
+// TODO: also if we met full update - previous updates are not valid
+auto it = m_aMessageQueue.begin();
+
+while (it != m_aMessageQueue.end())
+{
+if (it->first == eType && it->second == pWindow)
+it = m_aMessageQueue.erase(it);
+else
+it++;
+}
+
 m_aMessageQueue.push_back(std::make_pair(eType, pWindow));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Stephan Bergmann (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5f6b7aac3b9561ec5f31b6294f43dcd24e8da1c9
Author: Stephan Bergmann 
AuthorDate: Wed Jan 20 16:42:21 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 20 16:44:42 2021 +0100

Revert "jsdialog: enqueue update on dialog weld"

This reverts commit ab85732e1c6a1b52cf95fd9fb50b9ccb7cac2137.
 had built green on 
Jenkins
against parent Gerrit commit  "jsdialog: send updates 
also for
source treeview on drag", which introduced JSDialogSender::sendFullUpdate, 
but
which has apparently never been submitted to master.  Thus, this commit on
master now started to fail with

> 
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/vcl/jsdialog/jsdialogbuilder.cxx:
 In member function ‘virtual std::unique_ptr 
JSInstanceBuilder::weld_dialog(const rtl::OString&)’:
> 
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/vcl/jsdialog/jsdialogbuilder.cxx:476:9:
 error: ‘sendFullUpdate’ was not declared in this scope
>  sendFullUpdate();
>  ^~

().

Change-Id: I98e58ea50fb7524123e25fccb3da571a2ec9783c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109685
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index ecd0f3d1b36d..38ef2a44e354 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -472,8 +472,16 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 
 RememberWidget("__DIALOG__", pRet.get());
 
+const vcl::ILibreOfficeKitNotifier* pNotifier = 
pDialog->GetLOKNotifier();
+if (pNotifier)
+{
+tools::JsonWriter aJsonWriter;
+m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);
+aJsonWriter.put("id", m_aOwnedToplevel->GetLOKWindowId());
+pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
aJsonWriter.extractData());
+}
+
 initializeSender(GetNotifierWindow(), GetContentWindow(), 
GetTypeOfJSON());
-sendFullUpdate();
 }
 
 return pRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit ab85732e1c6a1b52cf95fd9fb50b9ccb7cac2137
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 14:08:35 2021 +0100
Commit: Szymon Kłos 
CommitDate: Wed Jan 20 15:38:58 2021 +0100

jsdialog: enqueue update on dialog weld

Change-Id: Id1fa7e69f2381df6c30598e28514132a20fac391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109636
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 38ef2a44e354..ecd0f3d1b36d 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -472,16 +472,8 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 
 RememberWidget("__DIALOG__", pRet.get());
 
-const vcl::ILibreOfficeKitNotifier* pNotifier = 
pDialog->GetLOKNotifier();
-if (pNotifier)
-{
-tools::JsonWriter aJsonWriter;
-m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);
-aJsonWriter.put("id", m_aOwnedToplevel->GetLOKWindowId());
-pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
aJsonWriter.extractData());
-}
-
 initializeSender(GetNotifierWindow(), GetContentWindow(), 
GetTypeOfJSON());
+sendFullUpdate();
 }
 
 return pRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 72f1cbe59a90921ef74bfda5ffb7f4db6578a1af
Author: Szymon Kłos 
AuthorDate: Wed Jan 13 09:13:29 2021 +0100
Commit: Szymon Kłos 
CommitDate: Fri Jan 15 08:40:01 2021 +0100

jsdialog: TreeView row activation

Change-Id: I3d2884d456f8b6fa01d2dbe6c4d2f7d9e9528e1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109261
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index dc05c0f75f01..f2d4d61ecf61 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -219,7 +219,19 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 pTreeView->select(nRow);
 pTreeView->set_cursor(nRow);
 LOKTrigger::trigger_changed(*pTreeView);
-//LOKTrigger::trigger_row_activated(*pTreeView);
+return true;
+}
+else if (sAction == "activate")
+{
+OString nRowString
+= OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US);
+int nRow = std::atoi(nRowString.getStr());
+
+pTreeView->unselect(pTreeView->get_selected_index());
+pTreeView->select(nRow);
+pTreeView->set_cursor(nRow);
+LOKTrigger::trigger_changed(*pTreeView);
+LOKTrigger::trigger_row_activated(*pTreeView);
 return true;
 }
 else if (sAction == "expand")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit f55266b456b1534bdbc9c3ce6d04d2b65f152a6e
Author: Szymon Kłos 
AuthorDate: Tue Dec 29 09:36:50 2020 +0100
Commit: Szymon Kłos 
CommitDate: Sun Jan 10 19:19:16 2021 +0100

jsdialog: updates in similar fashion like other messages

to unify all jsdialog interactions

Change-Id: I22e14282f5a2c52ef44e68cb3933864c4e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108435
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 3352bac904d1..f33d0be85fd5 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -102,6 +102,7 @@ void JSDialogNotifyIdle::updateStatus(VclPtr 
pWindow)
 if (!m_aNotifierWindow)
 return;
 
+// will be deprecated soon
 if (m_aNotifierWindow->IsReallyVisible())
 {
 if (const vcl::ILibreOfficeKitNotifier* pNotifier = 
m_aNotifierWindow->GetLOKNotifier())
@@ -124,6 +125,21 @@ void JSDialogNotifyIdle::updateStatus(VclPtr 
pWindow)
   aJsonWriter.extractData());
 }
 }
+
+// new approach - update also if hidden
+if (const vcl::ILibreOfficeKitNotifier* pNotifier = 
m_aNotifierWindow->GetLOKNotifier())
+{
+tools::JsonWriter aJsonWriter;
+
+aJsonWriter.put("jsontype", m_sTypeOfJSON);
+aJsonWriter.put("action", "update");
+aJsonWriter.put("id", m_aNotifierWindow->GetLOKWindowId());
+{
+auto aEntries = aJsonWriter.startNode("control");
+pWindow->DumpAsPropertyTree(aJsonWriter);
+}
+pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
aJsonWriter.extractData());
+}
 }
 
 std::unique_ptr JSDialogNotifyIdle::generateCloseMessage() 
const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Henry Castro (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 12d309940cd1aa26fb07c9dce2778e5811276190
Author: Henry Castro 
AuthorDate: Fri Jan 8 16:47:47 2021 -0400
Commit: Caolán McNamara 
CommitDate: Sat Jan 9 20:20:53 2021 +0100

lok: fix initialization variable

It should initialize false

Change-Id: I67249bc8040688ee82bf12532178eb133f80b8e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109021
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index c3e783452452..3352bac904d1 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -699,11 +699,11 @@ JSDialog::JSDialog(VclPtr aNotifierWindow, 
VclPtr aCon
std::string sTypeOfJSON)
 : JSWidget(aNotifierWindow, aContentWindow, 
pDialog, pBuilder,
 bTakeOwnership, sTypeOfJSON)
+, m_bNotifyCreated(false)
 {
 if (aNotifierWindow && aNotifierWindow->IsDisableIdleNotify())
 {
 pDialog->AddEventListener(LINK(this, JSDialog, on_window_event));
-m_bNotifyCreated = false;
 }
 }
 
@@ -892,11 +892,11 @@ JSMessageDialog::JSMessageDialog(::MessageDialog* 
pDialog, VclPtr a
  SalInstanceBuilder* pBuilder, bool 
bTakeOwnership)
 : SalInstanceMessageDialog(pDialog, pBuilder, bTakeOwnership)
 , JSDialogSender(m_xMessageDialog, aContentWindow, "dialog")
+, m_bNotifyCreated(false)
 {
 if (aContentWindow && aContentWindow->IsDisableIdleNotify())
 {
 pDialog->AddEventListener(LINK(this, JSMessageDialog, 
on_window_event));
-m_bNotifyCreated = false;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Caolán McNamara (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0c20b68149797c8b0779534a8e0cb9045085d451
Author: Caolán McNamara 
AuthorDate: Fri Jan 8 20:28:42 2021 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 9 13:00:29 2021 +0100

cid#1470783 Logically dead code

Change-Id: I0bf96d28904b84bb970c53d0cb732dc45aa2deb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109020
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 19f8780d2740..c3e783452452 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -448,9 +448,8 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 if (id == "MacroSelectorDialog")
 pDialog->SetDisableIdleNotify(true);
 
-pRet.reset(pDialog ? new JSDialog(m_aOwnedToplevel, m_aOwnedToplevel, 
pDialog, this, false,
-  m_sTypeOfJSON)
-   : nullptr);
+pRet.reset(
+new JSDialog(m_aOwnedToplevel, m_aOwnedToplevel, pDialog, this, 
false, m_sTypeOfJSON));
 
 RememberWidget("__DIALOG__", pRet.get());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Henry Castro (via logerrit)]

 vcl/jsdialog/executor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a8c379642358f66a6e921e8da746d845ebcd7f6
Author: Henry Castro 
AuthorDate: Fri Dec 18 08:05:12 2020 -0400
Commit: Henry Castro 
CommitDate: Mon Dec 28 13:25:17 2020 +0100

jsdialog: disable row activated on "select" action

Unfortunately, when the "Macro Selector Dialog" is shown
and issue the "select" action, it closes the dialog
because the row activated trigger double click the macro
selected.

for moment comment the unexpected side effect

Change-Id: Ibdfa09c444ee79376a9e2251e919f5f06dba577d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107964
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 775879c54f69..933149efde05 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -208,7 +208,7 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 pTreeView->select(nRow);
 pTreeView->set_cursor(nRow);
 LOKTrigger::trigger_changed(*pTreeView);
-LOKTrigger::trigger_row_activated(*pTreeView);
+//LOKTrigger::trigger_row_activated(*pTreeView);
 return true;
 }
 else if (sAction == "expand")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Henry Castro (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 107a9cf3560d712f8975af112f85ddaffe802647
Author: Henry Castro 
AuthorDate: Tue Dec 22 16:40:20 2020 -0400
Commit: Henry Castro 
CommitDate: Wed Dec 23 14:47:13 2020 +0100

jsdialog: fix disable idle notify

There is a possible crash due to nullptr deference

Change-Id: I3e2034ad89832eec61f1d6910a5ffd34c56df6a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108224
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 11a84bc8bc64..50954dcec727 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -107,7 +107,8 @@ void JSDialogNotifyIdle::sendClose() { 
send(generateCloseMessage()); }
 
 void JSDialogSender::notifyDialogState(bool bForce)
 {
-if (mpIdleNotify->getNotifierWindow()->IsDisableIdleNotify())
+auto aNotifierWnd = mpIdleNotify->getNotifierWindow();
+if (aNotifierWnd && aNotifierWnd->IsDisableIdleNotify())
 return;
 
 if (bForce)
@@ -401,15 +402,15 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 m_xBuilder->drop_ownership(pDialog);
 m_bHasTopLevelDialog = true;
 
+if (id == "MacroSelectorDialog")
+pDialog->SetDisableIdleNotify(true);
+
 pRet.reset(pDialog ? new JSDialog(m_aOwnedToplevel, m_aOwnedToplevel, 
pDialog, this, false,
   m_sTypeOfJSON)
: nullptr);
 
 RememberWidget("__DIALOG__", pRet.get());
 
-if (id == "MacroSelectorDialog")
-pDialog->SetDisableIdleNotify(true);
-
 const vcl::ILibreOfficeKitNotifier* pNotifier = 
pDialog->GetLOKNotifier();
 if (pNotifier && id != "MacroSelectorDialog")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Henry Castro (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   34 ++
 1 file changed, 18 insertions(+), 16 deletions(-)

New commits:
commit ca839b341883c1238f27ba42236f08ebb49d53a4
Author: Henry Castro 
AuthorDate: Fri Dec 4 17:00:51 2020 -0400
Commit: Henry Castro 
CommitDate: Fri Dec 18 18:20:56 2020 +0100

lok: jsdialog: fix possible nullptr dereference

p = nullptr;

if (p)
{
}

p->Somenthing();

Change-Id: I2a46d6a8e7eae96928210c8941ec71eed88bf631
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107245
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index e4dd0f4a8b96..795acc644274 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -383,33 +383,35 @@ VclPtr& 
JSInstanceBuilder::GetNotifierWindow()
 
 std::unique_ptr JSInstanceBuilder::weld_dialog(const OString& id)
 {
+std::unique_ptr pRet;
 ::Dialog* pDialog = m_xBuilder->get<::Dialog>(id);
-m_nWindowId = pDialog->GetLOKWindowId();
-pDialog->SetLOKTunnelingState(false);
-
-InsertWindowToMap(m_nWindowId);
 
 if (pDialog)
 {
+m_nWindowId = pDialog->GetLOKWindowId();
+pDialog->SetLOKTunnelingState(false);
+
+InsertWindowToMap(m_nWindowId);
+
 assert(!m_aOwnedToplevel && "only one toplevel per .ui allowed");
 m_aOwnedToplevel.set(pDialog);
 m_xBuilder->drop_ownership(pDialog);
 m_bHasTopLevelDialog = true;
-}
 
-std::unique_ptr pRet(pDialog ? new 
JSDialog(m_aOwnedToplevel, m_aOwnedToplevel,
-  pDialog, this, 
false, m_sTypeOfJSON)
-   : nullptr);
+pRet.reset(pDialog ? new JSDialog(m_aOwnedToplevel, m_aOwnedToplevel, 
pDialog, this, false,
+  m_sTypeOfJSON)
+   : nullptr);
 
-RememberWidget("__DIALOG__", pRet.get());
+RememberWidget("__DIALOG__", pRet.get());
 
-const vcl::ILibreOfficeKitNotifier* pNotifier = pDialog->GetLOKNotifier();
-if (pNotifier && id != "MacroSelectorDialog")
-{
-tools::JsonWriter aJsonWriter;
-m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);
-aJsonWriter.put("id", m_aOwnedToplevel->GetLOKWindowId());
-pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
aJsonWriter.extractData());
+const vcl::ILibreOfficeKitNotifier* pNotifier = 
pDialog->GetLOKNotifier();
+if (pNotifier && id != "MacroSelectorDialog")
+{
+tools::JsonWriter aJsonWriter;
+m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);
+aJsonWriter.put("id", m_aOwnedToplevel->GetLOKWindowId());
+pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
aJsonWriter.extractData());
+}
 }
 
 return pRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Henry Castro (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40588ede2070e5b01ad4d2c71894bd19d6ec9738
Author: Henry Castro 
AuthorDate: Fri Dec 4 16:49:31 2020 -0400
Commit: Henry Castro 
CommitDate: Fri Dec 18 18:20:18 2020 +0100

lok: jsbuilder: avoid sending early id to client side

In the case of Macro Selector Dialog it is not required
to send the id too early when the dialog is created and
it is not initialized yet.

Change-Id: I22fb05bd9ecff49b3e9eda19737750379a61dd69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107244
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 08e66eedb6f5..e4dd0f4a8b96 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -404,7 +404,7 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 RememberWidget("__DIALOG__", pRet.get());
 
 const vcl::ILibreOfficeKitNotifier* pNotifier = pDialog->GetLOKNotifier();
-if (pNotifier)
+if (pNotifier && id != "MacroSelectorDialog")
 {
 tools::JsonWriter aJsonWriter;
 m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit dd5a1d31adbd43e81f7165c913ce474df74a85b7
Author: Szymon Kłos 
AuthorDate: Wed Dec 2 15:06:35 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon Dec 7 13:57:58 2020 +0100

jsdialog: use valid window instance

Change-Id: I3b7e98de41f56abbab1d8c15b7928089ebf8159a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107077
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107339
Tested-by: Jenkins

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 051c90c7b6db..3c663bac10e0 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -363,12 +363,6 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 
 InsertWindowToMap(m_nWindowId);
 
-std::unique_ptr pRet(pDialog ? new 
JSDialog(m_aOwnedToplevel, m_aOwnedToplevel,
-  pDialog, this, 
false, m_sTypeOfJSON)
-   : nullptr);
-
-RememberWidget("__DIALOG__", pRet.get());
-
 if (pDialog)
 {
 assert(!m_aOwnedToplevel && "only one toplevel per .ui allowed");
@@ -377,6 +371,12 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id)
 m_bHasTopLevelDialog = true;
 }
 
+std::unique_ptr pRet(pDialog ? new 
JSDialog(m_aOwnedToplevel, m_aOwnedToplevel,
+  pDialog, this, 
false, m_sTypeOfJSON)
+   : nullptr);
+
+RememberWidget("__DIALOG__", pRet.get());
+
 const vcl::ILibreOfficeKitNotifier* pNotifier = pDialog->GetLOKNotifier();
 if (pNotifier)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4637b12be47433691c19bbd0c5f46ee70062aff8
Author: Szymon Kłos 
AuthorDate: Tue Nov 3 11:32:21 2020 +0100
Commit: Szymon Kłos 
CommitDate: Thu Nov 26 09:18:48 2020 +0100

jsdialog: prevent from crash

Change-Id: If17738b7f58037929e29def75736434c33649b42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106590
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 93dae7db3a2d..6ded26055270 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -67,7 +67,7 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 if (sAction == "selected")
 {
 int separatorPos = rData["data"].indexOf(';');
-if (separatorPos)
+if (separatorPos > 0)
 {
 OUString entryPos = rData["data"].copy(0, 
separatorPos);
 OString posString = OUStringToOString(entryPos, 
RTL_TEXTENCODING_ASCII_US);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Caolán McNamara (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit acb71f8382004595778ba3f265c40dd46d72d125
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:14:11 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 20:24:05 2020 +0200

cid#1464972 Unchecked dynamic_cast

Change-Id: If40ee310e0a16af7ce93a5f93e2b436069aa153a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97317
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index e27bc81cb39f..28eecea4d713 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -56,12 +56,18 @@ void JSDialogNotifyIdle::Invoke()
 
 void JSDialogSender::notifyDialogState() { mpIdleNotify->Start(); }
 
+namespace
+{
+vcl::Window* extract_sal_widget(weld::Widget* pParent)
+{
+SalInstanceWidget* pInstanceWidget = 
dynamic_cast(pParent);
+return pInstanceWidget ? pInstanceWidget->getWidget() : nullptr;
+}
+}
+
 JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString& 
rUIRoot,
  const OUString& rUIFile)
-: SalInstanceBuilder(dynamic_cast(pParent)
- ? 
dynamic_cast(pParent)->getWidget()
- : nullptr,
- rUIRoot, rUIFile)
+: SalInstanceBuilder(extract_sal_widget(pParent), rUIRoot, rUIFile)
 , m_nWindowId(0)
 , m_aParentDialog(nullptr)
 , m_bHasTopLevelDialog(false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/jsdialog

[Mike Kaganski (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c106fab738afe01cd1293183f4228dc79a691f2d
Author: Mike Kaganski 
AuthorDate: Wed May 20 23:41:38 2020 +0200
Commit: Mike Kaganski 
CommitDate: Thu May 21 06:39:19 2020 +0200

Missing include

Building on Windows with PCH disabled:

[CXX] vcl/jsdialog/jsdialogbuilder.cxx
C:\lo\src\core\include\rtl/ref.hxx(113): error C2027: use of undefined type 
'TabPage'
C:\lo\src\core\include\vcl/tabctrl.hxx(33): note: see declaration of 
'TabPage'
C:\lo\src\core\include\rtl/ref.hxx(111): note: while compiling class 
template member function 'rtl::Reference::~Reference(void)'
with
[
reference_type=TabPage
]
C:/lo/src/core/vcl/jsdialog/jsdialogbuilder.cxx(207): note: see reference 
to function template instantiation 
'rtl::Reference::~Reference(void)'
being compiled
with
[
reference_type=TabPage
]
C:\lo\src\core\include\vcl/vclptr.hxx(64): note: see reference to class 
template instantiation 'rtl::Reference' being compiled
with
[
reference_type=TabPage
]

C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\utility(289):
 note: see reference to class template instantiation 'VclPtr' being co
mpiled

C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\utility(290):
 note: see reference to class template instantiation 'std::pair
,VclPtr>' being compiled

C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\xtree(330): 
note: see reference to class template instantiation 'std::pair,VclPtr>>' being compiled

C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\xtree(752): 
note: see reference to class template instantiation 'std::_Tree_node,VclPtr>>,std::_Default_allocator_traits<_Alloc>::void_pointer>'
 being compiled
with
[
_Alloc=std::allocator,VclPtr>>>
]

C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\xtree(1189):
 note: see reference to function template instantiation 'void std::_Tree_val,VclPtr::_Erase_head,VclPtr>>,std::_Default_allocator_traits<_Alloc>::void_pointer>>>(_Alnode
 &) noexcept' being compiled
with
[
_Alloc=std::allocator,VclPtr>>>,
_Alnode=std::allocator,VclPtr>>,std::_Default_allocator_traits,VclPtr::void_pointer>>
]

C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\xtree(1189):
 note: see reference to function template instantiation 'void std::_Tree_val,VclPtr::_Erase_head,VclPtr>>,std::_Default_allocator_traits<_Alloc>::void_pointer>>>(_Alnode
 &) noexcept' being compiled
with
[
_Alloc=std::allocator,VclPtr>>>,
_Alnode=std::allocator,VclPtr>>,std::_Default_allocator_traits,VclPtr::void_pointer>>
]

C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\xtree(1187):
 note: while compiling class template member function 'std::_Tree>::~_Tree(void) noexcept'
with
[
_Kty=rtl::OString,
_Ty=std::pair,VclPtr>,
_Pr=std::less,
_Alloc=std::allocator,VclPtr>>>
]
C:\lo\src\core\vcl\inc\jsdialog/jsdialogbuilder.hxx(131): note: see 
reference to function template instantiation 
'std::_Tree>::~_Tree(void) noexcept' being compiled
with
[
_Kty=rtl::OString,
_Ty=std::pair,VclPtr>,
_Pr=std::less,
_Alloc=std::allocator,VclPtr>>>
]

C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\map(75): 
note: see reference to class template instantiation 
'std::_Tree>' being compiled
with
[
_Kty=rtl::OString,
_Ty=std::pair,VclPtr>,
_Pr=std::less,
_Alloc=std::allocator,VclPtr>>>
]
C:\lo\src\core\vcl\inc\salvtables.hxx(1032): note: see reference to class 
template instantiation 
'std::map,VclPtr>,std::less,std::allocator,VclPtr' being compiled
make[1]: *** [C:/lo/src/core/solenv/gbuild/LinkTarget.mk:303: 
C:/lo/src/build/workdir/CxxObject/vcl/jsdialog/jsdialogbuilder.o] Error 2

Change-Id: Id67ce45b1652a2915508963adb65e1e1f5c51dcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94464
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index facd3991746a..759007ce46d1 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -2,6 +2,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits