Public Git Hosting - LibreOffice.git/log

tdf#119235 svx,sd: fix drag&drop from ColorBar

This was using the SfxPoolItem serialisation of XATTR_FILL* items,
where only XFillColorItem and XFillStyleItem were actually used;
the binary serialisation was removed without being aware of this
feature.

Fix this by using uno::Any instead, rather than reviving the binary
serialisation.

Also change the clipboard format strings, just to be safe.

(regression from 97b889b8b2b2554ce33fd6b3f0359fc18f39832d)

Change-Id: I1828621a9aae606a1ca47835eef608062efe64a0
Reviewed-on: https://gerrit.libreoffice.org/62455
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 0a6813ad5d57d0df72562c797a8b0581bfd65a11)
Reviewed-on: https://gerrit.libreoffice.org/62472
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>

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 <Michael.Stahl@cib.de>
(cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1)
Reviewed-on: https://gerrit.libreoffice.org/62452
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>

tdf#120807 check for valid ImplGetWindowImpl()

Change-Id: Ia1135d11990abc303849bd1b6a549c82008c79de
Reviewed-on: https://gerrit.libreoffice.org/62260
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit db0051744330d82986e8f2629a027bc4a5dc1b4a)
Reviewed-on: https://gerrit.libreoffice.org/62280
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

keep pyuno script processing below base uri

Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7
Reviewed-on: https://gerrit.libreoffice.org/61969
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

update credits

Change-Id: I666805e38c40826328d8c4226c394d4c3072b2a7
(cherry picked from commit c3eb1c85f95168f8e84b8f655c839eff23c7e98a)

Update git submodules

* Update translations from branch 'libreoffice-6-0'
- update translations for 6.0.7 rc2

Change-Id: I2fbf6583f2f1c8cf73077a0325bfa0be3e7de893

Resolves: tdf#93372 format table in base is ignored

since...

commit b4bbb5e5d7b31caad2fbcc00382ad27df3c81001
Date: Sun May 17 22:56:46 2015 +0900

refactor how font, fg. and bg. are applied in widgets/controls

revert the relevant piece, in this case there are two Windows/Contexts getting
their settings manipulated, rather than the usual one

Change-Id: I0a228aee6aaf1f58b2235fccf14dc63ffa96dd2d
Reviewed-on: https://gerrit.libreoffice.org/61317
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 0be3a5eea3089c2b63cc821ffb282fd4ab8ec455)
Reviewed-on: https://gerrit.libreoffice.org/61525

tdf#90376 revert the dock windows' Idles to Timers

The dock windows' Timers were converted to Idles in commit
eef25e0e7c03 ("changed timers to idles"). Since the Idles poll
the mouse buttons, they starve all lower priority events.

From the comment in ImplDockFloatWin2::Move, this is a hack to
get the mouse release event from the window decorations in X11.

Change-Id: Ibba3c58dd8b3d95dbd9296cc111ab32968bee230
Reviewed-on: https://gerrit.libreoffice.org/59590
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit afd49c198769b5e7fc01a68ce7a6847aa0d0ddd8)
Reviewed-on: https://gerrit.libreoffice.org/60720
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit e3a745f7604b084a7bb5fb6f18d5b50b5e137a98)
Reviewed-on: https://gerrit.libreoffice.org/61466

sw: fix invalid cast in SwEditWin::RequestHelp()

This results in a garbage OUString.

Change-Id: I03b8030a812d7016df5c29f1341749fbdedf1729
Reviewed-on: https://gerrit.libreoffice.org/61652
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit bf0276f0b53c01ac434fef88e97f6b0dd4c41787)
Reviewed-on: https://gerrit.libreoffice.org/61674
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

ofz#10879 stay inside sSecStr bounds

Change-Id: I0ca70cdb9b80305c5339668d65d2c4c9977e7160
Reviewed-on: https://gerrit.libreoffice.org/61606
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

bump product version to 6.0.8.0.0+

Change-Id: Ida05fd143fbb2a5f8f1a307e888daa4144d45ee5

Update git submodules

* Update translations from branch 'libreoffice-6-0'
- update translations for 6.0.7 rc1

Change-Id: I3d8c568a8fd73465e47c0334ad02679652128020

Resolves: tdf#119954 do not copy the old parent, init with new parent instead

The parent is always the ScDBCollection that contains the
ScDBCollection::NamedDBs container, not the one the
ScDBCollection::NamedDBs was copy-constructed from.

Change-Id: Ia409347f3aeb9ad7a5e68da7af727adfac98d6a2
Reviewed-on: https://gerrit.libreoffice.org/60833
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 7ea5d339dc4d8412f436f3affa589bfbd0b1ef68)
Reviewed-on: https://gerrit.libreoffice.org/60842
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

tdf#118786 WIN just assert in Yield

This reminds me - again - that Jenkins doesn't run make check.

It turns out InSendMessage() also returns true, if you process a
nested SendMessage in the same thread. Therefore we have to
remove the SalComWndProc assert and just keep the one in the
Yield call.

Why? Because there seem to be no way to get the information
ReplyMessage has access to, so we could detect the caller /
origin of the send message and implement proper nested call
checks. The alternative would be to change all call sites of
SendMessage to:

if ( !pSalData->mpInstance->IsMainThread() )
SendMessage(...)
else
SalComWndProc(...)

which is the same SendMessage already does.

