[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - vcl/source

[Szymon KÅ‚os (via logerrit)]

 vcl/source/window/builder.cxx |    4 +++-
 vcl/source/window/dialog.cxx  |    5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 2b69b806fbbdc4d73efd6ae8adc457fdf07b6546
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Dec 8 10:37:05 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Dec 8 11:39:37 2020 +0100

    jsdialog: enable define/manage named ranges dialogs
    
    Change-Id: I6783ec5be11255608e694e43a32ec3c6d4de468e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107394
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 73385b6b6dfc..aa6b2f4ab90e 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -171,7 +171,9 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
         }
 
         if (rUIFile == "modules/scalc/ui/pivottablelayoutdialog.ui"
-            || rUIFile == "modules/scalc/ui/selectsource.ui")
+            || rUIFile == "modules/scalc/ui/selectsource.ui"
+            || rUIFile == "modules/scalc/ui/managenamesdialog.ui"
+            || rUIFile == "modules/scalc/ui/definename.ui")
         {
             bUseJSBuilder = true;
         }
commit f4a35770b5e149a780bcaafb5395afb37fb857e1
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Dec 8 11:21:34 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Dec 8 11:39:30 2020 +0100

    jsdialog: dump collapsed state for dialog
    
    Change-Id: I69b154b3fd2819c68194eaee9ed785e00dc386f5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107401
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index f0b5a96462c9..dadcc34718c8 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1611,6 +1611,11 @@ boost::property_tree::ptree Dialog::DumpAsPropertyTree()
 {
     boost::property_tree::ptree aTree(SystemWindow::DumpAsPropertyTree());
     aTree.put("title", GetText());
+    if (vcl::Window* pActionArea = get_action_area())
+    {
+        if (!pActionArea->IsVisible())
+            aTree.put("collapsed", "true");
+    }
     return aTree;
 }