df-libreoffice:libreoffice-6-0-4

Last commit made on 2018-05-04
Get this branch:
git clone -b libreoffice-6-0-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:
libreoffice-6-0-4
Repository:
lp:df-libreoffice

Recent commits

3dd38cf... by Christian Lohmaier <email address hidden>

bump product version to 6.0.4.2.0+

Change-Id: Ic769ee108f6f2b9bc46bc38fdc96d6da0157770c

e27b1eb... by Christian Lohmaier <email address hidden>

update credits

Change-Id: I8732abab556f9330791d9edcde6aec00ffc97d51
(cherry picked from commit 71bbb0989f1a76b760a75f0fb2f332a8e82b18ce)
(cherry picked from commit 46b49b0f3f539d9a8645c6447a8c4b2e0b463cac)

46eef2a... by Christian Lohmaier <email address hidden>

update credits

Change-Id: Ibed24e2bc2d246bc1f54bd42a354c3aced1adbb6
(cherry picked from commit e70343cd26b5d56e20e77118fe2f576e8eaa9cec)
(cherry picked from commit b87bb66ae30cf99b57408939a1523bbe61963300)

48d971e... by Christian Lohmaier <email address hidden>

Updated core
Project: translations 04deccf23ffd036da3c85079d34aa41749f5a801

update translations for 6.0.4 rc2

and force-fix errors using pocheck

Change-Id: I07ccad5e9307bdbc75778efe4cba01a5e82f84d4
(cherry picked from commit adb3b92c5d9fff53ba638017eda2a2536ff8beb4)

3919200... by Eike Rathke

Resolves: tdf#116939 cater for the last cols col incremented by Excel

Change-Id: I48c4b9afb4cf2cb826ae2bb52067256e7fcb2c83
(cherry picked from commit b78ab482911356ef282f7fd40a4509320608a203)
Reviewed-on: https://gerrit.libreoffice.org/53566
Reviewed-by: Markus Mohrhard <email address hidden>
Reviewed-by: Kohei Yoshida <email address hidden>
Tested-by: Kohei Yoshida <email address hidden>

b7ef11a... by Rene Engelhard <email address hidden>

fix build with poppler 0.64

GooString became const...

Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
Reviewed-on: https://gerrit.libreoffice.org/53423
Reviewed-by: Adolfo Jayme Barrientos <email address hidden>
Reviewed-by: Michael Stahl <email address hidden>
Reviewed-by: Christian Lohmaier <email address hidden>
Tested-by: Christian Lohmaier <email address hidden>

705cc32... by Sbergman

Merge in Flatpak improvements

...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:

commit 715fbcfb4e5c51d40387998932984e54639476a1
Author: Robert McQueen <email address hidden>
Date: Tue Apr 17 10:26:32 2018 +0100

    edit .desktop files to add X-Endless-Alias with original names

    Endless OS uses this to update icon grids & taskbar pins if the original files
    have been removed. (Happy to update this to a more standardised key if a
    consensus emerges.)

Change-Id: I646350090c38d84d1930c5afbec0ee500b60d0fb
(cherry picked from commit a161e41439fc6f9093c212a523154e5146bb1502)
Reviewed-on: https://gerrit.libreoffice.org/53199
Reviewed-by: Michael Stahl <email address hidden>
Reviewed-by: Adolfo Jayme Barrientos <email address hidden>
Reviewed-by: Christian Lohmaier <email address hidden>
Tested-by: Christian Lohmaier <email address hidden>

59d41f0... by Justin Luth <email address hidden>

tdf#117129 ww8import: prevent divide-by-zero

Before commit ffc3358515799057e72379b76a1165c6ea5a9bd1 for
tdf#75539, the divisor was hard-coded at 1000. The preceeding code
also notes that an undefined relativeWidth is forced to 1000.
So, on an invalid divisor, revert to previous behaviour.

Change-Id: I40210194eec39682d9ab3ce68268d343af16e2b1
Reviewed-on: https://gerrit.libreoffice.org/53329
Tested-by: Jenkins <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>
(cherry picked from commit 9b55701b88c42cac491587072f1f09522207de77)
Reviewed-on: https://gerrit.libreoffice.org/53517
Reviewed-by: Justin Luth <email address hidden>
Tested-by: Justin Luth <email address hidden>

0d90c99... by Miklos Vajna <email address hidden>

tdf#113377 cui personalization: fix calling into VCL without necessary locking

We assume the SolarMutex is always taken when doing GL calls, but
putting DBG_TESTSOLARMUTEX() into WinOpenGLContext::makeCurrent()
pointed out two places in the persona code where this invariant wasn't
hold, fix those.

Opening the dialog and downloading previews of one category, then
clicking on an other button to download previews of an other category no
longer results in a crash while calling glBindFramebuffer() with this.

(cherry picked from commit 336d91a6f2bc12ff0342f984cdbb2cf64abd0b56)

Change-Id: Ib8148a709f89c2dc44da102e2023cc61ba890744
Reviewed-on: https://gerrit.libreoffice.org/53434
Tested-by: Jenkins <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>
(cherry picked from commit 980e19ddddaf46dae68c800d55582e8f6b2c7fdd)
Reviewed-on: https://gerrit.libreoffice.org/53518
Reviewed-by: Michael Meeks <email address hidden>

4b80ac6... by Eike Rathke

Related: tdf#116274 ignore the one excess cols definition's last column

    <cols>
      ...
      <col min="5" max="16384" width="31.75" style="3"/>
    </cols>

may be present even if there isn't any content. Apparently used
with pageBreakPreview to grey out the area.

Change-Id: I6a79f9ec692ec07b02f4b4205ccd0cf3cf9f363f
(cherry picked from commit 16265dcdb21d7cf69c65c2a84f1d21a5d8574dd4)
Reviewed-on: https://gerrit.libreoffice.org/53378
Reviewed-by: Markus Mohrhard <email address hidden>
Reviewed-by: Kohei Yoshida <email address hidden>
Tested-by: Kohei Yoshida <email address hidden>