[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - desktop/source vcl/source

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx     |   11 ++++++++++-
 vcl/source/control/combobox.cxx |    3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit f6c75f35fe34123ed67c2f06ed3037c86256875e
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Sat Aug 19 11:33:45 2023 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Aug 28 16:25:28 2023 +0200

    jsdialog: inform that combobox has custom entries
    
    Change-Id: I6241961db2e0fa676289ce50873a2aae7ec18282
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155937
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 1a8f7ef0673c..67fb4807a16e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1601,6 +1601,9 @@ void ComboBox::DumpAsPropertyTree(tools::JsonWriter& 
rJsonWriter)
     }
 
     rJsonWriter.put("selectedCount", GetSelectedEntryCount());
+
+    if (IsUserDrawEnabled())
+        rJsonWriter.put("customEntryRenderer", true);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ef3e647e0a3c75e616fc2d907bf473153b8b216e
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Aug 8 06:49:04 2023 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Aug 28 16:25:16 2023 +0200

    jsdialog: detect special window id earlier
    
    Change-Id: Ib90d9d728d93a26d44a7f52b7ca0074338b1fae9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155853
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 638b9a44fb11..d55dd04d49e5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4759,9 +4759,18 @@ static void lcl_sendDialogEvent(unsigned long long int 
nWindowId, const char* pA
     try
     {
         OString sControlId = OUStringToOString(aMap["id"], 
RTL_TEXTENCODING_ASCII_US);
+        std::string sWindowId = std::to_string(nWindowId);
+
+        // special values for window id
+        if (nWindowId == static_cast<unsigned long long int>(-1))
+            sWindowId = std::to_string(nCurrentShellId) + "sidebar";
+        if (nWindowId == static_cast<unsigned long long int>(-2))
+            sWindowId = std::to_string(nCurrentShellId) + "notebookbar";
+        if (nWindowId == static_cast<unsigned long long int>(-3))
+            sWindowId = std::to_string(nCurrentShellId) + "formulabar";
 
         // dialogs send own id but notebookbar and sidebar controls are 
remembered by SfxViewShell id
-        bool bFoundWeldedControl = 
jsdialog::ExecuteAction(std::to_string(nWindowId), sControlId, aMap);
+        bool bFoundWeldedControl = jsdialog::ExecuteAction(sWindowId, 
sControlId, aMap);
         if (!bFoundWeldedControl)
             bFoundWeldedControl = 
jsdialog::ExecuteAction(std::to_string(nCurrentShellId) + "sidebar", 
sControlId, aMap);
         if (!bFoundWeldedControl)