Change-Id: I991d68a64952dc5d47ba51edd8635c9e8c46614c
Reviewed-on: https://gerrit.libreoffice.org/59538
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit bf0a63dc93a746a008fb1656457c77de8df693ba)
Reviewed-on: https://gerrit.libreoffice.org/59565
(cherry picked from commit a42c65176f2791cf5e48578a8898bf03185adc89)
Reviewed-on: https://gerrit.libreoffice.org/60726
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#118786 WIN allow nested SendMessage calls

This bug trips "assert( !pInst->mbNoYieldLock )".

There is already a special case, introduced in commit 4baec725e0dc
("WIN run main thread redirects ignoring SolarMutex"), to prevent
tripping the assert for a nested SendMessage call.

So this implements a general solution for nested SendMessage calls.
We just have to prevent yielding in a call from an other thread,
as the sending thread still owns the SolarMutex.

This way we can also drop the special handling in
WinSalFrame::ReleaseFrameGraphicsDC.

Conflicts:
vcl/win/app/salinst.cxx

Change-Id: I7024b081b26f3545af12a3a3a038fe5e5671af3c
Reviewed-on: https://gerrit.libreoffice.org/59275
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 35a254750392dcd738481f5d6e8719cee9fb41b3)
Reviewed-on: https://gerrit.libreoffice.org/59318
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3e392904c558d1f9fc91926511d148762813537e)
Reviewed-on: https://gerrit.libreoffice.org/60725
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#119458 reorganize sw background Idle handling

This is the squashed version of the following commits:
- ce68889678bc tdf#119458 always start the SwDocIdle
- 107f0e6dba57 tdf#119458 fix sw background Idle state handling
- 771544544ee1 tdf#119458 fix sw background Idle unblocking
- 3bd8316718fd tdf#119458 just wakeup Scheduler on active Idle

While the first commit was really wrong, the third is just an
optimization to prevent unnecessary wakeups and Idle task
interrups from new calls to StartIdling(). The 4th one contains
the reset of the Idle state on run, which was probably the main
origin of the problem and allows to wake up the Scheduler
without moving the Task to the end of the queue.

Starting the SwDocIdle in StartIdeling() just reintroduces the
bug fixed in commit 401cba4c20fb ("tdf#116370 cleanup Writer idle
job handing"), so trading one bug for the other.

For the real solution we have to handle two states:
1. The SwDocIdle being active
2. The SwDocIdle being blocked

For the first state we can just use the active state of the Idle
itself. Since it's not a AutoIdle, it will be turned of, if
invoked. Either some Idle handler will want to be run it again or
some other thread might start it again, if needed.
Since we're now tracking the wanted Idle state via the active task
flag, we can drop the explicit mbStartIdleTimer handling.

As a result of the first change, we can't stop the Idle anymore
when blocking it. But the Idle itself checks its ready state via
IsDocIdle() in its UpdateMinPeriod function, so we have to add
the blocking state to IsDocIdle().

But we can't handle the correct state when blocking via a tasks
mbActive bool, as this also schedules the task and starts the
scheduler timer. So reintroduce a bool for the unblock state.

This should prevent fdo#73165, which I couldn't reproduce, but
just to be sure.

More importantly this patch resets the m_bStartOnUnblock when
the Idle job actually runs. This run should already determinates
if more Idle work needs to be done, and others can still call
BeginIdling() to ensure further processing.

Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/59536
(cherry picked from commit ce68889678bca3b51c258452f7bfdd21982e4a0d)
Reviewed-on: https://gerrit.libreoffice.org/59586
(cherry picked from commit 107f0e6dba57a5b27366a35a5cdb184079546df0)
Reviewed-on: https://gerrit.libreoffice.org/59692
(cherry picked from commit 771544544ee13ec98961f93b5313a7d2e29429cd)
Reviewed-on: https://gerrit.libreoffice.org/59730
(cherry picked from commit 3bd8316718fdfed454c01a9c4ae6af6beb34437d)

Change-Id: I2d4328f31644017b09786ff4cba45cf7643f0a4b
(cherry picked from commit f1fb30cf43eda45137ab96177238a29c3725789d)
Reviewed-on: https://gerrit.libreoffice.org/59757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 20e46a6ca5b62f7177f799eae9e0f26e659fd03b)
Reviewed-on: https://gerrit.libreoffice.org/59769
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 3abec366a3fdb8657d69e24b69b4338121f80b22)
Reviewed-on: https://gerrit.libreoffice.org/60724

tdf#116370 cleanup Writer idle job handing

This prevents the start of the idle job, while processing itself,
so the fixed WinSalInstance::AnyInput of commit 3bf6c97029d2
("tdf#112975 WIN correctly handle VclInputFlags::OTHER") won't
report the timer events of the re-started idle job to process.

Fixes the early abort of the background job, which resulted in
the busy loop of the reported bug and this strange printing
behaviour.

P.S. I'm not sure, why this was just broken on Windows.

Change-Id: I6503dcd925c9a0ed843e794a31eea32a4a4b2889
Reviewed-on: https://gerrit.libreoffice.org/59279
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 401cba4c20fbc930f034168872642428d7459218)
Reviewed-on: https://gerrit.libreoffice.org/60723
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

tdf#120028 PPTX import: map shapes with multiple columns to table shapes

This is a combination of 3 commits.

1st commit:

Longer term the core Impress shape has to be improved so that it can have
text in multiple columns.

Shorter term, map text with multiple columns to table shapes, that gives
correct layout in many cases and requires changes to the import filter
only.

(cherry picked from commit aef569ed83a3ccc02639e5b2a1c7cc131ba262fc)

Commit #2:

Related: tdf#120028 PPTX import: fix font size of multi-col shape text

