[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - 2 commits - configure.ac sfx2/source

[Caolán McNamara (via logerrit)]

 configure.ac                |   21 +++++++++++----------
 sfx2/source/doc/objmisc.cxx |    3 ++-
 2 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit f734e680f46818aa9434ac82ff44d3acad31a531
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 7 12:58:01 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Aug 7 16:57:26 2019 +0200

    expand pyuno path separators
    
    Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239
    Reviewed-on: https://gerrit.libreoffice.org/77102
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7)

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 13d338f3b14e..a508aea86e12 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1363,7 +1363,8 @@ bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL)
     if (!sfUri.is())
         return false;
 
-    OUString sScript = sfUri->getName();
+    // pyuno encodes path separator as |
+    OUString sScript = sfUri->getName().replace('|', '/');
 
     // check if any path portion matches LibreLogo and ban it if it does
     sal_Int32 nIndex = 0;
commit 51b22b899a20e3e9e3d75daadba8e8d39c4da493
Author:     Juergen Funk <juergen.funk_ml at cib.de>
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Aug 7 15:57:56 2019 +0200

    Improve the Windows SDK 10 ProductVersion-Path
    
    At the moment the ProductVersion-Path has always the same format,
    with this patch, when the format the same, then no change is need for
    the next Version.
    
    Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
    Reviewed-on: https://gerrit.libreoffice.org/60041
    Tested-by: Jenkins
    Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml at cib.de>
    (cherry picked from commit dfb18a0557d5a897f443fd1f1d617365f6ae134a)

diff --git a/configure.ac b/configure.ac
index 3272b4058624..3367507e6bf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5069,16 +5069,17 @@ find_winsdk_version()
             reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v${1}/ProductVersion"
             if test -n "$regvalue"; then
                 winsdkbinsubdir="$regvalue".0
-            fi
-            winsdklibsubdir=$regvalue
-            if test "$regvalue" = "10.0.14393"; then
-                winsdklibsubdir="10.0.14393.0"
-            elif test "$regvalue" = "10.0.16299"; then
-                winsdklibsubdir="10.0.16299.0"
-            elif test "$regvalue" = "10.0.15063"; then
-                winsdklibsubdir="10.0.15063.0"
-            elif test "$regvalue" = "10.0.17134"; then
-                winsdklibsubdir="$regvalue.0"
+                winsdklibsubdir=$winsdkbinsubdir
+                tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+                # test exist the SDK path
+                if test -d "$tmppath"; then
+                   # when path is convertable to a short path then path is okay
+                   if ! cygpath -d "$tmppath"; then
+                      AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see NtfsDisable8dot3NameCreation])
+                   fi
+                else
+                   AC_MSG_ERROR([The Windows SDK not found, check the installation])
+                fi
             fi
             return
         fi