Including:

* expanding STDAPI to its definition (as per
  <https://msdn.microsoft.com/library/ms686631(vs.85).aspx> "STDAPI"), to add
  __declspec(dllexport) into its middle, in
  extensions/source/activex/so_activex.cxx; as discussed in the comments at
  <https://gerrit.libreoffice.org/#/c/60691/> "Get rid of Windows .def files in
  setup_native, use __declspec(dllexport)", having a function both listed in a
  .def file EXPORTS and marking it dllexport is OK, and the latter helps the
  heuristics of loplugin:external; however, the relevant functions in
  extensions/source/activex/so_activex.cxx probably don't even need to be
  exported in the first place?

* follow-up loplugin:salcall in sal/osl/w32/file-impl.hxx

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

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

icons are off by default so not usually seen

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

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

This way we don't have to search the whole list for a higher
priority event, if an immediate Task is found. This probably
helps bugs like tdf#119724 and tdf#119428.

Change-Id: Ic5685193d1bedb6996cf46f0ee2cba42190ff7cc
Reviewed-on: https://gerrit.libreoffice.org/60572
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

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

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

...avoiding conditional blocks and variables (that need careful #if'ing to avoid
them being either undefined or unused depending on NDEBUG and OSL_DEBUG_LEVEL
combintaion)

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

...as they appear to only be called from within this .cxx.  (And
<https://msdn.microsoft.com/library/ms686631(vs.85).aspx> documents that STDAPI
expands to a return type of HRESULT, among further decoration.)

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

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

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

... SwRedlineExtraData_FormatColl and
SwRedlineExtraData_FormattingChanges.

Change-Id: I7dedf293ba06879985d4652e073642d5a15d97ca
Reviewed-on: https://gerrit.libreoffice.org/60922Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins

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

open
calc and impress
and drop down graphic menu

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

* Update helpcontent2 from branch 'master'
  - tdf#108890 Chapter Numbering button “Format” renamed “Load/Save”
    
    Change-Id: Iec39885663c838dfaf112c1a4a99bcde7b9f9036
    

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

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

Renamed to Load/Save according discussion on BZ

Change-Id: I7444ffc6b2d6158542357364fd6a282a1684a33d
Reviewed-on: https://gerrit.libreoffice.org/60876
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>

Add missing header after 60a23d5d

Change-Id: Ic24a78db3b425966e49fec96160d10670f68dea4

Regression from c57f10b6,
where I disabled the master background in Impress but not in Draw,
and both share some common code.

Besides, disable master background in draw as well. Follow-up of bug
tdf#111306

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

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

bdade7e3 "tdf#105444 DOCX import: don't put
extra paragraphs in comments" caused

> /home/sbergman/lo2/core/writerfilter/source/dmapper/DomainMapper_Impl.cxx:441:22: error: expression always evaluates to zero, lhs=0 rhs=unknown [loplugin:expressionalwayszero]
>                     (sizeof(SAL_NEWLINE_STRING)-1 == 2 && xCursor->getString() == "\n"))
>                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

now with sufficiently new Clang, and the code looks reasonable, and there's no
apparent way to avoid such false positives in the plugin.  (It could check for a
sub-expression of the problematic expression being an object-like macro, but
SAL_NEWLINE_STRING could just as well be a variable instead of a macro.  That
variable would need to be defined in some #if to have different values on
different platforms, so the plugin could theoretically check for such
conditional inclusion, but it's not clear whether that's worth it and would even
be a useful heuristic to not produce neither too many false positives nor too
many false negatives.)  So just disable the plugin for good.

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

Change-Id: I7610e890a8b49c50bf23ed07daa5517c33edcb8d
Reviewed-on: https://gerrit.libreoffice.org/60897
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>

Change-Id: If7cd5e7157419c5d3b3a7ff834613e7f6489047c
Reviewed-on: https://gerrit.libreoffice.org/60900Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

We first try to prepare the statement and get metadata
information. That's fine. Some DB engines/drivers will not give column
information on an unexectured prepared statement. In that case, first
try to execute the statement with all parameters set to NULL, which is
likely to succeed. If not, keep "execute the raw SQL indiscriminately"
as a last resort. I'm not sure it will ever be useful, though.

Change-Id: I76b5fd6b2059e96fabe9a611c8e3ed115acfc964
Reviewed-on: https://gerrit.libreoffice.org/60884
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>

no warning in glade about it, though there is for other
such things that don't exist in the targetted version

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

buovjaga reported on IRC that his build (implicitly --without-system-harfbuzz
--without-system-icu) failed to link e.g. Library_vclplug_gtk3 due to harfbuzz
missing symbols from ICU, like

> /usr/bin/ld: /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a(libharfbuzz_la-hb-icu.o): in function `hb_icu_unicode_decompose_compatibility(hb_unicode_funcs_t*, unsigned int, unsigned int*, void*)':
> /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/hb-icu.cc:334: undefined reference to `unorm2_getNFKDInstance_62'
[...]

It is not clear to me why Library_vclplug_gtk3 would actually use
libharfbuzz.a's hb_icu_unicode_decompose_compatibility (and for e.g. my builds,
it apparently doesn't), but in general libharfbuzz.a does depend on some symbols
from icuuc, so it is correct to add icuuc to the link when linking against
harfbuzz.  (And "gb_LinkTarget_use_external,...,icuuc" conveniently only adds
libs for linking, and does not add C/C++ include file paths, which would not be
wanted here.)

(<https://gerrit.libreoffice.org/#/c/60882/> "Revert 'Add more more dependencies
to VCL makefiles'" was a false start trying to address the above issue.)

Change-Id: Ic8bcfa2aab185f8a9487d7787b4f22068e7cb481
Reviewed-on: https://gerrit.libreoffice.org/60898
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

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

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

for display in UI. The test counts the layers. The error was, that a
user layer was merged into a standard layer.

Change-Id: Ib73e14965689b005a7d42811b6de9126dd3ef57d
Reviewed-on: https://gerrit.libreoffice.org/60892
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>

For MYSQL connections there is an extra window which determines how to
connect to a mysql/mariadb database. This functionality is handled in
OGeneralPageWizard::approveDatasourceType.

Change-Id: Ia3c548103b694731cba47ff5390c34b072a938a0
Reviewed-on: https://gerrit.libreoffice.org/60893Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Tested-by: Tamás Bunth <btomi96@gmail.com>

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

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

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

on Win32, waiting only for \r\n instead of \n in RemoveLastParagraph().

Change-Id: I8921a6a72e8397ed04edb9f339ba3f0bf5bbb98b
Reviewed-on: https://gerrit.libreoffice.org/60865
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>

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

Change-Id: I21bc9353dc37825967bdca3329568990907928b4
Reviewed-on: https://gerrit.libreoffice.org/60888
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>

* Update helpcontent2 from branch 'master'
  - SEARCH spreadsheet function returns error when text not found
    
    ... as per OASIS ODF OpenFormula specification:
    http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html#__RefHeading__1018874_715980110
    
    Change-Id: I16b81de40dcc4b103e44cc1e3784eea830bf8ffa
    Reviewed-on: https://gerrit.libreoffice.org/60891
    Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
    

Optimal row height: Adjusts the height of the selected rows
to fit the content, causing the table to shrink.

This really is SetMinimalRowHeight, but until minimize
is also added, it is the most desirable optimization.

Change-Id: I90717b2752027404a85fd5eb01c68279996598ca
Reviewed-on: https://gerrit.libreoffice.org/60129Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>

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