Normal shapes have a TextFitToSize property for this, but table cell
content has to be scaled manually, as the rendering has no automatic
support for them. Luckily the file format has the info we need to scale
at import time.

(cherry picked from commit c8b2849d140677f7b35523096eb2bc715b3dc507)

Commit #3:

Related: tdf#120028 PPTX import: fix font color of multi-col shape text

Not just font color, anything defined via list styles were not imported.

(cherry picked from commit 800bf1071a30955ff70373b2fb5886eadce59dee)

Conflicts:
oox/inc/drawingml/textbodyproperties.hxx

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

ofz#10523 guard aginst 0 pF->nLCode

Change-Id: I8ef476e06f54ddd57be907488a8a65314abda3ee
Reviewed-on: https://gerrit.libreoffice.org/60828
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#118502 Fix loading of eps images with replacement graphic

Change-Id: Iaf9c8e2ed72115e1f82d2541ae2a1d4803795a46
Reviewed-on: https://gerrit.libreoffice.org/60752
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 088af44063c3e2d1d0e7744a9f9bd7b37ff58a75)
Reviewed-on: https://gerrit.libreoffice.org/60768
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

ofz#10526 check with dynamic_cast its really a EMFPStringFormat

Change-Id: Ifbe81b851b17858a915105c102af6f4d8f2c81fa
Reviewed-on: https://gerrit.libreoffice.org/60800
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

update credits

Change-Id: I1a8c8bc20ee7e97b47f0602dcfaa3cb1b771de8f
(cherry picked from commit bb26bd6148ef7c60d6280b4848c017ba63775242)

tdf#119881: Check if Unity/Gnome is separated by colon in XDG_CURRENT_DESKTOP

Change-Id: Ie29c2213d8efccd7750396325ce05b4909c09d02
Reviewed-on: https://gerrit.libreoffice.org/60592
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 79093cce6c3a65f84bbafd172b1e9e6702d3ce75)
Reviewed-on: https://gerrit.libreoffice.org/60678
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

tdf#119875 sw: fix invalid pos of frame after 0-sized section with laycache

The interesting part of the layout of page 2 is:

- frame #40 is a section frame with a text frame which is in a list
("A")
- frame #48 is a section frame after that, with the same top=19213

Given that frame #40 has height > 0, they overlap when the page is
rendered. What happens is:

- frame #40 grows
- there are other section frames between #40 and #48 in-between, but
they don't have an SwSection
- these frames are skipped
- then the position of #48 is invalidated

So the next time we calculate the position of #48, we look the last
skipped (previous) section frame (which still has top=19213, since its
position was not invalidated above), and since its height is 0, we
conclude that our current top=19213 is valid after all.

This is like this since commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62
(initial import, 2000-09-18), so leave the code there that invalidates
not only the next frame, but all the way down to the first
non-SwSection-less-SwSectionFrame. But instead of just invalidating the
last frame, invalidate the in-between SwSection-less-SwSectionFrames as
well.

In practice this did not cause a problem in case the document has no
layout cache. If it does, then the frames are created on pages hinted by
the cache, then later moved to their final place. In practice this bug
was visible only in this later case. (I.e. such a layout cache can be
only created if the machine that saved the document last time does not
have the fonts needed by the document installed; and then the document
is opened on an other machine which has those fonts.)

(cherry picked from commit b5937112d4035fb9ffb472e1bf36567d9c78c820)

Conflicts:
sw/qa/extras/layout/layout.cxx

Change-Id: I02ae9f63d0b4b5e9d014df53ed2cf21a04b15090
Reviewed-on: https://gerrit.libreoffice.org/60658
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#118881: Fix HTML parsing for personas

This is just a band-aid to make personas feature
work again.

Change-Id: I80b54fe9a8ddc93d93744fcf2c7f739d81f6face
Reviewed-on: https://gerrit.libreoffice.org/60432
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>
(cherry picked from commit e98ac43ec42ff398ad489d6719960d595f0327be)
Reviewed-on: https://gerrit.libreoffice.org/60468
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 2f52a8e0f1098a51631434129707cfb0b60fecb3)
Reviewed-on: https://gerrit.libreoffice.org/60481

sw: tdf#119742 fix null pointer in SetCursorInHdFt

In SwWrtShell::ChangeHeaderOrFooter the ChgPageDesc destroys the frames
of the header, that's why GetCurrFrame returns null later.

Change-Id: I26915237c8b455a5b8ad0bbd5c2de38537dfef08
Reviewed-on: https://gerrit.libreoffice.org/60130
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 77d075facaf4fc8954666ad541ed14f75d964fba)
Reviewed-on: https://gerrit.libreoffice.org/60302
Tested-by: Jenkins

tdf#114400 Import drawoo:fontwork-xyz attributes

Either the document has attributes in the old namespace or in the
new, both will be imported. But export is still in the old
namespace.

Change-Id: I9f4d1ca0d8af37c13b513f99cc7d254c68867bb2
Reviewed-on: https://gerrit.libreoffice.org/59405
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 278e66488135c8fa2714520d056573c64ea803cf)
Reviewed-on: https://gerrit.libreoffice.org/60207
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

update credits

Change-Id: I946580363eb272f95694b000d6daa997e761285d
(cherry picked from commit 01b19afeceb417e258df771677c65c36210a7c4d)

upgrade curl to 7.61.1

Reviewed-on: https://gerrit.libreoffice.org/60042
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit d15d3ce697e88e72cec84b5b9b9619a37a8ae7ed)

Conflicts:
download.lst

