Patch by: zhengfan, Oliver
Review by: Oliver

reintegrate from branch writer001

(cherry picked from commit 8f2a21ea)

Conflicts:
	sw/inc/tox.hxx
	sw/source/core/tox/tox.cxx
	sw/source/filter/ww8/dump/ww8scan.cxx
	sw/source/filter/ww8/wrtw8nds.cxx
	sw/source/filter/ww8/wrtww8.cxx
	sw/source/filter/ww8/ww8atr.cxx
	sw/source/filter/ww8/ww8par.cxx
	sw/source/filter/ww8/ww8par.hxx
	sw/source/filter/ww8/ww8par5.cxx
	sw/source/filter/ww8/ww8par6.cxx

Change-Id: I75b2971f23754afa0bcb0b549bfb820dd5924b3b

Instead of removing it from odk/Package_cli.mk,
c0c7df91 "odk: remove cli_cppuhelper from
Package_cli" should have referenced it from solver's bin/assembly/, where it got
moved by 8865b7f0 "fdo#55290: use the right
native library name."  (And "It is actually installed by
scp2/source/ooo/ure.scp" too, indeed, but that is a red herring and is true for
all the SDK cli/cli_*.dll files.  My take is that they are required twice, once
in the GAC, which the scp2 settings are for, and once for SDK code to link
against.  Note e.g. the reference to cli_cppuhelper.dll in
odk/examples/CLI/CSharp/Spreadsheet/Makefile, building which from within the SDK
failed now without this fix.)

Change-Id: Ia906a4dc23e1e232ddb3dfac49dd190d1de45917

There were only a couple of real bugs fixed, but we're a little
bit safer now.
This also fixes the assert and the comment in OUString::operator[]
about this.

Change-Id: Ibe16b5794e0ba7ecd345fa0801586d25b015974c

We really should set up this list of all the libraries (even one including
wildcards) in a single place in configury. Now this information is duplicated
in several places. (Such a list is used when linking a single (app-specific)
DSO for an Android app or a single executable for an iOS app.)

Change-Id: Ic77bdd5a4e58686693f4ac3987ba73bca011db3b

Conflicts:
	sw/source/ui/inc/content.hxx

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

The include guard gets generated based on the path of the header file.

INCLUDED_FOO_BAR_HXX for global headers in include/

INCLUDED_FOO_SOURCE_BAR_BAZ_HXX for anything else.

See fdo#68849.

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

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

Change-Id: I87cc4a6840090076007d268ae19eb2cfd3408e7c

Galaxy is our 'underlying' icon theme we use in LibreOffice. If an user
choose to have another theme, Galaxy icons will be overlapped by
that other theme. So in general the 'default' template _is_ galaxy, but
not for the end user. Different OS have different default theme and
are marked with '<themename>(automatic)'. To avoid misunderstandings
I delete the term 'default'.

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

Project: help  8fcc6911b8df398f174ac564569c7bbc107f8dfc

fdo#36964 change "Remove Filter" to "Reset Filter"

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

Project: help  865be6c72e883d71ed9c62d956e838eb9d86aea6

Change-Id: I978b25d23bb2c523b3207f17c61f6569b9baa3e1

Change-Id: I2d40924e77f075024aed54548ffda8a162f7af91

Change-Id: Ifbf5a3aad016e1c90c4c331b2f72b44203717f90

Change-Id: I9936b7d366c5f02a973927381480d064eba710c6

Change-Id: I4b350dc6c796bb1af0740917e17ac79b2a259a0a

Change-Id: I56f47926eeff6ab57903c8eedf6528465fc41c9e

Change-Id: I3d501900f4a2bc2424f4133e4fb9f3efe8b0c510

Change-Id: I1c2d95e4c3fb6242dcb4cdb88cf9733471a3412b
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

Change-Id: I791b007b68247a041f33d779276d1bb0d7e06e78

Change-Id: I3c05c5f7e1721a20e6eab12e2aa620aa917b7378

Change-Id: I0bce921bfc7102b9a33b1c87eee3ddec0ebaed7b
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, with one little typo fix

Change-Id: I83c1001d67a9c3e5c2a6e2ff4c93a97214f24475

Change-Id: I2caaac66758863b0f384df13ab30526f21be1e8d

Using the same "finite()" as on (GNU/)Linux seems to work.

Change-Id: Iad3baa967194f09d7ca25fb9b316b780de5bb90f

Change-Id: I54e939b7bca883f1c92c957c66ebf47259c92a46

Change-Id: I2b2aa5f5afdbf58ec3ac2447db370bcb7d1778c0

Convert places that call
   aStr[aStr.getLength()-1] == 'x'
to use the shorter form
   aStr.endsWith("x")

Change-Id: I1b3a19c0e89b8989cdbeed440f95fc76f9a4b6b6

the minimum version is set based on MACOSX_DEPLOYMENT_VERSION
It's purpose is to prevent the generated app to be executed
on a system that does not meet the requirement

Change-Id: I4ec09f8d1f96af1263d40bbe0e4b144c9622bba4

Change-Id: I21fbfce72cdf7446845df8ae8f65d6d899163d2f

Test is partly disabled as we still generate invalid tokens

Change-Id: I1a9b03b9bbe2ed7087c6ab7b6d0823ac1d058ba7

Change-Id: Ic000787d9a3155d95bd2f5db531192791650392f

Apparently curl is the only external that is looking for these,
but it turns out that we already pass --with-nss=dir to its configure
which overrides the nss-config/nspr-config calls.

Change-Id: I967e74a74690a64b5bccfd98d1509bba1dd12259

Change-Id: I120fdbd32d3c20df7f2c6f67e0df6de216606396

Change-Id: I6b047d8e6c6e747cc5fd8b3cde14486138c56d84

Change-Id: I1f5b3ffccb89a5b9111e60c0a1943e1642c3499b

Change-Id: I9d9f1a542dbbfc461dd27c32b57e4cad5532fab0

Change-Id: Ib1c3cdca7652f5621ba79b1e3590a9241021c389

Got the selection start and end handle dragging working... The trick was not
to call SwWrtShell::SetCursor(), but SwCrsrShell::SetCrsr(). Sounds easy but
took a lot of guessing and experimentation to figure out. Anyway, now it does
what I had expected it to do a few das ago already.

There are glitches, especially in corner cases like if you move the start
handle past the end handle or vice versa.

more

Change-Id: Id6c1d99a4052531789bccf0d48165cfb41b89cfe
9b94c0dd55b04a7b6b3c40654562a9c51fa9b450

Change-Id: I0d0934d964143231b11356fc25cc3e6dad289d15