[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - kit/Kit.cpp

Tor Lillqvist tml at collabora.com
Wed Apr 4 17:10:10 UTC 2018


 kit/Kit.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f34a90777a0f8914c95170c7494ea3b471296f7b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 15 13:45:35 2018 +0200

    Don't filter out all scripts, just Java and JavaScript ones
    
    Change-Id: I3054a3f36ae1777b162fb5a1b9a456f1bce9248b
    Reviewed-on: https://gerrit.libreoffice.org/51991
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit bb4c1a7fa701f791dbcb2f0b929306c6e816034f)
    Reviewed-on: https://gerrit.libreoffice.org/52100
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index f7b169c0b..e99ba4782 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -136,7 +136,8 @@ namespace
                 strcmp(path, "sdk") != 0 &&
                 strcmp(path, "share/basic") != 0 &&
                 strcmp(path, "share/gallery") != 0 &&
-                strcmp(path, "share/Scripts") != 0 &&
+                strcmp(path, "share/Scripts/java") != 0 &&
+                strcmp(path, "share/Scripts/javascript") != 0 &&
                 strcmp(path, "share/template") != 0 &&
                 strcmp(path, "share/config/wizard") != 0 &&
                 strcmp(path, "share/config/wizard") != 0;


More information about the Libreoffice-commits mailing list