df-libreoffice:libreoffice-6-2-0

Last commit made on 2019-01-29
Get this branch:
git clone -b libreoffice-6-2-0 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-2-0
Repository:
lp:df-libreoffice

Recent commits

def0f2c... by Olivier Hallot

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2-0'
  - 6.2 features video last update of 1/20/2019

    as per msg in marketing priv list of 1/20/2019

    Change-Id: Ifc8cba99206c5872bebfd0a4da140d4f4bab5ae1
    Reviewed-on: https://gerrit.libreoffice.org/66859
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <email address hidden>
    (cherry picked from commit ec2affa7289a7964f5291d5368dc31a1d2ae0961)
    Reviewed-on: https://gerrit.libreoffice.org/66956
    Reviewed-by: Olivier Hallot <email address hidden>
    Tested-by: Olivier Hallot <email address hidden>
    Reviewed-by: Heiko Tietze <email address hidden>

0639e31... by Andras Timar <email address hidden>

Update git submodules

* Update translations from branch 'libreoffice-6-2-0'
  - Updated Slovenian translation

    Change-Id: I07561f22049061a2f8f3abcef7576bdd06e381b8
    (cherry picked from commit 3af8fa3625c380fc9dc417b247cc230ddda73f8d)

48cad22... by himajin100000 <email address hidden>

Support AdoptOpenJDK

Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5
Reviewed-on: https://gerrit.libreoffice.org/66634
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <email address hidden>
Reviewed-by: Samuel Mehrbrodt <email address hidden>
Reviewed-by: Stephan Bergmann <email address hidden>
(cherry picked from commit 61c4f96d6ae6a80370774e53287edb27cbce8067)
Reviewed-on: https://gerrit.libreoffice.org/66715
Reviewed-by: Michael Stahl <email address hidden>
(cherry picked from commit 273330a55d7cf457da6d7ba9829527a961c40bc0)
Reviewed-on: https://gerrit.libreoffice.org/66881
Reviewed-by: Noel Grandin <email address hidden>
Tested-by: Noel Grandin <email address hidden>

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

bump product version to 6.2.0.3.0+

Change-Id: Iafa54ac6206f8be17a7cc89b170aeec8d2d67334

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

Resolves: tdf#122874 select row when user clicks toggle in row

Change-Id: I761d0566eef07eadf9e583566b8707b18563ee33
Reviewed-on: https://gerrit.libreoffice.org/66744
Reviewed-by: Michael Stahl <email address hidden>
Reviewed-by: Xisco Faulí <email address hidden>
Tested-by: Xisco Faulí <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>

517470b... by Xisco Fauli <email address hidden>

tdf#122846: Close option dialog if restart is confirmed

use the same logic as 0fa14d58457e9418ff756a0efd66e365c4403a67

Change-Id: I485cb232bb787e176918caf2eee74b0fbb360e47
Reviewed-on: https://gerrit.libreoffice.org/66691
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <email address hidden>
Reviewed-by: Katarina Behrens <email address hidden>
Reviewed-on: https://gerrit.libreoffice.org/66733
Reviewed-by: Christian Lohmaier <email address hidden>
Reviewed-by: Xisco Faulí <email address hidden>
Tested-by: Xisco Faulí <email address hidden>

cff42c9... by Jan-Marek Glogowski

OSX Re-Introduce NSApplicationMain usage

This restores the nested NSApplicationMain and default run loop
usage. Without it the Java AWT integration will start its own
event loop, effectively blocking any non-system event processing.

Reproducible via "Tools - Macros - Organize Macros - BeanShell...
- LibreOffice Macros - HelloWorld - helloworld.bsh - Edit".

The blocking can be prevented by overriding NSApplication::run and
running our own event loop using Application::Execute. But this
still doesn't show the Java AWT editor window and I couldn't find
any information how to fix this.

Since OSX now is a VCL plugin, this can't restore the old hook
mechanism, but instead adds a new function to SalInstance.
SalInstance initialization happens at InitVCL() start just a
little bit later in the call stack.

