df-libreoffice:distro/collabora/lov-6.1

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

Recent commits

15843ed... by Sbergman

tdf#121778: Work around odd macOS 10.14 graphicsContextWithWindow failure

Although Stephan's original commit message below talks mainly about a
unit test, this change helps at least in tdf#121778, too, and possibly
other cases.

It is interesting that wihout this change, a lot of these warnings are
printed before the crash:
warn:vcl.quartz:42670:52899343:vcl/quartz/salvd.cxx:312: No context

Original commit message:

When running on macOS 10.14, both master and libreoffice-6-1 (at least) started
to fail CppunitTest_vcl_bitmap_render_test with

> /Users/stephan/Software/lo2/core/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:90: Assertion
> Test name: BitmapRenderTest::testTdf113918
> equality assertion failed
> - Expected: mcBlueOrIndex: 255, mcGreen: 255, mcRed: 255, mcAlpha: 0
> - Actual : mcBlueOrIndex: 1, mcGreen: 112, mcRed: 15, mcAlpha: 0

in --enable-debug/--enable-dbgutil builds.

I tracked that down to the OSL_DEBUG_LEVEL>0--only call to
Scheduler::ProcessEventsToIdle in test::BootstrapFixture::setUp
(test/source/bootstrapfixture.cxx). If that call is also included in non-debug
(i.e., OSL_DEBUG_LEVEL=0) builds, or if it is removed from all builds and
instead an unsuspecting

  [NSApp nextEventMatchingMask: 0 untilDate: nil inMode: NSDefaultRunLoopMode dequeue: NO];

is added directly before the call to

  pVDev->SetOutputSizePixel(Size(2480, 3508));

at the start of BitmapRenderTest::testTdf113918
(vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:76), the test always fails.

What happens is that, after such a nextEventMatchingMask call done, the call to
NSGraphicsContext graphicsContextWithWindow in AquaSalVirtualDevice::SetSize (as
called from the SetOutputSizePixel call in the test) returns nil, for unclear
reasons.

Until those underlying reasons are understood, change the code of SetSize to
"fall back to a bitmap context" also in case the graphicsContextWithWindow call
returned nil.

Reviewed-on: https://gerrit.libreoffice.org/61519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <email address hidden>
(cherry picked from commit e659c6a1857fbb8e5a6e8ff60fe241483eea32dd)

Change-Id: I604ebd2c444b58610e4ed73ec70af87b0a08e864

f3ad7d6... by tml

For some reason drawing the SVG logo takes several minutes so don't do it then

For some reason it does not happen in the TDF build of 6.1, but does
happen in the LibreOffice Vanilla build. Whatever. This fixes the
problem.

Change-Id: Ie7a3587ece5de8ca0561ad61811c7511f43cad01

0bbc497... by tml

Don't create temp file in save destination folder when sandboxed

In a sandboxed environment we don't want to attempt to create
temporary files in the same directory where the user has selected an
output file to be stored. The sandboxed process has permission only to
create the specifically named output file that the user chose in the
system file dialog in that directory.

Change-Id: I65274b4c433bd66b436429bea4b287a0505b72c9

a6097a0... by tml

Accept also macOS SDK 10.14

Change-Id: I78039a5ab37c3759dc7c7e1413d5cb05a896d6fd

86daf60... by Christian Lohmaier <email address hidden>

Version 6.1.3.2, tag libreoffice-6.1.3.2

Change-Id: Id07425aec76991377076452a18c5e5a47bb304a2

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

bump product version to 6.1.3.2

Change-Id: Ie3a3e4ce81bbeb2f5dcd04eae583f2bff57c9c14

9e5b99a... by Christian Lohmaier <email address hidden>

update credits

Change-Id: I8a383888ae8e2da96c7eef94c40cf3ddb7815d98
(cherry picked from commit 360b557c28c7f19731d566c01627cc104d06638a)
(cherry picked from commit cb5584c8a715df8aa68cecefd0bad8d1839124e8)

74cff51... by Christian Lohmaier <email address hidden>

Update git submodules

* Update translations from branch 'libreoffice-6-1-3'
  - update translations for 6.1.3 rc2

    and force-fix errors using pocheck

    Change-Id: I8707b11ce2d130f136617e928e7b705c47721fef
    (cherry picked from commit 617684686d72dd389f37b16128deba8c5282ecc4)

1cf4d60... by Michael Stahl <email address hidden>

tdf#120376 sd: fix duplicated styles on copy/paste

Unfortunately the comparison was inverted, so a style is copied
iff it already exists, which is clearly the reviewer's fault...

(regression from 57db6e24b5ad43d447c30e44a112c74c7e75b46b)

Change-Id: I3425982feb08e980eca9243cc16120897b65a70f
Reviewed-on: https://gerrit.libreoffice.org/62436
Tested-by: Jenkins
Reviewed-by: Michael Stahl <email address hidden>
(cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1)
Reviewed-on: https://gerrit.libreoffice.org/62449
Reviewed-by: Armin Le Grand <email address hidden>
(cherry picked from commit 8bef4f3033fff8eb12a58d3fa4cdd49076e18cf2)
Reviewed-on: https://gerrit.libreoffice.org/62474
Reviewed-by: Markus Mohrhard <email address hidden>
Reviewed-by: Adolfo Jayme Barrientos <email address hidden>
Tested-by: Adolfo Jayme Barrientos <email address hidden>

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

Resolves: tdf#120003 missing prefix to link url in .doc import

regression from...

commit 9b77f8142bf665a47c3a179e3fe3f82623a99f8a
Author: Caolán McNamara <email address hidden>
Date: Thu Apr 6 15:08:45 2017 +0100

    ditch ReadRawUniString

three argument lclGetString32 variant mistaken for two argument lclGetString32
variant

Change-Id: I163aad0de7873487d9f9c8b6c28d162159fe7ad4
Reviewed-on: https://gerrit.libreoffice.org/61887
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <email address hidden>
(cherry picked from commit faf048080124a4e1c9fcb4637fa9541921c758bd)
Reviewed-on: https://gerrit.libreoffice.org/61923
Tested-by: Xisco Faulí <email address hidden>
Reviewed-by: Michael Stahl <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>