(cherry picked from commit 65d31de7)

Change-Id: I7fdcd6336fdc7ea8149c385a177db91ffaa61c94

stinking ancient cairo impls

Change-Id: I35e826bc78556a912358dfad2fac7c45ca35bfd1
(cherry picked from commit a7a95af7)

WaE: -Werror=unused-parameter on Android

Change-Id: Ie5a4015794350a513c39a60ae650f4626d92e1b8
(cherry picked from commit b28a6372)

error: missing binary operator before token '('

Change-Id: Ieafb13245a11347cbda8a33e49ad618bf85d8a89
(cherry picked from commit 3928a151)

WaE: error: 'CAIRO_VERSION' is not defined

Change-Id: I9e4f0d0af541226089a6295962a91ca09debb418
(cherry picked from commit b51fe01f)

try harder to hide this from android tinderbox

Change-Id: I586fea9f1570b68ed789da8b10a3b46216c42969
(cherry picked from commit f1761903)

(cherry picked from commit 253c0f07)

Change-Id: Ib3c6d6689c4b79a636a3f2f0f985f3573aa46f3d

cairo_format_stride_for_width is 1.6 onwards

(cherry picked from commit 5ce9954c)

Change-Id: Ic233b4b6c7067f2473eb76b0c7e520cfe1dfcd14

No trailing characters must be present in 1:1 or A:A full row/column
references, e.g. 2:2,2 is not valid. The original cause is the lexical
analyzer that accepted 2,2 as the second part after the range operator
because ',' is also the group separator here, which needs further
changes.

Change-Id: Iff354469f7dcb4e0b6fa645c39cc1f8ebad4a6ea
(cherry picked from commit c48af2b5)

Change-Id: I6a41ae2b8056737008add98c35d06f3859e71171
(cherry picked from commit f47bff9d)

Change-Id: Icda700e80aa3a48ea77b2bc90d73c37b67b62ba8
(cherry picked from commit 5fbe0fa0)

Change-Id: I502d3d2490be5307364dee59c7ee36c0fb7ef55f
(cherry picked from commit df7595a5)
Reviewed-on: https://gerrit.libreoffice.org/16472Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

Change-Id: Id41ca0bd6adc8152c29be4d89e9361d8fb2ffe4e
(cherry picked from commit 420ed9cb)

... as a fallback for named expressions during document import when cell
content isn't available yet.

Change-Id: I134ac2aaeb5f336703edbadfd6664d916d2c5885
(cherry picked from commit 4fc13975)

Change-Id: I753a4511aa2c1e37b83094189902ce7031d68c04
(cherry picked from commit cd348679)

... in import sequence.

Change-Id: Ib5601af281f0378d283ecd61fa71c41e6c1be254
(cherry picked from commit 58b0c0cf)

Change-Id: I35de4ed31bfb9830f52aa5a25ea12bdf719c56ef
(cherry picked from commit a469002a)

Change-Id: Id80b9e8d1f54a8b795d0f4209bdf2f980f9a5344
(cherry picked from commit 044f7907)

Kept only on insertions and deletions, but even that may not be useful
as the names aren't updated at any time so even a mere cell change will
bring this out of sync. But serves as a starting point for further
implementation.

Change-Id: Idfede4b03b9f554cd35f984502fce625c725853c
(cherry picked from commit 98ba3367)

Change-Id: Ibc36078313a9ee2482e392de18abfe77f3d0df48
(cherry picked from commit f640893b)

Change-Id: Iede5ae0269a2bb2e4f2e6cef4af50d57e200938d
(cherry picked from commit c4270080)

So that we can know if the output is a virtual device that will end up
on the screen (due to double buffering) or a "real" virtual device.

Change-Id: I1e8eeddfb19c374363b98786c26836e1f3236e7f
(cherry picked from commit f2c84d41)

Change-Id: Id7a975cff09066bd796a7fbdee63393266c1843e
(cherry picked from commit cc9e9219)

Change-Id: I530d98a425adb32e2c8e1e4d012130f68f6c90a1
(cherry picked from commit 2fb93c64)

Change-Id: I0d56649cf322b7769f77ccd99be367cd813570ea
(cherry picked from commit 1d1c0632)