Change-Id: I4590f5f705dd08c63a1532ce5afa94a3af953f24
(cherry picked from commit 2a3c28b37dcdce35c35af2b91483b08746a1597b)
Reviewed-on: https://gerrit.libreoffice.org/60055
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Properly encode OAuth2 credentials

Reviewed-on: https://gerrit.libreoffice.org/59986
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 33f7485dedea90e0f80c6348fa8ac5f27c5052e0)
Conflicts:
external/libcmis/UnpackedTarball_libcmis.mk

Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5
Reviewed-on: https://gerrit.libreoffice.org/60017
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

ofz#10189 check container size

Change-Id: Ie99e3b082795989290799d057a99b1bcff94b161
Reviewed-on: https://gerrit.libreoffice.org/59913
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#112454 Also consider last SCTAB in loop

Since 'rRange.aEnd.Tab()' is valid, it needs to
be included in the loop to get a valid result.

Reviewed-on: https://gerrit.libreoffice.org/59798
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 03b361673d04f31e0602d2988e4df26eaeb53a34)

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

Backported.

Change-Id: I7b2447e059dc03444c56e7fc0b113e1b618dd510
Reviewed-on: https://gerrit.libreoffice.org/59878
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

tdf#117823 Save mail merge config item in new view

The config object is now saved in a newly created document.

Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0.

Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6
Reviewed-on: https://gerrit.libreoffice.org/59728
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c)
Reviewed-on: https://gerrit.libreoffice.org/59803

tdf#118058 sw, sections in tables: no split for multiple columns

The original use-case was "group a few paragraphs together" for the
split sections inside tables, i.e. it's safe to not split when the
section has multiple columns.

And the multiple columns case would mean that we don't find where to put
the follow section inside a table, resulting in a layout loop.

Reviewed-on: https://gerrit.libreoffice.org/58951
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit d2d996db4806e84ae0bf6aef1c285b498f2d2867)

Conflicts:
sw/qa/extras/layout/layout.cxx

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

tdf#96469 Export Data Point properties in Charts on DOCX/XLSX

If the color or other property of a datapoint in the chart
deviates from the dataseries property, this patch will write it
into a separate dPt tag and fixing the lost properies during
OOXML export.

Reviewed-on: https://gerrit.libreoffice.org/58806
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Tested-by: Jenkins
(cherry picked from commit 15035b98dc694bde4c4073fa75bdd2ce9d7e6670)

Change-Id: I3d975675ac3691fcafe76de16e46851561eb2807
Reviewed-on: https://gerrit.libreoffice.org/58807
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>

tdf#117426 don't crash is infobar is disposed in preview view

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

Resolves: tdf#119402 +- typo sign flip

Regression from

    commit 667aa6ade94a4dee441868d21db037e42c871932
    CommitDate: Wed Jul 19 20:13:58 2017 +0200

        Avoid temporary Date and normalization

that introduced a sign flip
from        +  5 - eDay
to          + (5 + eDay)
instead of  + (5 - eDay)

Change-Id: I28194296b20552135e6abd24eb9eefe8634ce7c0
Reviewed-on: https://gerrit.libreoffice.org/59461
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit cadd6c595b250b3ce0025a2a09c160eaae483d5a)
Reviewed-on: https://gerrit.libreoffice.org/59475
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Resolves: tdf#119399 add es-VE currency Bolivar Soberano VES Bs.S.

Introduced on 2018-08-20

Change-Id: I1b10a0f3b2ff8037310e7cba9caceaacb0858463
Reviewed-on: https://gerrit.libreoffice.org/59462
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 0e9bdde3c07500abb13c72d2f6bec07aae6848da)
Reviewed-on: https://gerrit.libreoffice.org/59469
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Resolves: tdf#118983 do not expand range if sheet references not affected

Change-Id: Ib207d3723ce1d370a953e652957aaed399affc9c
Reviewed-on: https://gerrit.libreoffice.org/59255
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit da0dc858fc05e7f1d6a60ca61f722044e688d4f8)
Reviewed-on: https://gerrit.libreoffice.org/59272
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Do not convert YMD date order to YDM and vice versa, tdf#107012 follow-up

Change-Id: I6362caae4dd0764a5f99f1b0453c17ecde4b53f1
Reviewed-on: https://gerrit.libreoffice.org/59213
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit a4c9e4539ee82c409add42e68329d4eb1100d62f)
Reviewed-on: https://gerrit.libreoffice.org/59244
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

tdf#119326 crash when adding "Windows Share" File resource

this was a regression from

    commit ce43d0ae9279edbf1ad108fe0d8325327a038d49
    use consistent #define checks for the Windows platform

where I converted
    #ifdef WIN
to
    #ifdef _WIN32

But that was already dead code at that point since we did not define
that preprocessor constant anywhere.

Change-Id: Ieadafd61fada05fc19d04d83992fba7c42969daa
Reviewed-on: https://gerrit.libreoffice.org/59402
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 82034b04e81b74a048595b0eac0f73581ecbc9e4)
Reviewed-on: https://gerrit.libreoffice.org/59422
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Resolves: rhbz#115937 virtual device leak

windows runs out much sooner than the other platforms

Change-Id: I8ffbe32babf8854580150edfe741b03fd43e4326
Reviewed-on: https://gerrit.libreoffice.org/59408
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

ofz: check sequence length before use

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

ofz#9917 use a WW8SprmIter to find the sprm

extend WW8SprmIter to support the needed paramater match feature and
drop the custom WW8PLCFx_SEPX::HasSprm logic

