* Update helpcontent2 from branch 'master'
  - Honor asc/desc in XHP sorting
    
    Change-Id: I11cc206e3f8771fc19387cd2a9c02697982251dc
    Reviewed-on: https://gerrit.libreoffice.org/63445
    Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
    

I.e., importing a CSV field like "1970-01-01T00:00:45.890622" as "Date (YMD)"
should not truncate .890622 to .891.

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

(regression from 723728cd)

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

Make sure that created empty QImages are filled with transparent pixels.

Copying data from previous QImage on widget resize removes blanking
on window resize when qt5 vcl plugin is used.

Change-Id: If072a4b8b334bc87dbe4aaea9aa8774bb5e202ee
Reviewed-on: https://gerrit.libreoffice.org/63029Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>

Change-Id: Ie48a779958a393b68dea613c3bcc17113165f065
Reviewed-on: https://gerrit.libreoffice.org/63443
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

and remove the draw branch - there is no menu entry in draw for this.

Change-Id: I1e435023a6b39c6990c8a9d3df52b668b5de0571
Reviewed-on: https://gerrit.libreoffice.org/63433
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

Change-Id: I27e97e6b0664f20d93cbf6588403d7db85ef7ecf
Reviewed-on: https://gerrit.libreoffice.org/63384
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>

Change-Id: I985c3f9be81cbeadb393fe8a03bde6a11e3e391d
Reviewed-on: https://gerrit.libreoffice.org/63450Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>

Change-Id: I8c6204e389105e2572cd2edd4fb5f23c87896c66
Reviewed-on: https://gerrit.libreoffice.org/63449Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>

Change-Id: I56a8385669a8cd74e2794d12a7cd4c722da1313d
Reviewed-on: https://gerrit.libreoffice.org/63448Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>

Change-Id: I3e53e06ce55c377076234f08ce090c4904db8cb6
Reviewed-on: https://gerrit.libreoffice.org/63451Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>

pattern editor on reopening

Change-Id: I1c77dff4bfebc9f4a2661210f5bbbaa8573a90db
Reviewed-on: https://gerrit.libreoffice.org/63456
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

Move XEnumeration Java tests for
ScIndexEnumeration_TableRowsEnumeration to C++. Also improved the
overall run time of the test by limiting the range to enumerate over for
reasons mentioned in fdo#45337.

Change-Id: Id8eb998242cacf61bb472a0c130f38482c95db1c
Reviewed-on: https://gerrit.libreoffice.org/63444
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>

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

Change-Id: I033731251c4fffd759144f5bd9d6b9737de48c80
Reviewed-on: https://gerrit.libreoffice.org/63455
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

Change-Id: I147e10a4ce503a91e51eed15586db3381447cc7c
Reviewed-on: https://gerrit.libreoffice.org/63454
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

- Support drag'n'drop of single items. If the animation is collapsed,
  it will move its collapsed sub-animations as well.
- Sub-lists remain expanded when its parent animation is moved, or
  a sub animation becomes the new parent of the text group (due to moving).
- Maintain the cursor between custom animation list redraws.
- Don't change selection on collapse after custom animation list
  rebuild.

Change-Id: I92d96e9a01c6884ef739612e456cc541218b6ebb
Reviewed-on: https://gerrit.libreoffice.org/62342Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

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

... if the second parameter is an array.

This change follows their specification in ODF 1.2.

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

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

but the new child is a toplevel widget

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

* Update helpcontent2 from branch 'master'
  - typo
    
    Change-Id: I0ffcaf4a1582d3ee31c40d9ecfc4f922651a1b18
    Reviewed-on: https://gerrit.libreoffice.org/63441
    Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
    

* Update helpcontent2 from branch 'master'
  - tdf#118473 Help page for VBA FormatNumber
    
    + some fixes in table formatting
    
    * Added Mike's advise.
    * fix dumb copypasta
    
    Change-Id: I997c3200e521e7fac9f20f17a9bb9e2574bccfdd
    Reviewed-on: https://gerrit.libreoffice.org/63373
    Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
    

Change-Id: I4d80a64a228c7225df13ca17d933b8f940ddc3e3

An embedded object have have its replacement graphic at 3 levels in
reqif-xhtml: PNG at HTML level, WMF at RTF level and as a stream in the
OLE2 storage. Some reqif readers depend on having the replacement
graphic at an RTF level, so write that variant, too.

Change-Id: I3391303248d2792a4c370e8fc84db0f22185312e
Reviewed-on: https://gerrit.libreoffice.org/63419
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

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

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

Change-Id: I0219a0f6438c58b3f3307efe0b62d2a40ef281e4

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

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

Move XEnumeration Java tests for
ScIndexEnumeration_ScenariosEnumeration to C++;

Change-Id: Ia778f644cbb2836e6c6bfc12ae389cda3420e5b2
Reviewed-on: https://gerrit.libreoffice.org/63399
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>

f0305ec0 "Fix creation/removal of GPG socketdir"
spawns additional gpgconf processes which need the same LD_LIBRARY_PATH fix as
d15f042a "CppunitTest_xmlsecurity_signing failed
in sanitizer builds"

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

Change-Id: I79ed336058ffa9e182d3332acfeda8d6526c6b43
Reviewed-on: https://gerrit.libreoffice.org/63432Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

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

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

LD_LIBRARY_PATH=.../master/instdir/program \
 .../master/workdir/LinkTarget/Executable/unoidl-read --published \
 .../libreoffice-6-1-0/instdir/program/types.rdb \
 >.../master/udkapi/type_reference/udkapi.idl

* no changes

LD_LIBRARY_PATH=.../master/instdir/program \
 .../master/workdir/LinkTarget/Executable/unoidl-read --published \
 .../libreoffice-6-1-0/instdir/program/types.rdb \
 .../libreoffice-6-1-0/instdir/program/types/offapi.rdb \
 >.../master/offapi/type_reference/offapi.idl

* all the interim modifications to offapi/type_reference/offapi.idl were done in
  error and had already been reverted again (i.e., `git diff
  76f30450..5b0ceb86^
  -- offapi/type_reference/offapi.idl` is empty)

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

b96180cb "uitest: set en_US.UTF8 for the
LibreOffice instance" had made UITest use the en_US.UTF-8 locale (passed from
LIBO_LANG to LC_ALL when starting soffice in uitest/libreoffice/connection.py),
for unstated reasons.

The mail sub-thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2018-October/081318.html>
"Re: master build problems with en_US.utf8 locale" now argues that support for
an en_US.UTF-8 locale in the OS should not be necessary when building LO.  While
absence of OS-support for en_US.UTF-8 apparently doesn't break the UITests (see
<https://lists.freedesktop.org/archives/libreoffice/2018-November/081375.html>
"Re: master build problems with en_US.utf8 locale"), it feels better to make
these tests not use the en_US.UTF-8 locale at all.  At least for me, the tests
ran fine when using the C locale instead.

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

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

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

This reverts commit fa2167fe ...
and fixes the merge conflicts.

Change-Id: I57fa6b9e7d35e0fc28d941f2968854a52b17b995