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

[Szymon KÅ‚os (via logerrit)]

 sfx2/source/sidebar/Deck.cxx |    1 +
 vcl/jsdialog/enabled.cxx     |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 63ed9fe32c849901af2624d59c49ddd42c70217a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jul 2 09:34:01 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Jul 29 22:02:00 2021 +0200

    jsdialog: sidebar: enable fontwork popups
    
    Change-Id: I12002874a06ca2dc96c6dc3dc0ef3d5004c45f5e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118251
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119663
    Tested-by: Jenkins

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 81cc808ceb7c..e7afb364c24d 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -68,7 +68,9 @@ bool isBuilderEnabledForPopup(std::u16string_view rUIFile)
         || 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/floatinglineend.ui")
+        || rUIFile == u"svx/ui/floatinglineend.ui"
+        || rUIFile == u"svx/ui/fontworkalignmentcontrol.ui"
+        || rUIFile == u"svx/ui/fontworkcharacterspacingcontrol.ui")
         return true;
 
     return false;
commit d22299918b5969fe2c08747fb7e7e55d52e9151b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jul 2 09:15:49 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Jul 29 22:01:45 2021 +0200

    jsdialog: sidebar: dump expanded state for panel
    
    Change-Id: Iffd4570a512d20229c20c0c7bbb113eaf456bcba
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118250
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119660
    Tested-by: Jenkins

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 422eb3bb6b9b..82c0c8f350c7 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -155,6 +155,7 @@ void Deck::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
         rJsonWriter.put("text", it->GetTitle());
         rJsonWriter.put("enabled", true);
         rJsonWriter.put("hidden", it->IsLurking());
+        rJsonWriter.put("expanded", it->IsExpanded());
 
         {
             auto children2Node = rJsonWriter.startArray("children");