Change-Id: I75a532e85ce4caa3fe199669054a9811e3e5144a
(cherry picked from commit f25ee3ce)

(cherry picked from commit f7a7a9dd)
Conflicts:
	sal/qa/rtl/strings/test_strings_replace.cxx
	sal/rtl/ustring.cxx

Change-Id: I745b09d8a248f08afdd3387f4cfcf69d71ec3c39

Change-Id: I625722d3c9e915c0f90265c5036e7c03fe9052df
(cherry picked from commit a8be3fba)

Change-Id: Ib0cb2a34b87c661dc9343e5458fb933496a792dc
(cherry picked from commit 73d9cc8c)

Change-Id: I5fa32922fffcd027ddf1c61fe0b122fa2d320d98
(cherry picked from commit 715b4bbc)

Change-Id: I8e0bbab7d7497ed7c136ddbfba73618834d5a204

Change-Id: I46c57a14fd94738e51e65c482c903c2debe868b8
(cherry picked from commit 9a4881a1)

Change-Id: Ifb95f76f518646e32d1df45a77f146ad3a255087
(cherry picked from commit 6055eb2c)

The python tests currently use the default desktop-dependent vclplug,
but should use svp like every other test.

Apparently there's no way to pass command line parameters through
python, so set SAL_USE_VCLPLUGIN=svp.

Change-Id: Idb9afd87a1721c5188aeecd9b1f83521f6431757
(cherry picked from commit a9833ee9)

The PythonTest_dbacces_python in a clang ASAN build on F21 started to
fail with StackOverflowError in JNI_CreateJavaVM on the main thread,
and this fixes the problem.

Seen with java-1.8.0-openjdk-1.8.0.45-39.b14.fc21.x86_64

Change-Id: I87dfb4b62d547b334c19261aad88b4856489776f
(cherry picked from commit bb639993)

Change-Id: I261596e5d20360ecfaf57f9ddc4419ca305e3194
(cherry picked from commit 5cfc5878)

Change-Id: I6805178d2a344243d487ace3331ca71b667cd819
(cherry picked from commit 87d35929)

a hold over from before
6efb7f65
I believe

Change-Id: Idea86f782cad4da98bbe4308968277886923ee5e
(cherry picked from commit 3d02b2c2)

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

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

Change-Id: If644b80870c82b786168c67390cd440030e2d841
Reviewed-on: https://gerrit.libreoffice.org/16389Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>

Commit 3d7e168a (n#783638 DOCX import of
wp:inline's distT/B/L/R attributes, 2012-10-11) was about a picture that
had non-zero spacing in LO, but zero in Word. The hope was that the
problem is just that the value is not imported.

Then commit a88ac708 (fdo#63685
wp:inline's distT/B/L/R is in EMU's, not twips, 2013-04-19) was about a
picture that had so large spacing that the picture become invisible.
Fixing the unit of the spacing value made the picture visible again.

What was missed is that this value is just stored in the doc model, but
layout in Word doesn't use it at all till the anchoring is as-char.
Given that in LO as-char anchoring supports real spacing, just don't
import these values to have the same layout. That's what the WW8 import
does, too.

Change-Id: I1244269e06c5d190e8340349ddc12ae7b0572a4d
(cherry picked from commit 9781a878)

This avoids painting the first few menu items in really large scale on
the whole window after window resize.

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

This is a squashed commit of:

* Breeze: split Cell icon
* Breeze: this is a duplicate of lc_ResetAttributes (lc_SetDefault)
* Breeze: Endnote with i instead of 1 as sifr
* Breeze Signet - Icon is missing the ribbon part (StarShapes.signet)
* Breeze: StartCenter close icons
* Breeze: insert missing icons from the standard toolbar
* Breeze: Add new icons for formatting toolbar
Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

The original code used 15 elements for positions, the 'repaired' one
lost 10 of them.
Also, do not try to be too smart and be verbose, letting the compiler
perform optimizations

(regression from 1b0f7ee1)

Reviewed-on: https://gerrit.libreoffice.org/16169Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 492ff21d)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

Conflicts:
	sw/source/filter/html/swhtml.cxx

Change-Id: I0a1bc22d1abab083292de17b091c8be872fcee24

Change-Id: I5be92517831f132e5d85addcdc3ef1498719c884