Change-Id: I60f54523f927e97d739a4c735e54b2cc3400aff3
Reviewed-on: https://gerrit.libreoffice.org/20436Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>

(...in the Windows-specific code path)

Change-Id: I5984ecd88a12d3f22aecaa685bd552f4235fb13d
(cherry picked from commit 00daa67d)
Reviewed-on: https://gerrit.libreoffice.org/20474Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

Change-Id: I30bbf7bab8cb37422fd20a25741e564500faa31c
(cherry picked from commit 742c2370)

Change-Id: I02e507f4b7d78efacc5b735ca24adb83633749b9
(cherry picked from commit dcbef55a)
Reviewed-on: https://gerrit.libreoffice.org/20479Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: I41b8514a127d463ac951e5855f09416fa0456b1b
(cherry picked from commit 85a2cd37)
(cherry picked from commit 34a03c67)
Reviewed-on: https://gerrit.libreoffice.org/20471Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

Change-Id: I8ba75fcd2f98a49fe9d620af6b248f32911d7fe8
(cherry picked from commit de7018f7)
Reviewed-on: https://gerrit.libreoffice.org/20464Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Change-Id: I74f4c4507bbe6abe7618ca41764715b3b5c68b5b
(cherry picked from commit 20d8267a)
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

Right click on a field in Type Formatting (Base, paste a table from Calc for eg)
makes a popup which takes into account now if the field is a primary key or not.

Handles multi-fields primary key, too: the selected fields must be exactly
those in the primary key, no more, no less.

Cherry-picked from: b0658929

Change-Id: I545b946bccd3fc02f4f6c3bdb99f914d181a3d40
Reviewed-on: https://gerrit.libreoffice.org/20410Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>

This is a combination of 4 commits.
Omitted are 2246f478 and
7340872a that replace the Calc code with
calling the new SvNumberFormatter functions.

introduce SvNumberFormatter::FillKeywordTableForExcel()

... to conflate the places that do this on their own.

(cherry picked from commit b5554804)

use proper case "General" keyword

... Excel doesn't seem to care though.

(cherry picked from commit ea1db935)

introduce SvNumberFormatter::GetFormatStringForExcel()

Taking implementation from sc/source/filter/excel/xestyle.cxx
GetNumberFormatCode(), slightly modified to ensure valid conversion and
force en-US locale data. Also don't unnecessarily convert if format is
for system locale and system locale is en-US.

(cherry picked from commit 2011b541)

Resolves: tdf#96072 export Chart format codes in Excel notation

As for the change in chart2/qa/extras/chart2export.cxx
Chart2ExportTest::testAxisNumberFormatXLSX() unit test: also Excel
writes string parts of format codes quoted, including minus sign in
negative subformat.

(cherry picked from commit 509cfa40)

3697a808d8fee2417f0b0e03dba2b94ceea133dd
9223eaa655132b4106a35c94cb0005559d7575b1
201bb012df818129cbc65de0eee8eca59e57d829

Change-Id: Idde2173780e0515ad982b4be46fc4df23a7577ad
Reviewed-on: https://gerrit.libreoffice.org/20249Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

When drawing a multiline edit we need to use a different device
(current window) to get the correct font and adjust for the Draw
method's input device.

Change-Id: I7993790c02d10e4283c7a4e2caefff0c7747e978
(cherry picked from commit 6c417274)
Reviewed-on: https://gerrit.libreoffice.org/20332Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

bAll (ie "Find All") seems a little tricky for GetBackward but not for GetRowDirection method

Change-Id: I47d2b378fb493bcdc1ad30902a3a677eedc50789
Reviewed-on: https://gerrit.libreoffice.org/20067Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 71f0e4e5)
Reviewed-on: https://gerrit.libreoffice.org/20105Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

Change-Id: I41b0ce2a024d7cc850fb7a380c992167fa004e72
(cherry picked from commit 44286a37)

Change-Id: I37fb62a53338a7edcac1c72153eefcee6096e6f9
(cherry picked from commit 12993544)
Reviewed-on: https://gerrit.libreoffice.org/20340Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

(cherry picked from commit d46203b5)

Conflicts:
	sc/source/core/data/formulacell.cxx

Change-Id: I17283fc5e39da2d7222c302dd63522df69d0ad96
Reviewed-on: https://gerrit.libreoffice.org/20328Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

its a (very) expensive operation.

