df-libreoffice:distro/cib/libreoffice-5-2

Last commit made on 2019-06-18
Get this branch:
git clone -b distro/cib/libreoffice-5-2 https://git.launchpad.net/df-libreoffice
Members of The Document Foundation can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
distro/cib/libreoffice-5-2
Repository:
lp:df-libreoffice

Recent commits

ab1a8b0... by Sbergman

More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <email address hidden>
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
 sw/source/core/text/porfld.cxx
 sw/source/core/unocore/unosett.cxx

Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <email address hidden>
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23

9b4d356... by =?utf-8?q?Caol=C3=A1n_McNamara?= <email address hidden>

explictly exclude LibreLogo from XScript usage

Change-Id: I567647f0e2f8b82e4ef2995c673abe82f4564228
Reviewed-on: https://gerrit.libreoffice.org/73659
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>
(cherry picked from commit cb0024e3668979dfdef44db5aa15ddfaf035e695)

a781c5e... by László Németh

sanitize LibreLogo calls

Change-Id: Ie4d9858e5b4b3e55ab08416fb9338d2df34ee5e1
Reviewed-on: https://gerrit.libreoffice.org/73627
Tested-by: Jenkins
Reviewed-by: László Németh <email address hidden>
(cherry picked from commit 1b63fa32bbd4a5b89d2ee3a53b28de4250c8dad3)

7814e7a... by David Ostrovsky <email address hidden>

MSVC 14.0: Fix warning C4702: unreachable code

Change-Id: I38db92984daae40981f2d3f60c4efa38684d5328
Reviewed-on: https://gerrit.libreoffice.org/34382
Tested-by: Jenkins <email address hidden>
Reviewed-by: David Ostrovsky <email address hidden>
(cherry picked from commit 996960f5a25c0833942c03b94356d2137c4d7557)

0df8eb4... by Michael Stahl <email address hidden>

libpng: upgrade to release 1.6.37

Fixes CVE-2019-7317.

Reviewed-on: https://gerrit.libreoffice.org/71663
Tested-by: Jenkins
Reviewed-by: Michael Stahl <email address hidden>
(cherry picked from commit e2abbc0062398ea67cb13cb5b0b7bfdce78e652c)

Change-Id: I3374f5cbd6552e2c1569d63ee680d0c1d9389621

9f8aeee... by Sbergman

Filter out problematic file URLs

(cherry picked from commit 7e50e885ebbe130debcd4278a10a4e288655fdfc)
Conflicts:
 shell/source/win32/SysShExec.cxx

Reviewed-on: https://gerrit.libreoffice.org/70188
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>
(cherry picked from commit a35068ba25ed9da37bcb20598c9791b6979cf1ef)

Change-Id: I87fd37e56326bef4888354b923407530c6f70760

a43be85... by Sbergman

New o3tl::runtimeToOUString to convert from C++ runtime NTBS to OUString

Change-Id: I613bb70b6828f615fd45af38b2d873ece55ace60
(cherry picked from commit d689ad29c28ad7f077c2239a8fa4c2b6307a6aa1)
Reviewed-on: https://gerrit.libreoffice.org/71591
Reviewed-by: Michael Stahl <email address hidden>
Tested-by: Michael Stahl <email address hidden>

e3a7d1f... by Michael Stahl <email address hidden>

libxslt: add patch for CVE-2019-11068

Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4
Reviewed-on: https://gerrit.libreoffice.org/70879
Tested-by: Jenkins
Reviewed-by: Michael Stahl <email address hidden>
(cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e)
Reviewed-on: https://gerrit.libreoffice.org/70894
Reviewed-by: Thorsten Behrens <email address hidden>
(cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)

9ae9d12... by Michael Stahl <email address hidden>

openssl: remove MinGW patch

This breaks the OPENSSL_IMPLEMENT_GLOBAL macro quite badly, which is
also used on MSVC builds, and MSVC warns about the breakage.

Change-Id: I8f4c7c8097e7d737ca32d6a020a569c0a99b92d4

b1a97d1... by Michael Stahl <email address hidden>

openssl: try to fix build with 7.1A SDK

Change-Id: Ic4a9e53227e34fe41a69afd52a9e91ef9545f8f9