Change-Id: I5893e04402ed03493add398f0939a578807561ef
Reviewed-on: https://gerrit.libreoffice.org/59120
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#119128 toggle INSERT/OVERWRITE is broken

Regression of 632bc11ce8fab1c4046ab24810b90a7ce9ac5914
("tdf#117017 Pasting into the formula bar shouldn't
retain formatting"). Toggling the overwrite mode sets
the EVControlBits::OVERWRITE bit from inside the editeng
keyboard handler, so make sure to not override it.

Change-Id: I2b5e3fe9cb885ed20e7528fdfe2fd59f5ef05f42
Reviewed-on: https://gerrit.libreoffice.org/58658
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 92a4e4eac7520541a433e40836cafa4e29edf47f)
Reviewed-on: https://gerrit.libreoffice.org/58718
Reviewed-by: Eike Rathke <erack@redhat.com>

Related tdf#118547: Lock mark on protected sheet tab

Fix opposite case, see https://bugs.documentfoundation.org/show_bug.cgi?id=118547#c10

Reviewed-on: https://gerrit.libreoffice.org/59035
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit d064ced9e9db3f924dd954b86c40f21addab1c68)

Change-Id: I2c4e55f8929b1979e71a4040dfac1ba7cff51aeb
Reviewed-on: https://gerrit.libreoffice.org/59041
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

tdf#117795: not all elements have ChartFontName property

See bt https://bugs.documentfoundation.org/attachment.cgi?id=144114
In this bugtracker we tried to apply a change of fontname on reportdesign::OFixedLine

Change-Id: I60ee5ca9f967fc71939e2f57ecd9de7edd680958
Reviewed-on: https://gerrit.libreoffice.org/58895
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 3512079dc42a6472136f9c229fc9ea0b0033ebf9)
Reviewed-on: https://gerrit.libreoffice.org/59151
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

outer loop unrelated to inner loop

since original checkin of...

commit 9cddf9da7fb256418e1bc3b4719abb55e3b0604c
Date:   Tue May 22 15:33:44 2007 +0000

    INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED
...
    2006/12/13 12:31:03 tl 1.1.2.38: #i71244# update charts in writer

where I think this LockUnlockAllCharts chart2 loop was modelled on
the previous chart[1] styles loop of e.g. DoUpdateAllCharts which
loop over tables.

chart2 objects are unrelated to these tables, so remove the outer
loop, which then means the ofz#9689 ofz#9856 ofz9874 crashes that
made me look at it will get fixed

Change-Id: I7d7ba0a2aa257b5aa399f20d902f01306fbaecff
Reviewed-on: https://gerrit.libreoffice.org/59112
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#117127 crash on inspecting value describing a table

since...

commit f86d0413f7cedf096b285c2eb6698653dd99c21e
Date: Mon Mar 30 01:26:21 2015 +0200

SwXCellRange:: and SwXTextTable::getDataArray() do the same

which used to have more checks than its replacement

Change-Id: Id931882ef7c749ffa18ef3474e3e661ba8614ab0
Reviewed-on: https://gerrit.libreoffice.org/58978
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

tdf#119141 Revert "sc htmlimp: non-global sheet range names"

This reverts commit 5720c85ccea9f1481bd604b806c5be728e59a13f,
which was made in response to the suggestion in
comment 6 of bug 114487 and backported to 6.0.6.

But ScAreaLink::FindExtRange doesn't bother to search the
local rangenames, and the Links to External Files dialog also
doesn't give non-global variables as options.

Since this was just a "logical" change, simply revert it
to repair the regression. Any attempt to support local rangenames
is something bigger that isn't appropriate for backport to stable.

Change-Id: I8bd4dcc6492da2712e13b2e54cf81609cdc5936e
Reviewed-on: https://gerrit.libreoffice.org/58761
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 1597dbb5ba5d68b5807236c1d045f5215f221c91)
Reviewed-on: https://gerrit.libreoffice.org/59065
Tested-by: Jenkins

tdf#115086 crash in assignLabelsToDataSequence

since...

commit c45358e928b9b9419bba10a0fcb661696cb7647a
Date: Mon Apr 24 00:09:08 2017 +0200

preserve "Total" label on round-trip, remove code duplication

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

Resolves: tdf#118609 crash in calc after some manipulation through basic

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

xmlsecurity: nsscrypto_initialize: try to avoid profile migration

https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.35_release_notes

NSS 3.35 and later will automatically migrate migrate profiles from the
old "dbm:" BDB format to the new "sql:" SQLite format.

The new format can be read by NSS 3.12 and later, which is old enough that
it can be assumed to be available.

However LibreOffice still shouldn't migrate the profile on its own:
LO typically uses a Mozilla Firefox or Thunderbird profile, and if it is
a system Firefox with system NSS libraries, then it's probably a bad
idea for LO to migrate the profile under Firefox's nose, particularly
considering the "partial migration" scenario if the profile is
password-protected.

Try to avoid this by checking if the profile is the old format and
explicitly using the "dbm:" prefix to prevent the migration.

Change-Id: I06480522f830ce74e2fb7bf79fee84ad80979b82
Reviewed-on: https://gerrit.libreoffice.org/58756
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 61688aa1abd9db9adbb8dc5d5aacc6269b21fd27)
Reviewed-on: https://gerrit.libreoffice.org/58974

nss: upgrade to release 3.38

Fixes CVE-2018-0495 and "the ASN.1 code".

(Remove one hunk of nss-android.patch.1 that should be obsolete with the
current Android toolchain baseline (but that hunk didn't exist in
libreoffice-6-0 or older anyway).)

