core.git: Branch 'distro/collabora/co-25.04' - vcl/source

[Hubert Figuière (via logerrit)]

 vcl/source/window/window.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 123c01ef7ad0d220c50ba35d4639b970eee9c3fb
Author:     Hubert Figuière <h...@collabora.com>
AuthorDate: Wed Nov 5 18:41:09 2025 -0500
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Nov 6 05:33:26 2025 +0100

    vcl: Send dump the grid height in JSON
    
    This allow proper grid layout when spanning over several row in JS Dialog
    
    Signed-off-by: Hubert Figuière <h...@collabora.com>
    Change-Id: Idd64a367e302a896791ab9603d5e03737db52cfb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193501
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6ff8fea2a84b..960a83383a16 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3398,6 +3398,9 @@ void Window::DumpAsPropertyTree(tools::JsonWriter& 
rJsonWriter)
                 sal_Int32 nWidth = pChild->get_grid_width();
                 if (nWidth > 1)
                     rJsonWriter.put("width", nWidth);
+                sal_Int32 nHeight = pChild->get_grid_height();
+                if (nHeight > 1)
+                    rJsonWriter.put("height", nHeight);
             }
             pChild = pChild->mpWindowImpl->mpNext;
         }