Don't call it ~20 times on startup, instead call it once when the user
actually opens the styles dropdown.

(cherry picked from commit e8bcffc7)

Change-Id: I7bb28d0739bf917d23041f384f60a39a7ed5cbea
Reviewed-on: https://gerrit.libreoffice.org/20349Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

(cherry picked from commit 12fc5b85)
(cherry picked from commit 7587f8ba)

Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57
Reviewed-on: https://gerrit.libreoffice.org/20354Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: Idc9e8fd0c35de48a2366dca3850bcc4e69ef997f
(cherry picked from commit afc565bf)
(cherry picked from commit 46c5197f)
Reviewed-on: https://gerrit.libreoffice.org/20368Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

When an unloaded linked picture comes into the visible view
(including repainting a page), SwNoTextFrm::PaintPicture()
starts a thread to load it in the background using the
TriggerAsyncRetrieveInputStream() method of the graphic node.

To avoid to start a second thread on the same graphic node,
TriggerAsyncRetrieveInputStream() checks mpThreadConsumer,
the graphic node member variable for the possible thread object.

The problem is that when the thread finished and
SwGrfNode::UpdateLinkWithInputStream() reset mpThreadConsumer,
the graphic object of the graphic node is still in unloaded
state (its type is GRAPHIC_DEFAULT or GRAPHIC_NONE instead of
GRAPHIC_BITMAP or GRAPHIC_GDIMETAFILE) for a while, because
its modification is solved asynchronously after several
SvFileObject::GetData() calls. In the intermediate state
of the graphic object, with the high priority repaints of
the new scheduler, PaintPicture() could start new thread
to load the image again.

Using the new member variable SwGrfNode::mbUpdateLinkInProgress,
this patch will prevent the graphic node to start newer thread
unnecessarily.

Change-Id: I9433f0fa4613294103a00a3955fc2f35d8863b59
Reviewed-on: https://gerrit.libreoffice.org/19974Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

Change-Id: I222bd8bb4c647c2c7d2a673b95e4c9be3234ef86
Reviewed-on: https://gerrit.libreoffice.org/20273Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Presumably that was the intent?

(cherry picked from commit a933990a)

Change-Id: Ibfca90041d6913827d2f329bab448afe4d725b46
Reviewed-on: https://gerrit.libreoffice.org/20289Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

...called from within the signal handler, so any bets are off

Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6
(cherry picked from commit 9b3ca276)
Reviewed-on: https://gerrit.libreoffice.org/20282Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

(cherry picked from commit 50386403)
(cherry picked from commit 6408b735)

Change-Id: I006c739a9dc876dd9ec83375f76fd1343b39557a
Reviewed-on: https://gerrit.libreoffice.org/20312Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

(cherry picked from commit 2ca429e7)

(cherry picked from commit 9401a065)

Change-Id: I3b8620a4d8bffeb5e0558c35cb3a063238c12ba5
Reviewed-on: https://gerrit.libreoffice.org/20311Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

But you can use SAL_OVERRIDE instead.

Change-Id: I2697593606ef3ff63f923e364d0ea7e5661b1b3a
Reviewed-on: https://gerrit.libreoffice.org/20297Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Because i'm an idiot i pushed a commit without looking at the jenkins
build failure...

Change-Id: I8e7a02d6c1d20c2231288ea050986064f1f814c8

This is the same problem that

commit 133e04fc
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Wed Jun 17 09:23:32 2015 +0100

    Resolves: tdf#91880 Invalidate graphics when the gtk window is destroyed

    not just when the GtkSalFrame is dtored

tried to fix, but that just made it more unlikely to fail

(cherry picked from commit 26c32cfe)
(cherry picked from commit aab8bed7)

Change-Id: Icba750c787adb6cd5c5ed0874ef07e6201c4cf25
Reviewed-on: https://gerrit.libreoffice.org/20231Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

partially cherry-picked from the
commit 187445b2

Change-Id: I9e74fb41448c6be0b8daa6c0f8a0e207be0be6d6
Reviewed-on: https://gerrit.libreoffice.org/20250Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: Id33d9aacdf647b4b1eb414970089b1e157f1a86a

Change-Id: I723122069541bc5752164554e693268267969b1a
Reviewed-on: https://gerrit.libreoffice.org/20240Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

Change-Id: I6f999f36d6ef57dadddd774e6ef60ceb9cb8033c
(cherry picked from commit 9affe65c)