Change-Id: I5516edec17b72f53acd2749e8840805eead077bc
Reviewed-on: https://gerrit.libreoffice.org/58697
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903)
Reviewed-on: https://gerrit.libreoffice.org/58722
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

tdf#119234 OOXML Shapes from Word fail to render

regression from
commit 65e4a776e8315fd61fd67ad00d28985b11f0b79e
simplify some OUString::copy calls
I got the params switched around

Change-Id: I68da0ae681f2b886e35f74bd72de0c482c843ae9
Reviewed-on: https://gerrit.libreoffice.org/58986
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit df71ea1b01c3fd35d959053c84f615f661b69f8a)
Reviewed-on: https://gerrit.libreoffice.org/59000

Resolves: tdf#117069 crash double clicking in certain chart

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

sw: fix ignored frames in AppendAllObjs()

The problem is that AppendAllObjs() doesn't check if MakeFrames()
actually created frames, it just assumes success.

If there are frames anchored in frames, then it could go through
the circular_buffer, find a dependent frame before its anchor frame,
unsuccessfully call MakeFrames(), then call MakeFrames() on the anchor
frame, and then the vector is empty.

A surprising aspect is that push_back on a boost::circular_buffer will
silently pop the first element if it's already "full". Possibly this
is what caused tdf#112447.

1. insert section
2. in paragraph in section, insert frame
3. repeat 2
4. drag anchor of frame 1 into body of frame 2
5. edit section, click hide
6. edit section, un-click hide
7. only one frame is displayed

(regression from 575e222a1742918be052f2b716ddf57ce0008404 and/or
ce2fce9a41729774689080c8b5552b60c2e6ee2d)

Change-Id: Ie782252ac388524dfb083f655320a50e95239b24
Reviewed-on: https://gerrit.libreoffice.org/58676
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 31e66bd07c1082bb375be8aaf7835f019351d9bb)
Reviewed-on: https://gerrit.libreoffice.org/58680
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

forcepoint#69 ditch any unclosed m_pPosAfterTOC before dropping cursor

Change-Id: I6b56a48f5449b25fe3bdc2e02d3885388b0da74f
Reviewed-on: https://gerrit.libreoffice.org/58498
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#119015: don't call TableModel::optimize in CellCursor::merge()

Better do that explicitly in the SvxTableController::MergeRange, so
that the UI-driven operation still optimizes the table, but import
code gets the initial column count, and not throw trying to access
the deleted column.

Change-Id: Ib4b4d716935ec2036ccb839c36f1be5b0cb878d5
Reviewed-on: https://gerrit.libreoffice.org/58359
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/58378
Reviewed-by: Andras Timar <andras.timar@collabora.com>

forcepoint#66 make sure we don't get stuck endlessly reparsing

Change-Id: Ie2733e8d7f73e5f6a072604c477e949cd944189a
Reviewed-on: https://gerrit.libreoffice.org/58466
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

forcepoint#66 protect against infinite parse recurse

Change-Id: I0313cc141469a00b7d6a5bd15400e9d5a8f686cf
Reviewed-on: https://gerrit.libreoffice.org/58452
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

forcepoint#65 pdf page visiting revisits itself

Change-Id: I6d9eb75f0850a94814fb4d69ea1442b826674496
Reviewed-on: https://gerrit.libreoffice.org/58418
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

forcepoint#59 the "matrix" is always one row in height

so it can be a vector instead, and by using vector::at() instead of
matrix::at() vector bounds checking is performed, unlike matrix::at()
which does no checking

Change-Id: Ic767c2dd884bffbf1cdff65c0980b21170612f4d
Reviewed-on: https://gerrit.libreoffice.org/58399
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

update credits

Change-Id: Idfce6ffe88615f64319d7e1112ac6c4bde2a88d9
(cherry picked from commit cbd383aa70cce13ed07ca170dd40c83a79c57751)

Resolves: tdf#118965 fix input list edit button

regression since...

commit 7d5245848c28f5786258476cd7aa2a4523645de3
Date: Fri Sep 15 17:39:48 2017 +0200

tdf#79877 revert to old behavior when clicking on input fields.

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

tdf#108078 OOXML Export Chart shapes area fill properties

Verified with color, gradient, bitmap for:
Chart Title in DOCX, XLSX and PPTX.

Also verified with gradient, bitmap for
Chart Legend, Plot Area, Dataseries and Background
in DOCX, XLSX and PPTX.

Change-Id: I15d29f3ca2d75f45f612766b635d50a29d8551ae
Reviewed-on: https://gerrit.libreoffice.org/57880
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
(cherry picked from commit 051399740e41c6495ed362e78c63e0868bcd180c)
Reviewed-on: https://gerrit.libreoffice.org/58349
Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>

ofz#9603 infinite recursion

Change-Id: Ia4d0e3c1bb12330bd2f754e663055e1218da926f
Reviewed-on: https://gerrit.libreoffice.org/58179
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

tdf#118948 - Date format in Impress header/footer is lost when saving

regression from
commit 7d14555ef7e867c5b1a0e195e3ef056885697c59
convert SvxDateFormat to scoped enum

Change-Id: I9d365c710a20054e249433f54635068f713afa72
Reviewed-on: https://gerrit.libreoffice.org/58202
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 93baa280670367ef6246d837080706f2c80eab0b)
Reviewed-on: https://gerrit.libreoffice.org/58291

tdf#115438 Fix freeze when pasting unformatted text

