Change-Id: I862246d9c69e754bdd883787fe42c7d61a1a53d3
Reviewed-on: https://gerrit.libreoffice.org/51790Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 596fd41b)
Reviewed-on: https://gerrit.libreoffice.org/52148Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e3bcaf13)

This anchored object handling is just there to be bug-compatible with
Word, it's not needed for the case when there is a single shape in the
paragraph.

(cherry picked from commit 2c4d84e9)

Also:

Related: tdf#115719 DOCX import: fix ignore of increased anchored obj spacing

If there is only a single anchored object, then ignore only the current
paragraph, not all paragraphs of the section.

(cherry picked from commit 599ff053)

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport11.cxx

Change-Id: I5e3dc4ba9a4a6f459ec6217e8974ebc2d7303bcc
Reviewed-on: https://gerrit.libreoffice.org/52022Tested-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 da01b173)

To display the sound in the dropbox, the complete filename
(eg: file:///home/julien/lo/libreoffice/instdir/share/gallery/sounds/pluck.wav)
was compared with items of the sound list formed like this:
file:///home/julien/lo/libreoffice/instdir/program/../share/gallery/sounds/pluck.wav

See https://bugs.documentfoundation.org/show_bug.cgi?id=115407#c1

Since listbox displays only basename, let's just compare basenames

Change-Id: I5fb49990322423fa7818e5d6e1cafd828e3500ec
Reviewed-on: https://gerrit.libreoffice.org/52476
(cherry picked from commit 23c82e1a)
Reviewed-on: https://gerrit.libreoffice.org/52489Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-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 1576908d)

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

commit 7a2393f5fcab8c6938180c4718f2c61acd495528
Author: Robert McQueen <rob@endlessm.com>
Date:   Tue Apr 3 10:41:22 2018 +0100

    port to freedesktop.org 1.6 runtime

    Gtk+3/GIO/etc dependencies used by LO in "GNOME" mode are actually
    included in the freedesktop.org runtime. Try to build against fd.o
    by downgrading gst-libav (fd.o has gst 1.10 rather than gnome's 1.12),
    bundling dbus-glib and disable Gtk+ 2.

commit 42650da01f270e86bfb40035a9194b23ccf24c4c
Author: Robert McQueen <rob@endlessm.com>
Date:   Tue Apr 3 11:23:27 2018 +0100

    fix up LD_LIBRARY_PATH with gcc7

    Append to library path rather than resetting it (causes build failures
    due to overriding /app/lib).

commit 3e4c655294c8124cb54e1c651ec4dc1230b8151e
Author: Robert McQueen <rob@endlessm.com>
Date:   Tue Apr 3 11:25:02 2018 +0100

    fixup solenv/bin/assemble_flatpak.sh

    Use mkdir -p to be robust to other modules (ie dbus-glib) creating
    some of the paths before we do.

commit d1d449ffa837b1de876f524494dbce09ec92ce73
Author: Robert McQueen <rob@endlessm.com>
Date:   Wed Apr 4 15:50:49 2018 +0100

    split resource/registry data into Locales extension

    Move the language-specific data into the /app/share/runtime path which
    flatpak-builder splits into the Locale extension if we re-enable
    separate-locales. We symlink the original locations back to these paths, which
    means we have dangling symlinks depending on which Locale sutpaths are
    installed.

    Include Stephan Bergmann's patch from https://gerrit.libreoffice.org/#/c/52381/
    to make the configmgr robust to such dangling links.

commit ad6674f166c68fb79e19d80950a104a0a33f81dc
Author: Robert McQueen <rob@endlessm.com>
Date:   Wed Apr 4 16:05:28 2018 +0100

    make locale split glob more specific

    This loop will fail if the share/registry/res folder gains any .xcd
    files which are not named fcfg_langpack_* or registry_* so just to
    be safe, only glob these files.

Change-Id: Icd41d7077b9f308dbb196927715b210328709662
Reviewed-on: https://gerrit.libreoffice.org/52642Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 727bfa2c)
Reviewed-on: https://gerrit.libreoffice.org/52653Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 14d68eed)

reverts

commit 26957fc3
Date:   Wed Sep 6 10:54:50 2017 +0200

    tdf#108572 let remove storage element

    void OStorage_Impl::RemoveElement( SotElement_Impl* pElement )
    expects that m_pAntiImpl will be nullptr, if not throws an exception.
    This caused that in case of deleting embedded database used for
    mail merge it wasn't fully removed and

The problem is that by allowing the removal of the element, existing readonly
accessors are left pointing to the deleted element which causes quite some problems
as seen in this sample document

Change-Id: Ie6ac36e6dea771b02637d77b78eb8026e3bb7ae8
Reviewed-on: https://gerrit.libreoffice.org/52600Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 81820378)

Change-Id: Iac0bd81c9b0e3ac6b005bb0065895ca1b4ca4233
Reviewed-on: https://gerrit.libreoffice.org/51827Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit d7608726)

Change-Id: Ie4d81561057bb4d67fe050ca7fb82861d5d207a2
Reviewed-on: https://gerrit.libreoffice.org/52587Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit c442ac8c)
Reviewed-on: https://gerrit.libreoffice.org/52609Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 9d3444ff)

so the tooltip rectangle is wrong and doesn't shown under mutter

we could use pCtrl->OutputToScreenPixel(Point(0, 0)) here too

Change-Id: I75a717127ad75a4aac2cb9c22e526419f798ea99
Reviewed-on: https://gerrit.libreoffice.org/52654Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 7d95ef51)

Change-Id: I6ac88f26b46a17e1857b7b40d2034fb321973625
Reviewed-on: https://gerrit.libreoffice.org/52522Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 0a4c1fb6)
Reviewed-on: https://gerrit.libreoffice.org/52651
(cherry picked from commit 2c51260d)

Regression from f4fd558a
Take the chance to calculate token prefix just once.

Change-Id: I19ce5cb037198cb918e79c760a92b285f9b725f1
(cherry picked from commit 34b98af8)
Reviewed-on: https://gerrit.libreoffice.org/52621Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit c6e8460a)

Calls to statusChanged may call addStatusListener or removeStatusListener
so copy m_aStatusListenerVector on stack and iterate on the copy

Thank you Michael for having pointed these

Change-Id: I8399db84874d7f68e24c57891a9ab408e7ebef78
Reviewed-on: https://gerrit.libreoffice.org/52579Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 8fced3ec)
Reviewed-on: https://gerrit.libreoffice.org/52584Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 1e80227f)

LibreOffice doens't distinguish between sideWall and backWall.
It is controlled by the same Wall property.

Change-Id: If1919cf0a9bad3e80544cc5b2ae0f40f606febeb
Reviewed-on: https://gerrit.libreoffice.org/49429Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
(cherry picked from commit ff63bae0)
Reviewed-on: https://gerrit.libreoffice.org/50679Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 49c0d98c)

Based on OOXML implementation in MS Excel,
if Minor axis Unit is set to automatic,
then during chart import, LibreOffice should set
Interval Count to 5, to mimic behaviour of MS Excel.
Becaues default Interval Count for LibreOffice is 2,
we need to override it to 5.
With that solution, the Minor axis unit is preserved
also after saving to .ods file format.

During .xlsx export, if Interval Count is set to 5,
then treat is as automatic axis unit.

Change-Id: Iab9209fb3950ef73e79229329606363b528d35fe
Reviewed-on: https://gerrit.libreoffice.org/49327Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
(cherry picked from commit 274825b4)
Reviewed-on: https://gerrit.libreoffice.org/50676Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 40e722fd)

For 2D charts Plot Area equivalent is Chart Wall.
Unfortunately LibreOffice doesn't have Plot Area equivalent for 3D chart.
It means that Plot Area couldn't be displayed and changed for 3D chars in LibreOffice.
We cannot write Wall attributes into Plot Area for 3D charts, because Wall us used as background wall.

Change-Id: I16d3b326571c1e411a094ec799e20c7aeeb2c1d4
Reviewed-on: https://gerrit.libreoffice.org/49428Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 5b9e7655)
Reviewed-on: https://gerrit.libreoffice.org/50678
(cherry picked from commit dfd19459)

http://crashreport.libreoffice.org/stats/crash_details/f5086a7d-3c67-46e4-945e-e0882a604eee

Change-Id: Ic9ceed2e736a4ad1c155a31d3b2dc453e6a562aa
Reviewed-on: https://gerrit.libreoffice.org/52119Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/52516Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit f4082279)

Change-Id: Id7501b9adcd817ce84bfde3a928fe8b4c7e7e01f
Reviewed-on: https://gerrit.libreoffice.org/52330Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit e2e31184)
Reviewed-on: https://gerrit.libreoffice.org/52382Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit e336b705)

With current EMF+ implementation all filled figures,
does not support transparency.
This patch add transparency support for following EMF+ records:
- DrawDriverString
- DrawString
- FillEllipse
- FillRects
- FillPolygon
- FillPie
- FillPath
- FillRegion

Change-Id: I1e59ea90bdf5fafc07ff9417fccace44872bbecd
Reviewed-on: https://gerrit.libreoffice.org/52021Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
(cherry picked from commit aee19044)

This will be used by the Flatpak build, to offload per-locale data to a Locale
extension (which expects all per-locale files to be in one place, so we need to
add---potentially dangling, if a given locale is not installed---symlinks from
the original places to the location where that Locale extension stores the
actual files).

Change-Id: Id13b8c53fbc9e0763e53fd09c0c059c9e638c13d
Reviewed-on: https://gerrit.libreoffice.org/52381Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 8bd827c9)
Reviewed-on: https://gerrit.libreoffice.org/52397Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d5d9e64c)

The problem with the bugdoc is that SwFrame::GetNextSctLeaf() creates a
follow frame for a section in a table, and puts it outside the table,
below the page's body frame, while moving text frames that have the
mbInfTab flag set into the follow frame.

The situation is different from forcepoint #18 though: the frame "this"
is a SwTabFrame here, and GetNextCellLeaf() *does* return a plausible
looking follow cell frame, however it's ignored later because
CanContainSplitSection(this) is false since it's a SwTabFrame.

IIRC table-in-section-in-table should not be split anyway, so
just add a check here and return early.

(regression f8a76d21)

Revert "forcepoint #3"
This reverts commit 34627ad7
because it was just a work-around not to crash with the invalid table
frames.

Change-Id: I54692a67edade23c6b8e0a9be806728b0012a3fd
Reviewed-on: https://gerrit.libreoffice.org/51751Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 5e18136a)
Reviewed-on: https://gerrit.libreoffice.org/52383
(cherry picked from commit 20e1544a)

This reverts commit e4551b90.

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

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

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

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

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

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

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

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

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

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

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

type gibberish in character map search box, click character map widget,
crash

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

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

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

Not a complete fix, workaround.

Change-Id: If4d765eaeae3419f4f1deb4e1cfbe0113a71da94
Reviewed-on: https://gerrit.libreoffice.org/51440Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/51582Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit b8bb9a94)

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

For external images there is no always exists image type,
we need to take into account the file extension to determine
its mime type.

Added unit test.

Reviewed-on: https://gerrit.libreoffice.org/52375Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit bc906ec6)

Change-Id: I884ae18939b6def683bb318260c4e195da5bb252

Change-Id: I18d62bc3bd409ca65c85ea47e8d5b3930481edf9
Reviewed-on: https://gerrit.libreoffice.org/51732Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 717e0853)

Change-Id: Ic94891c82944d04fe3391c0bd0731a6e3e4373e0
Reviewed-on: https://gerrit.libreoffice.org/51692Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 30f57a9e)

Change-Id: I97e4e1b38d80276077b3427c90ae33023afb5e59
Reviewed-on: https://gerrit.libreoffice.org/51900Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 84d88ac8)

Change-Id: Id9089986012588690b6d5e33cd71d094ef2357dd
Reviewed-on: https://gerrit.libreoffice.org/51983Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 2e82188f)