Change-Id: I58d60ee1121fcd1bf84ef998ed9116386dc3c70f

Project: translations  6d28ea63432c6b5844f224f68276096be053c1a3

update translations for 5.0.4 rc1

and force-fix errors using pocheck

Change-Id: I4d6d82a8ed09f9eb5874108b27ab758455a13566

Regression from commit 2b78f2cd (rhbz#988516:
DOCX import: fix context stack when importing header/footer, 2014-03-05),
though that just made an existing Writer layout problem visible.

RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those
import pictures as sw graphics, not draw ones.

<w10:wrap type="through"/> is normally mapped to our page wrap (as it uses
"through" in the "not only wrap around, but also in the holes of the shape, if
it has any" context, not in our "text should go through it, so no wrapping"
one), but for some reason in this case (most probably due to the extreme large
negative margins) Word handles the situation as our through, i.e. the text
should not go to the second page, as it would normally happen with a "Word
through" wrapping.

Work around the strange situation by ignoring the wrapping request for extreme
top margin values.

(cherry picked from commit 37b5f1ed)

Conflicts:
	oox/source/vml/vmlshape.cxx
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937
Reviewed-on: https://gerrit.libreoffice.org/20212Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

"(abc)|(def)" matches "def" with result offset sequences
{0,-1,0},{3,-1,3}

And thus the assert() calls introduced with
4cf1d290 and
ce91f3c1 were hit.

Change-Id: I571b6c7d47349a2cc7b1d1e34193b2865012a49f
(cherry picked from commit 4dd2d406)
Reviewed-on: https://gerrit.libreoffice.org/20174Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>

modeled on the quartz impl

(cherry picked from commit 742da70e)

Change-Id: I2f6776c14c7350954932df2bffcca36172f13473
Reviewed-on: https://gerrit.libreoffice.org/20083Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

instead of assuming they are in their final position when the
top level dialog resizes. Cause there's a timer/idle involved
so the final position isn't known yet

(cherry picked from commit d4d4e00a)

Change-Id: I713e938b0e275f181514315cb4ce4531f36191ca

loplugin:vclwidgets

(cherry picked from commit 4882664e)

Change-Id: I3e5d88bdc2ecae6164c75da8ddf1b8cfe0ed325f
Reviewed-on: https://gerrit.libreoffice.org/19796Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

CppunitTest_writerperfect_writer file libmwaw/pass/Acta_1.0.hqx uses the
font "Courier", and for unknown reasons we can't properly load that
font, because the PhysicalFontFamily::mpFirst for "courier" is null.

This causes OutputDevice::GetTextArray() to fail to create a SalLayout
and return early before initializing the passed pDXAry, which then
generates lots of DrMemory warnings.

Let's hope the callers are happy about an all-0 pDXAry.

Change-Id: I07b29a59660cf5cd060fd77da5d96021f9d8f9f5
(cherry picked from commit e6e409b6)
Reviewed-on: https://gerrit.libreoffice.org/20206Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

Needs a bit more work, so lets play it safer and default off for
windows for now and leave it on for 5.1

This partially reverts...

commit 1bc91425

tdf#93662 - allow GL by default only on recent drivers on recent windows.

Feature for triple review for 5.0.2 - enables GL by default for some subset of
very recent GL drivers, on Windows 7+.

Change-Id: I7a12540afd9f1889db15810db448db466b35241d
Reviewed-on: https://gerrit.libreoffice.org/19950Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

Unknown names make the formula fail
PythonTest_sw_python, especially set_expression is ok
Variables are taken into account

Thanks to Mike Kaganski for his help on this patch.

Change-Id: Ia6f9c54d90ce88138fd9c9df9422b34ce8223ca2
Reviewed-on: https://gerrit.libreoffice.org/20122Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>
(cherry picked from commit d667e321)
Reviewed-on: https://gerrit.libreoffice.org/20159Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

As far as I see, the surfaces created in the DX canvas are of
D3DFMT_A8R8G8B8 or D3DFMT_X8R8G8B8 format, which means that the bytes
(in memory order, on little-endian Windows) are B,G,R,A/X. So if the
desired destination wants R,G,B,A, we need to swap the blue and red
bytes.

Let's hope this doesn't break anything else...

Change-Id: I1b90d2cf95418f6557cac633ec6fce27599e8a61
Reviewed-on: https://gerrit.libreoffice.org/20161Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>