[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/jsdialog

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit ba8000ccf5ba7a5c18ce4058983919407980369b
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: Fri Jul 2 10:35:39 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>

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 77d276284fb2..38bee8043cd6 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -69,7 +69,8 @@ bool isBuilderEnabledForPopup(const OUString& rUIFile)
         || rUIFile == "svx/ui/textunderlinecontrol.ui" || rUIFile == "svx/ui/numberingwindow.ui"
         || rUIFile == "svx/ui/paralinespacingcontrol.ui"
         || rUIFile == "svx/ui/floatinglineproperty.ui" || rUIFile == "svx/ui/floatinglinestyle.ui"
-        || rUIFile == "svx/ui/floatinglineend.ui")
+        || rUIFile == "svx/ui/floatinglineend.ui" || rUIFile == "svx/ui/fontworkalignmentcontrol.ui"
+        || rUIFile == "svx/ui/fontworkcharacterspacingcontrol.ui")
         return true;
 
     return false;