Somehow NSApplicationMain manages to run the Java VM in an extra
thread, so it doesn't block the main loop. Probably this could
also be handled by LO starting the JVM as a thread.
Further information for an implementation eventually can be found
in the "Technical Note TN2147" "JNI Development on Mac OS X."

Change-Id: I04a0c2bf7949571f1b678ada9ab3592e0fe30c1f
Regression-from: 925e2edb6f3f8fffcff9eddb31ed18bc77e2a690
Reviewed-on: https://gerrit.libreoffice.org/65836
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <email address hidden>
(cherry picked from commit 284a7f60fff72c4d8c011ff60ea2e40163cd25c3)
Reviewed-on: https://gerrit.libreoffice.org/66192
Reviewed-by: Stephan Bergmann <email address hidden>
(cherry picked from commit d94f96c56d858cfd20bd7fac0c357ea0ecc24785)
Reviewed-on: https://gerrit.libreoffice.org/66240
Reviewed-by: Thorsten Behrens <email address hidden>
Reviewed-by: Christian Lohmaier <email address hidden>
Tested-by: Christian Lohmaier <email address hidden>

68c85f3... by Michael Stahl <email address hidden>

sw_redlinehide: fix assert caused by buggy lcl_ModifyOfst

converting ooo67907-1.doc to ODT asserts in fillSoftPageBreakList()
while mapping an invalid (too large) GetOfst() of a follow frame.

There are some problems with the lcl_ModifyOfst() implementation and
usage:

1. the implementation iterates over all follows; but the follows will
   get the same SwClientNotify() call as the frame itself, so in effect
   the follows' Ofsts will be modified multiple times

2. the calls to lcl_ModifyOfst pass in a positive nLen whether the
   text is deleted or inserted; surely for deletions the Ofst should be
   subtracted from instead of added to

3. the special-casing of RES_DEL_CHR to COMPLETE_STRING while
   RES_DEL_TXT uses the length does not appear to be justified

The assert happens since b15f1ed2a1df45a57b587ac90efa90c1c18866fc
but the lcl_ModifyOfst logic never made sense.

Change-Id: Ie92628515bbee0fcc2123eb412057d8c0fd0b2f1
Reviewed-on: https://gerrit.libreoffice.org/66679
Tested-by: Jenkins
Reviewed-by: Michael Stahl <email address hidden>
(cherry picked from commit 0acde7514e666fc04805fd36503bd174162336ca)
Reviewed-on: https://gerrit.libreoffice.org/66683
Reviewed-by: Thorsten Behrens <email address hidden>
(cherry picked from commit d246374dc71ee557de5811e1971a82e0f6145509)
Reviewed-on: https://gerrit.libreoffice.org/66722
Reviewed-by: Miklos Vajna <email address hidden>
Reviewed-by: Christian Lohmaier <email address hidden>
Tested-by: Christian Lohmaier <email address hidden>

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

update credits

Change-Id: Ib5e07977b6dd15b533e94185ecb80d0d6587b7c7
(cherry picked from commit 2a4cba62438de7f3dc2ccc79cd2ee013a99bb990)
(cherry picked from commit 09f7cc59735ce0f43fb4f6a531feccf732cc25f0)

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

Resolves: tdf#122889 Mail config dialog is empty

revert...

commit 7ec12ce7e449d7849b3e67c443783110e2a50a17
Author: Caolán McNamara <email address hidden>
Date: Fri Sep 28 20:24:35 2018 +0100

    weld SwMailConfigDlg

the contained page needs to be converted first

Change-Id: I9788132b0ad11cec853be7339be1829386794511
Reviewed-on: https://gerrit.libreoffice.org/66785
Reviewed-by: Xisco Faulí <email address hidden>
Tested-by: Xisco Faulí <email address hidden>
Reviewed-by: Mike Kaganski <email address hidden>
Tested-by: Mike Kaganski <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>