df-libreoffice:distro/collabora/cd-5.3-3.4

Last commit made on 2018-12-04
Get this branch:
git clone -b distro/collabora/cd-5.3-3.4 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/collabora/cd-5.3-3.4
Repository:
lp:df-libreoffice

Recent commits

476212d... by Andras Timar <email address hidden>

Bump version to 5.3-61

Change-Id: I0753c83b554dca20de6650d7947b3112d177df90
(cherry picked from commit cd2475c52a096b001a7e3179f02e11cbc8a5615f)

c625c49... by Andras Timar <email address hidden>

Do not validate SSL cert in LOK case

Currently we cannot tunnel interaction handler dialog, so if there
is a problem with site's SSL cert, the operation (e.g. insert image)
would silently fail. As a workaround, let's not validate the remote
site's SSL cert, as we also do not validate the site's SSL cert when
we download the file through WOPI from the site, in the first place.
So this patch does not really make things worse, but makes it possible
to use the insert image feature with a self signed cert in test environments.

Change-Id: I672ba9016b1555c6d9d8faba8d0a4b2a17adf453
Reviewed-on: https://gerrit.libreoffice.org/63993
Reviewed-by: Andras Timar <email address hidden>
Tested-by: Andras Timar <email address hidden>
(cherry picked from commit ea471b508cb90fbaa770f291a40864324d8d74ef)

32c01c3... by Andras Timar <email address hidden>

Bump version to 5.3-60

(cherry picked from commit 25ec65bf4b77a5cdb2544527f3d1a262fcb78fe6)

Change-Id: I7f5a4a30802c9348e8fef0d7a11b7efec47e1d88

7c753bd... by Ashod Nakashian <email address hidden>

LOK: don't emit redline comments

Change tracking can be quite numerous. Showing the
markers (and their comments" as comment-boxes is
sensible where there is limited change in a doc.

However with extensively modified doc, this becomes
overwhelming both in terms of browser load and
editing performance. As such, we disable them
as they don't add much value. The user can still
access them from the Track Changes > Manage menu.

Use a rather nasty env. var hack to propagate this
setting from WSD for now.

Change-Id: I3f964816b4a10f565012b273added8a8413cd309
Signed-off-by: Michael Meeks <email address hidden>
(cherry picked from commit d4f821b7a385953542e90b2749690b9f8f4cc782)

71c6a30... by Andras Timar <email address hidden>

LOK: update main thread

Change-Id: I75df6ae9f9fb41b08a8774ce026f79fdd120b629
Reviewed-on: https://gerrit.libreoffice.org/62921
Reviewed-by: Michael Meeks <email address hidden>
Tested-by: Michael Meeks <email address hidden>
(cherry picked from commit 6f076e75b2adb4628ee3cea311781c40f219bba7)

a3b3eea... by Samuel Mehrbrodt <email address hidden>

tdf#116342 Allow selecting text boxes anywhere by default

Not only by hitting the (invisble) frame or the text content.

Change-Id: I125f76a102611b628411d8c5acf70e3ed9e5e8fe
Reviewed-on: https://gerrit.libreoffice.org/51276
Tested-by: Jenkins <email address hidden>
Reviewed-by: Samuel Mehrbrodt <email address hidden>
(cherry picked from commit d799436414ab7e28b6bf9a918fd3779b3fc85008)
(cherry picked from commit ead83a1a3a346ae8a8206274954edabc6ce1116e)

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

keep pyuno script processing below base uri

Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7
Reviewed-on: https://gerrit.libreoffice.org/61969
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <email address hidden>
(cherry picked from commit b1c85cdb37a47998f8ab135fbc96f186334b171c)
(cherry picked from commit a9d81dd30d809b9c5ce2d3e4752039f19be70494)
(cherry picked from commit 4c0d9942ebd56e83e83ac3079528e62ce5644008)

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

outer loop unrelated to inner loop

since original checkin of...

commit 9cddf9da7fb256418e1bc3b4719abb55e3b0604c
Date: Tue May 22 15:33:44 2007 +0000

    INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED
...
    2006/12/13 12:31:03 tl 1.1.2.38: #i71244# update charts in writer

where I think this LockUnlockAllCharts chart2 loop was modelled on
the previous chart[1] styles loop of e.g. DoUpdateAllCharts which
loop over tables.

chart2 objects are unrelated to these tables, so remove the outer
loop, which then means the ofz#9689 ofz#9856 ofz9874 crashes that
made me look at it will get fixed

Change-Id: I7d7ba0a2aa257b5aa399f20d902f01306fbaecff
Reviewed-on: https://gerrit.libreoffice.org/59112
Tested-by: Jenkins
Reviewed-by: Michael Stahl <email address hidden>
(cherry picked from commit eadf6f4551416430b58efc42a5756556df0a237d)
(cherry picked from commit 74de907344923a9f9575927fca8d43260f86f4c9)
(cherry picked from commit c7b0292184c0942ca00633b88e76367092f3ea91)
(cherry picked from commit d20db10442dcc6c0c93d11219c1e60ba6d91245f)

f712c91... by Eike Rathke

Resolves: tdf#119954 do not copy the old parent, init with new parent instead

The parent is always the ScDBCollection that contains the
ScDBCollection::NamedDBs container, not the one the
ScDBCollection::NamedDBs was copy-constructed from.

Change-Id: Ia409347f3aeb9ad7a5e68da7af727adfac98d6a2
Reviewed-on: https://gerrit.libreoffice.org/60833
Reviewed-by: Eike Rathke <email address hidden>
Tested-by: Jenkins
(cherry picked from commit 7ea5d339dc4d8412f436f3affa589bfbd0b1ef68)
(cherry picked from commit 3298d3c68fa17b350ef7bec8271fcfc673b5e1a7)
(cherry picked from commit 15ce830eb8994bf1c01389b53c05aed7ed9daba4)

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

ofz#10523 guard aginst 0 pF->nLCode

Change-Id: I8ef476e06f54ddd57be907488a8a65314abda3ee
(cherry picked from commit 108eca19c9043895f26c889c90b3f4081113a3fb)
(cherry picked from commit 40d91027e70518dff8404aaf10fd9830995d9409)