[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-4' - 4 commits - configure.ac sfx2/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Aug 7 16:24:18 UTC 2019
configure.ac | 21 ++++++++++-----------
sfx2/source/doc/objmisc.cxx | 3 ++-
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 816b6937ccb66269e40b31a6885503e034e717a3
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:58:18 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 7c27ae0d5a9d..3779150791fc 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1373,7 +1373,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 0e60d22e750dd75dcb7b9b17977ed4e4304798ce
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 16:02:05 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 19487e019ff5..1bef6421f028 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5193,16 +5193,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
commit ddb2c27091b03a97facee788d4084fb88d359e8c
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu May 10 14:43:10 2018 +0300
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Aug 7 16:01:52 2019 +0200
Also for SDK 10.0.17134 the winsdklibsubdir needs to have a .0 tacked on
Also remove questionable old "Hack needed at least by tml".
Change-Id: I478358ea114cee2f8a181b98cb3433447b3ed560
Reviewed-on: https://gerrit.libreoffice.org/54081
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
(cherry picked from commit fc00041df85fd508d1fc34658d4c9ceeb10084b1)
diff --git a/configure.ac b/configure.ac
index cce6cbb5f024..19487e019ff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5201,12 +5201,8 @@ find_winsdk_version()
winsdklibsubdir="10.0.16299.0"
elif test "$regvalue" = "10.0.15063"; then
winsdklibsubdir="10.0.15063.0"
- dnl Hack needed at least by tml:
- if test ! -f "${winsdktest}/Include/10.0.15063.0/um/sqlext.h" \
- -a -f "${winsdktest}/Include/10.0.14393.0/um/sqlext.h"
- then
- winsdklibsubdir="10.0.14393.0"
- fi
+ elif test "$regvalue" = "10.0.17134"; then
+ winsdklibsubdir="$regvalue.0"
fi
return
fi
commit 880f728475607db5e34664150cc14b370916b842
Author: Juergen Funk <juergen.funk_ml at cib.de>
AuthorDate: Mon Oct 16 13:56:51 2017 +0200
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Aug 7 16:01:52 2019 +0200
Intergate new Win-SDK 10.0.16299.0
Change-Id: Ie0387fdb7fa5850d796d825e767119b90ae85d95
Reviewed-on: https://gerrit.libreoffice.org/43422
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>
(cherry picked from commit c7091668794e080fc8c5f2cff398e644a4cb1ea4)
diff --git a/configure.ac b/configure.ac
index b0ed14027b4b..cce6cbb5f024 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5197,6 +5197,8 @@ find_winsdk_version()
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"
dnl Hack needed at least by tml:
More information about the Libreoffice-commits
mailing list