As it turns out, gpgme works perfectly fine w/o glib (though it
really wants it configured out of the box)

This reverts commit daee5fc5.

Change-Id: I60002bf3b524696eeae397a26c280a67dcdbfd7a
Reviewed-on: https://gerrit.libreoffice.org/45908Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 2488ea55)
Reviewed-on: https://gerrit.libreoffice.org/45921Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

 This is a combination of 2 commits.

Resolves: tdf#114232 reset error after unsuccessful GetObject() query

Probably broken already since

    commit 0b21b8b1
    Date:   Wed Oct 6 10:16:27 2010 +0100

        initial commit for vba blob ( not including container_control stuff )

Change-Id: Iecce564851a76921b491ff101365c70883ad7475
(cherry picked from commit 863e269c)

Rather call GetObject() only if IsObject(), tdf#112571 follow-up

Which effectively is what GetObject() internally also does to
determine whether to set an error, so resetting an error here is
moot (or might even hide a nested error?).

Change-Id: I8736d16e386d1833126965538f96aaa1fd73dfd6
(cherry picked from commit d1cd68fa)
Reviewed-on: https://gerrit.libreoffice.org/45904Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>

Regression from

    commit 7ca950ec
    Date:   Wed Aug 23 19:25:02 2017 +0200

	no need to use ERRCODE_RES_MASK here

	the relevant usage sites already call GetRest() before comparing

which exactly is the reason that it didn't work anymore.