ImpConnectParagraphs calls TextModified, which calculates the selection rectangles of
the paragraph for accessibility services by calling DrawSelectionXOR. When
calling ImpConnectParagraphs from ImpDeleteSelection, the selection isn't
valid, because UpdateSelection wasn't called yet. DrawSelectionXOR ends up
freezing the application, because pEndNode isn't valid.

This can be fixed by calling EnterBlockNotifications, to deliver the notification
sent by TextModified when the insertion is done.

Change-Id: Ia3a0e5b59a28f3503cbc54da682fcdaa5af277be
Reviewed-on: https://gerrit.libreoffice.org/57286
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 65eaebd2879c18926d4672c9276ef7f73f87af99)
Reviewed-on: https://gerrit.libreoffice.org/58218
Tested-by: Jenkins
Reviewed-by: Paul Trojahn <paul.trojahn@gmail.com>

update credits

Change-Id: I11206cbe209fc61c59af4d3be1c85168a518003f
(cherry picked from commit cba1c7421338324cb6c91511a294c4861e665c29)

tdf#118860 svx opengl: avoid SalBitmap creation without solar mutex

The bugdoc has 2 slides. When switching to the second slide, the graphic
is loaded in the background, but OpenGLSalBitmap::Create() can't work
correctly if the caller doesn't own the solar mutex.

This already asserts in OpenGLContext::prepareForYield() in a less
obvious way.

Focus on the correctness, so just hold the solar mutex during the whole
ImportGrpahic() call. If it turns out that the purpose of running this
on a thread is to avoid synchronous network traffic, then the data could
be first copied to a memory stream, and only then take the lock + import
the graphic.

(cherry picked from commit 919ccaba419531d689231b76a43ab29c6a9ec65a)

Change-Id: I88203c12b4e7a5f2b689928c01e2ba953c5b13c5
Reviewed-on: https://gerrit.libreoffice.org/58126
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

Update git submodules

* Update translations from branch 'libreoffice-6-0'
- update translations for 6.0.6 rc2

Change-Id: I9eacfe05198dd4b0dbf603364e39485d31a124ce

Adapt solenv/flatpak-manifest.in to recent download.lst changes

(cherry picked from commit 5c016d6ae4e59629cfd0b80c631f67cf46e42d3e)
Conflicts:
solenv/flatpak-manifest.in

Change-Id: I7799abe1a6fc9cf79a751d76360ea7ad2face133
Reviewed-on: https://gerrit.libreoffice.org/57981
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>

Resolves: tdf#118862 new instances cannot be edited

Change-Id: I9b10ff4f043949c7140852ac9ad9106ca611c98c
Reviewed-on: https://gerrit.libreoffice.org/57963
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>

tdf#113860 - Selecting a recent or favorite special character is not applied

Change-Id: Ia000e4d83b8012eff54647205f6e044920aed74b
Reviewed-on: https://gerrit.libreoffice.org/45259
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit eb384cf3792e3efc2473f26eee86b335804f2f9b)
Reviewed-on: https://gerrit.libreoffice.org/57645
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>

ofz#9431 don't check attribs of Invalid column

Change-Id: I9c5adcadfa2a8593ff90622449d6bdfa4810f2c0
Reviewed-on: https://gerrit.libreoffice.org/57917
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>

tdf#118579 ignore body in body instead of flagging as an error

Change-Id: Ie6626a320a5264aea004f7c57244643798703de8
Reviewed-on: https://gerrit.libreoffice.org/57654
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>

Resolves: tdf#118919 crash on double click ole object

Change-Id: Id7b3df447db56f6f80d6255dabdcc7f6ab149e95
Reviewed-on: https://gerrit.libreoffice.org/57956
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>

forcepoint#53 restrict to expected index range

Change-Id: I22f01e5a3e3cf51b014ac841cd14071dce5baf0f
Reviewed-on: https://gerrit.libreoffice.org/57922
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>

Resolves: tdf#118545 restore to historic logic

revert

commit 9eff9e699e17cc5a8a25895bd28dc8e4ceb8071e
Date:   Wed Aug 10 09:47:40 2016 +0200

    Don't re-check valid SwPageDescs when layouting

and then revert

commit 60d34e1c840d2c317bb7d0a5b14f4602c22b3fcc
Date:   Wed Nov 12 20:33:06 2014 +0000

    coverity#735517 Logically dead code

    its possible that this was the original intent, maybe

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

fix shutdown crash when SfxApplication has already been destroyed

See e.g. http://crashreport.libreoffice.org/stats/crash_details/dc1ae6ff-923e-44f6-99a9-84893039efd7

Change-Id: I3b5a24bfb62977ca922bf3bececb6676691bf6ea
Reviewed-on: https://gerrit.libreoffice.org/57789
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 715fcaff01ed048c52c69264a7a0fb773dd57b32)
Reviewed-on: https://gerrit.libreoffice.org/57809
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

ofz#9507 wrong start point for Johab block 59

Change-Id: I011f4cbb10324c4a7d4e1be3ab1355291f79730b
Reviewed-on: https://gerrit.libreoffice.org/57839
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

Resolves: tdf#118302 drag n drop to same tab should cancel dnd

dropComplete is used to do this, follow the mac pattern here to
propogate this in the drag and drop from self to self case.

Maybe this also affects tdf#105320 ?

Change-Id: I2b8f8b0e0486f6ee45a65918fae2537750a75f2d
Reviewed-on: https://gerrit.libreoffice.org/57591
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

tdf#118150 Fix displaying of chart where Legend is set manually

