Change-Id: I639c2970b2a88ca3d5aa1dcd2ad4ec047b4a369c

Change-Id: I369da2262d42fbc7cc3cfeeef4920606522237cd

Change-Id: I01c85e4d3853c44fa05acc3019bc35c56c4f655e

Change-Id: I1e6343fdcee91d23aacd776520e8bfdf81d411e4

Change-Id: Iacfeb4a0c2bff254e5bcc8d58582994cd0f3993a

a) convert to .ui

b) The accept/reject changes dialogs now have a "close" button and the
accept/reject etc buttons are relocated into the main dialog button area rather
than as direct children of the view page. They now get disabled on switching to
the non-view page.

c) Merges the sc redline changes dialog, the sw redline changes dialog and the
sw autocorrect changes dialog

Change-Id: If0ba376c3f2d36709aeeed995fa9901741434c40

Change-Id: I9109dfc6293c9de399c25bea957712eb00d181be

(cherry picked from commit a69be8d2)

Conflicts:
	sw/source/core/text/portxt.cxx

Change-Id: I247ac6d623b47d08ac9e2e5f107520241d19af8f

Change-Id: I084a0fbce57c732635e73186ba124fe3b53502d5

Change-Id: I816c2597492d24f81a61c53ad2dc0125075d01c5

Change-Id: Idde59a616b16c52b7369dd67e7a06eab52b334c8

Change-Id: Id7b2c7e871abf19b70f427095371c6a6c0208607

Change-Id: I0c2e38e07c0e108268d63c1994eb3a0a0646cdf5

Change-Id: I4ec171a42f589826071d6e9ea2c87e9e2c94fdb3

Change-Id: I07f4f45bea211b8f32cb975e0c4c1d19062b1808

Leave the NativeActivity-related code in androidinst.cxx for reference for
now.

Change-Id: I760c02ea361361be2d2b69c4cad1e38311f51247

Hopefully also fixes build for iOS by re-introducing checks for DESKTOP.

Also this commit partially reverts 52a8744a.

Change-Id: Ie94c771b72ba138bb0481b054285916618baf6eb

Change-Id: I4bca280b352f1df40fe75658e418f2e0cb2430e8

Change-Id: I756cae33f408a1b735358da5a15b0462a19e31d0

Partially revert 52a8744a, i.e. once again
start to remove stuff related only to using NativeActivity... (Because it is
confusing and misleading to keep it around.) Let's do it in small pieces this
time.

Change-Id: Ifdc52eb0ae32c7c510418611cbf01a857a8bc697

Change-Id: I64eb8128c5719a5e7601f15367342e98140e0789

Change-Id: Ib3dae9b06bcd2cfe5e73b723d9ea2e5856073651

Looking at the change to this line in e904749e
, I think this line was changed incorrectly. So I won't simply "fix" the
warninig by initialising nLen to some value like zero, but instead reinstate
the use of the nCharCount2 here instead of nLen.

Change-Id: Ice4a5cb751a244c38b3cfc4e05e3206cb939484a

Change-Id: I172cfc0bcad780e99469ac01c9ba7467befe53de

Change-Id: I39ad80b9a952462e178be87ca5e53785036cdaf6
Reviewed-on: https://gerrit.libreoffice.org/2190Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

Change-Id: I35494ccfeba77b173a2d227d1bd2235e81aa2d9b

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

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

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

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

I ran the following code replace:
    s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/

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

Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd
Reviewed-on: https://gerrit.libreoffice.org/1970Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

I ran the following code replace:
    s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/

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

I ran the following code replace:
    s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/

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

Change-Id: Ib7160c3b00399e704cd02a41735b0ff4f13d8554

Change-Id: I683002c12f9bb8f053dafea70c889a2881a70b99

Change-Id: I5b577a8e0675d7849ca22e24bb99ee2d8602ae6a

Change-Id: I9e8db1ae08b570f093b13d50bfde823c85cdba95

Change-Id: I7ccbd4b2e1aebc84a59bb9000e7322c8aa62ffd7

Change-Id: Id3aed9ef251f61710b43ceda1a28c6895e91872f