Old StringArray ItemList resources stored only 16-bit values,
hence ERRCODE_RES_MASK was used to mask the ErrCode values in the
resource for which code had to mask ERRCODE_RES_MASK as well to
compare values. Now the full ErrCode is stored, so code must not
use GetRest() on a value to compare against, or use GetRest() on
both values (which theoretically could lead to ambiguities, but
probably doesn't in resources that are restricted to one module).

Change-Id: I835e47424bb008bc680dc4f8c502c9558397db36
(cherry picked from commit d915cb41)
Reviewed-on: https://gerrit.libreoffice.org/45882Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>

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

And put a separator before the 'Macros' category.

Change-Id: Ibcff6b6c6d3a4f72d5e06b519fe8245d9602ad3c
Reviewed-on: https://gerrit.libreoffice.org/45843Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
Tested-by: Heiko Tietze <tietze.heiko@googlemail.com>
(cherry picked from commit cdb9e338)
Reviewed-on: https://gerrit.libreoffice.org/45872Tested-by: Jenkins <ci@libreoffice.org>

Also pull in config_lgpl.h in that case.

Squashed in is this fix, too:

  android: fix gpgme build

  No need to include config_lgpl.h when gpgme is disabled.

Change-Id: Iae4e56ee8023066581c562c66305875a0fe15f37
Reviewed-on: https://gerrit.libreoffice.org/45809Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 5daa3649)
Reviewed-on: https://gerrit.libreoffice.org/45836Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: I3b0383ef85f82c3076331026a49c0005f920ea61
Reviewed-on: https://gerrit.libreoffice.org/45804Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 58784b89)
Reviewed-on: https://gerrit.libreoffice.org/45839

Change-Id: I978b6f2845935c4a3377fe9600cfdb0bd284a6f7
Reviewed-on: https://gerrit.libreoffice.org/45825Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 7a9fe4d7)
Reviewed-on: https://gerrit.libreoffice.org/45840

Change-Id: Ic67089eb591411d9aa8a57369d739bf096a799db
Reviewed-on: https://gerrit.libreoffice.org/45393Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 7ace1668)
Reviewed-on: https://gerrit.libreoffice.org/45853Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>

Project: help  cbb8898cd472519719eba62b5051c507f394e73b

Hide some extended help only strings from the top of the page

Change-Id: I2df670078db010b9bcd8544c655e91a0ccec2686
Reviewed-on: https://gerrit.libreoffice.org/45833Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
(cherry picked from commit 0b7bf0473bcc891eb169eb489195cf61463cd63f)
Reviewed-on: https://gerrit.libreoffice.org/45852

Project: help  4897b4f477ec02a9a8eeae08520d1e13a0201ac1

Display the same ahelp in more contexts

Also remove some obsolete comments

Change-Id: I876398ff684dd203ab1702773a9b8f4d725c9a07
Reviewed-on: https://gerrit.libreoffice.org/45831Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
(cherry picked from commit 4f7a4631aa84dcb62ccd27c9c2dc9fc6a9dc232c)
Reviewed-on: https://gerrit.libreoffice.org/45849

Project: help  cb0f0667ffadff3b9cb2e3f78fa5996629db1f9f

Display the same extended help for more widgets

Change-Id: I76fe74a736ad01366ec8ffa05b49f0c4005e0c71
Reviewed-on: https://gerrit.libreoffice.org/45830Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
(cherry picked from commit 543b25503a6d08ca08d2f4b35a14743d0d5ad016)
Reviewed-on: https://gerrit.libreoffice.org/45848

* use correct font for calculations

Change-Id: Idd370678c000bf22c460c3323bd55cd827ba7153
Reviewed-on: https://gerrit.libreoffice.org/45698Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 923ca4ef)
Reviewed-on: https://gerrit.libreoffice.org/45824

At least for cygwin64 windres, a wider number of cross-building
targets are supported. Utilize that for getting suitable versionrc
arch built, obviating the need to disable x86_64 on cyg32 and vice
versa.

Change-Id: I9770a3c1d6602a9747b5b3caa4961d66c471f4e4
Reviewed-on: https://gerrit.libreoffice.org/45763Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 293df86b)
Reviewed-on: https://gerrit.libreoffice.org/45767Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

With e0d94237 the dependency on gcc
is gone, so we should be able to build on all cygwin flavours again
for all Windows arch targets.

Well almost - we still have windres on cygwin32 only able to produce
pe-i386 targets, so let's exclude the case cyg32 and WIN64 for the
moment.

Change-Id: Ibe7f967585995586985177d4c36cc33d9850d9de
Reviewed-on: https://gerrit.libreoffice.org/45422Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 8444bf1d)
Reviewed-on: https://gerrit.libreoffice.org/45768Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

Change-Id: Ibc74b89aca6a26952c27cd313f7c8203a507641d
Reviewed-on: https://gerrit.libreoffice.org/45458Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 4c7289c3)
Reviewed-on: https://gerrit.libreoffice.org/45766Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

(cherry picked from commit 01c7c4e1)

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

...according to alexlarson, for now (until "eventually we'll have a sane dconf
in the sandbox") apps need to specify --filesystem=xdg-run/dconf,
--filesystem=~/.config/dconf:ro, --talk-name=ca.desrt.dconf,
--env=DCONF_USER_CONFIG_DIR=.config/dconf (where the first two are irrelevant
for LO due to its --filesystem=host).

This fixes <https://github.com/flathub/org.libreoffice.LibreOffice/issues/4>
"Libreoffice flatpak is not respecting user theme".

Change-Id: If5ed33e1b524bfa877b89f052c6067398b5600a3
(cherry picked from commit 12ba14c6)
Reviewed-on: https://gerrit.libreoffice.org/45806Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

Change-Id: I2f14d6ab9a107f5b50ab0ec83019f86751dd79f6
Reviewed-on: https://gerrit.libreoffice.org/45778Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 282bc5a8)
Reviewed-on: https://gerrit.libreoffice.org/45803

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

And not use the replacement graphic in this case.

Change-Id: I5e1bb7a694f210e2681ff5acf241a131d38a4c5d
Reviewed-on: https://gerrit.libreoffice.org/45782Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit aa768bdb)
Reviewed-on: https://gerrit.libreoffice.org/45801

In 6b3cc69f this was done for draw images,
this patch also implements this for Writer images.

Change-Id: I54f8142c3d22e1a356aedbcf2daf9d7a9b049423
Reviewed-on: https://gerrit.libreoffice.org/45673Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 2d3023c9)
Reviewed-on: https://gerrit.libreoffice.org/45800

* Adds "Macros" category to the categories list

* Search/filter feature now works also on the macros category

* Since macros category has multiple trees and subtrees, and many leaf
  elements (macros). I chose to implement the behavior like this:

  If there is no filter/search term, the trees will be presented as in the old
  macro selector dialog (collapsed), but if user types a search term, then
  filtering happens: non-matching elements and empty containers/(sub)trees
  are removed and everything is expanded so that user easily sees what
  (s)he is looking for.

Change-Id: I1a93f156a7293c7e61baac882a10ff631961e2af
Reviewed-on: https://gerrit.libreoffice.org/44938Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 3f2915c4)
Reviewed-on: https://gerrit.libreoffice.org/45779

... use the same size as VLC does.

See:
https://opengrok.libreoffice.org/xref/core/avmedia/source/vlc/vlcplayer.cxx#167

Change-Id: Ib878ded6c8aacf3a04227ab9efaa59b388f8ff51
Reviewed-on: https://gerrit.libreoffice.org/43827Tested-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 a2ec3024)
Reviewed-on: https://gerrit.libreoffice.org/45781Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

Change-Id: If1d1a23afb6209c35092d7cd95235ea1699fe7fb
Reviewed-on: https://gerrit.libreoffice.org/45262Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 76c1e728)
Reviewed-on: https://gerrit.libreoffice.org/45742

Change-Id: I566cd5d38cf86547b664f0ae9a1c2f8c37edc0ca
Reviewed-on: https://gerrit.libreoffice.org/45560Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/45680

Which is usually png and browsers can read that,
but they can't read our internal metafile format (svm)

Change-Id: Idfd82da630ead69f508b74285081e32315030825
Reviewed-on: https://gerrit.libreoffice.org/45590Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/45679

Change-Id: I6eb7bb66aa688b5668d0eacd2ec7131bec2b6955
Reviewed-on: https://gerrit.libreoffice.org/45585Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/45678Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

Not only to zipped ODF

Change-Id: Ic86656aea31c9fc20862628cdd31698b9904e999
Reviewed-on: https://gerrit.libreoffice.org/45568Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 38602abc)
Reviewed-on: https://gerrit.libreoffice.org/45675

Otherwise browsers don't recognize base64 encoded svg files.

Change-Id: I54d0b87c52a1ca9da1d820751ae32159b88ed28f
Reviewed-on: https://gerrit.libreoffice.org/45528Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 32efde5c)
Reviewed-on: https://gerrit.libreoffice.org/45674

With this, SVM files are still written to ODF, but accompanied
by a replacement png graphic.

Change-Id: I2c949f100dd5197a10c741baa42ea740f3a1415a
Reviewed-on: https://gerrit.libreoffice.org/45567Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/45677Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

Project: help  68e12bde353309affc4deb2ce6b092c4bcef0a23

Add some entries in tree files

plus a link address fix

Change-Id: Ib73385d43b7c354b81265ad7aa06dec66df2763e
Reviewed-on: https://gerrit.libreoffice.org/45762Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit d0dad7954d1432b998cb1f3eb9c74fb6a56d280f)
Reviewed-on: https://gerrit.libreoffice.org/45764

Project: translations  fe37599d40a361181db11cf98bb1fb29d5c70f12

Updated Slovenian translation

Change-Id: Id7e2a71500651be494ec08276db6eff28b1d150f

Change-Id: Ieccb174debbfb00e8165c5928ea9786d55bffab3
Reviewed-on: https://gerrit.libreoffice.org/43224Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit b0ca7c2e)
Reviewed-on: https://gerrit.libreoffice.org/45707Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

No need for this if we will be removing tango and we shouldnt have translators waste time translating it if so.
https://bugs.documentfoundation.org/show_bug.cgi?id=113858

This reverts commit 6999bafb.

Change-Id: I7b6fe1fc84530bdbc002fcb2857942ddf268c88e
Reviewed-on: https://gerrit.libreoffice.org/44837Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit 83638a19)
Reviewed-on: https://gerrit.libreoffice.org/45708Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Project: help  37023d27b86c0033ff7be16205751835094c104d

New Help: improve bascode div css.

highlight basic code background color

Change-Id: I64df0dad9443704675dd4a26be943521bc993e97
Reviewed-on: https://gerrit.libreoffice.org/45751Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 02367b1b1afa3c284fc2594c4791bd2037e927e2)
Reviewed-on: https://gerrit.libreoffice.org/45753

Project: help  14afd749e1925881fbbd7361f88600ed3621dcbf

tdf#84675 undocumented BASIC - tree files update

Change-Id: I06ace765057fe5fa9b8add62d232c8c0cbaf23f5
Reviewed-on: https://gerrit.libreoffice.org/45750Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 862397faa8ea0e8b23d13fc1e929ebc8f2c15b3f)
Reviewed-on: https://gerrit.libreoffice.org/45752

Project: help  c9620f4bf875b3cd86c7ea233d4678fde90e52d5

tdf#84675 Add vb* VBA constants documentation

Added vb* constants as described in
basic/source/comp/parser.cxx

Change-Id: I7a811ab5ba9af741afc43f93a4e96e018deef826
Reviewed-on: https://gerrit.libreoffice.org/45748Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 8d6f11fb06d76847256dd9baff120a0e7ea5139c)
Reviewed-on: https://gerrit.libreoffice.org/45749

Change-Id: Id1bbc7da811c76be5b413b2c66da280f504d97a0
Reviewed-on: https://gerrit.libreoffice.org/45361Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Tested-by: andreas_kainz <kainz.a@gmail.com>
(cherry picked from commit c056f4ad)
Reviewed-on: https://gerrit.libreoffice.org/45584Tested-by: Jenkins <ci@libreoffice.org>

Project: help  8b26bf1947f18d99ec5e549cf94072b2e330399b

tdf#108967: Fix Help for Edit Index in Writer

Change-Id: If07d9c355b249b3f07982188c9349bbdb703de5b
Reviewed-on: https://gerrit.libreoffice.org/45703Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 15aadcce29df899fab7c65f8809d8cef69c18b9e)
Reviewed-on: https://gerrit.libreoffice.org/45738