By default Legend's position is automatic and it is located
at the right side of the chart.
Unfortunately even if layout with manualLayout is set:
http://www.datypic.com/sc/ooxml/e-draw-chart_manualLayout-1.html
the empty space for the automatic legend on the right side of the chart,
was left.
This is issue with opening of the OOXML charts by LibreOffice,
as MS Word is opening the same document properly.

This patch fixes issue with wrong chart displaying, when manual position
of the legend is set.

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

tdf#118702: partially revert the fix for tdf#78907

This is a regression from 2df0d9d32d05f08ccf673fd0f61f650438511acb

Reverting it as the unitest from tdf#78907 still passes.
Besides, adding a new unittest for tdf#118702

Finally, adapt ooxmlexport9 and remove pointless assert which fails
with:

ooxmlexport9.cxx:557:Assertion
Test name: testBnc519228OddBreaks::Import_Export_Import
equality assertion failed
- Expected: <Any: (void)>
- Actual : <Any: (string) Converted2>

Failures !!!
Run: 155 Failure total: 1 Failures: 1 Errors: 0

Change-Id: I486e9489ef6c3978cbcf90f3b9885248f4f92110
Reviewed-on: https://gerrit.libreoffice.org/57338
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit b0e2dbca5164c494a669bd48f8ff058f4c1ad710)
Reviewed-on: https://gerrit.libreoffice.org/57390
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Make setPagePrintSettings() accept IsLandscape again

Regression from 80c35d97b9b3b60a091aae77de0ffef38cbf531a - invert
the check for boost::optional validity.

Change-Id: If4e041e1fe349c1fcb2c74b2e5780bf57300486f
Reviewed-on: https://gerrit.libreoffice.org/57309
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 0853b05b1fabb231a7d57d811c5a06ee542d3295)
Reviewed-on: https://gerrit.libreoffice.org/57315
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

related tdf#114845 oox: ensure rXShape.is()

Change-Id: Ic5a78d3f650bff82ce8d86a62ecfc025ca2062e0
Reviewed-on: https://gerrit.libreoffice.org/57276
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 10272122b2ace68add7d2b0191aa516558f8401f)
Reviewed-on: https://gerrit.libreoffice.org/57442
Reviewed-by: Eike Rathke <erack@redhat.com>

tdf#118620 - avoid out of bounds iterator for end of sheet pivots.

Change-Id: I2ddcf56dc94175718739611f0791558fda87b1ba
Reviewed-on: https://gerrit.libreoffice.org/57358
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit d3387b38fe0eea3fb7ac630c026f02986e8dafc4)
Reviewed-on: https://gerrit.libreoffice.org/57385
Reviewed-by: Eike Rathke <erack@redhat.com>

Also for SDK 10.0.17134 the winsdklibsubdir needs to have a .0 tacked on

Also remove questionable old "Hack needed at least by tml".

Change-Id: I478358ea114cee2f8a181b98cb3433447b3ed560
Reviewed-on: https://gerrit.libreoffice.org/54081
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit fc00041df85fd508d1fc34658d4c9ceeb10084b1)
Reviewed-on: https://gerrit.libreoffice.org/57378
Tested-by: Jenkins

bump product version to 6.0.7.0.0+

Change-Id: I2b4a354604fb65ee60b32f8be9e1132fbe55ff19

Update git submodules

* Update translations from branch 'libreoffice-6-0'
- update translations for 6.0.6 rc1

Change-Id: Ie1b70883b7e55b6a6672fe3cbdcca81f71130fd3

tdf#116543: don't forget to commit registrations in DB field editor

This avoids revoking the uncommitted registration when any mailmerge
doc is destroyed.

Also don't forget to pass relevant SwDocShell when registering data
source. This allows to register the data source for current document.

Change-Id: Id89be82b0120661700e9fee6a075e5877d76e3b0
Reviewed-on: https://gerrit.libreoffice.org/56891
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/57008
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

tdf#114845 sd: only shift rotated group items

fixes 6.0 commit 9ae1e094d5a8a5b4432c88ebea0ca9fc1c79f602
> PPTX export: correct position of rotated groups

However, there was nothing excluding the re-positioning
to only group items.

Change-Id: I62e36b46c0d2ac3e41f8d7d4ed82df11e6eb1ee5
Reviewed-on: https://gerrit.libreoffice.org/56386
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/56542
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

forcepoint#48 null deref

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

tdf#118022: fix crash when searching record in form by handling SQLException

See https://bugs.documentfoundation.org/attachment.cgi?id=142760
Found thanks on gdb with command
catch throw com::sun::star::sdbc::SQLException

First SQLException was dealt but not the second one

Reviewed-on: https://gerrit.libreoffice.org/55836
(cherry picked from commit f94292e8c4d469bd3123e1649b0f2a94d4b357b3)

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

tdf#118578 sw: allow inserting only TextDocument

There are 3 sw document services: TextDocument, WebDocument and
GlobalDocument.

The current logic in SwView::InsertDoc() and
SwView_Impl::StartDocumentInserter() is to request a filter with the
same document service as the existing target document, so you can insert
only a GlobalDocument into a GlobalDocument, which doesn't make much
sense.

As it happens there are 2 different HTML import filters: "HTML" and
"HTML (StarWriter)", the latter using the TextDocument service.

So just hard-code to allow TextDocument regardless of the target
document.

(regression from 805fd1ca343d6295b8114a24cc29bdac332f266d)

Change-Id: I7dc0dd4789fba8b61625ca8eae74a864aea383b0
Reviewed-on: https://gerrit.libreoffice.org/57193
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 572b298e636612416b8223ff6e6f2d26ab51a243)
Reviewed-on: https://gerrit.libreoffice.org/57223
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>