Unfortunately in commit 2b297116 I messed up whilst
doing a rebase via meld to incorporate my changes. This meant
that I overwrote changes made to
sw/source/core/unocore/unostyle.cxx.

Even more regrettably, my original changes missed making changes
in Windows and OS X builds as I pushed too quickly from within
gerrit, assuming that the build errors weren't caused by me.

These series of VCL changes I had made were quite rightly
reverted, and I worked towards fixing them up again - sadly my
ISP (iiNet) had connectivity problems so it took me some time to
even gain access to the repository to do the cherry-picks of my
previous commits so I could fix them up and resubmit them.

I honestly didn't notice that I had overwritten the changes in
unostyle.cxx previously, as I was so intent on fixing my errors
that this entirely passed me by. This unfortunately led to this
commit, where I overwrote the changes a second time:

28c96fc2

I was informed of this problem via the mailing list [1] which I
read the next morning immediately after I work up. I take full
responsibility and very much regret having made these mistakes.
This commit fixes the issue and I will take steps to ensure that
it doesn't occur again. I can reassure all that this was not
intentional, nor would I ever do such a thing on purpose - quite
frankly I'm mortified.

1. http://lists.freedesktop.org/archives/libreoffice/2016-January/072067.html

Change-Id: I336626059d4acd175669832950f3ed52b2539087
Reviewed-on: https://gerrit.libreoffice.org/21618Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

Change-Id: I9cde0ecf2c883b977df4f633e5106d39628444ca

This unbreaks Windows packaging after
85b46f51 - I guess this should be
Linux-only for the moment.

Change-Id: Ie19f7f3e4b611e2884e3fdb1a64c63927b018989

Change-Id: Ib620fe26481bf13021930ae58f7421b9cb7bdb4b

Change-Id: Ie980e0bb0726dd8bc4215d5b23ac6e1d2c9e2719
Reviewed-on: https://gerrit.libreoffice.org/21611Reviewed-by: Henry Castro <hcastro@collabora.com>
Tested-by: Henry Castro <hcastro@collabora.com>

...after 9c09d4d0 "tdf#96888 - Kill internal vcl
dog-tags ..."

Change-Id: I12c30f5ec3d498561b47ae61b34326d4a1f380d7

Change-Id: I231cb935f1d0a4e69bc3f970e48aece8305ab2b3

Change-Id: Ib4052fa88cce3b21d20d050fff9c8d32fcde4c20

Change-Id: I7942cf513439f8fe72775846eeb4cf4e6f176ed3

Change-Id: I261c717cabf966b8b20b8e6c921b38f4cd73e268
Reviewed-on: https://gerrit.libreoffice.org/21597Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

Modifications done as per CR

Change-Id: I0b57f5c32fc217929d71411ca5176e3cab3f6e73
Reviewed-on: https://gerrit.libreoffice.org/21457Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>

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

Now since, LOKDocView has started to get clients, we need to ship
all of its dependencies with the widget.

Reviewed on:
	https://gerrit.libreoffice.org/21605

Change-Id: I874eb416587a80b7760c5f00183d6004dfca4cce

That stores the signature timestamp, and that now immediately shows up
in DigitalSignaturesDialog as well.

Change-Id: I83a63a10cf946f47a03e4570c461a92512638600

With this, DigitalSignaturesDialog correctly shows the "Signed by" field
when reading a single valid OOXML signature.

Change-Id: Ic52a56767f65ab30924b07073d31677cb3a27de5

OOXML has one stream for each signature, so it wants a storage instead.

Change-Id: Iff2ed4b65d8c2023d02578ec4e80c13e36f55390

Change-Id: I826a1eb45d0669dbe2495b4dbe4a171fcebb0865

Change-Id: Ieb7e808ebc7619c3a4a013cad776eeefd6163e22

Change-Id: Ic44a9266a67bfad8b0490a8acb4a419af99ea42c

to allow duplicated unnamed frames

Change-Id: I871849b23d01209f027b6295777db705f7dc86d8

Uses Ascii variants of LoadLibrary,Get/SetEnvironmentVariable_A_
and adds a freeError function
includes windows.h instead of pre/postwin.h

Change-Id: I88b7e3ed3818078efec5688e207da47dc4049b98
Reviewed-on: https://gerrit.libreoffice.org/21600Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>

Fails without commit 27c6b858 (svtools:
implement clipboard import of JPEG files, 2016-01-19).

Change-Id: Ic4e3b036b3a6a1c294bf15ef0b206cf1e458fc4e

Change-Id: I3aa5f4342ad362b0075d033df222467723ee002e

Change-Id: I6735913c371968745da3ad6bf61e6ae3287c19a6

Change-Id: Icd2497f0befad0a3221230fe82cb100cddbd7764

Change-Id: Ied1b4f81e2e851b639cc9a514659160b8571e92f

Change-Id: I75cfb96e4afd69fd0f6a6716ce4be282aa8d3b14

Change-Id: I92eb6d136fc117f4694aa2cf88d93d4486855618

Change-Id: I39276ccea5c4b3ecdc89c77f35722883221b560f

Change-Id: I0333f65f67cdd93f9773e6d738289e36353ef359

Change-Id: I1e3bd12a8b264ca15e733ff15d8522fc2c156483

Change-Id: Iaa8afb2c642c9108eb1b3be4737b74285d064cf3

Change-Id: I90b205bef1b01e6c4c43788fc5c95391b7842e83

Change-Id: Ib3e10d188c3f0d1bde40653d783f98ebfaed423c

No function name hints or autocompletion when character right of caret is '$'

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

With this, lok::Document::paste("image/jpeg", "...") as invoked by
gtktiledviewer results in a Writer image just like the previously
already working PNG variant.

Change-Id: I9e7b94043519db4ccf3c9ad32474a15275896dd4

Change-Id: I64602d31e8aa873e2280f86eaf618dd6007acaf1

Change-Id: I75c58e81c27edd65239c6e033170a432735a81e4

revert a couple of pieces of commit
5fe99ea3
"loplugin:unusedmethods in sw"

Change-Id: If1eb9c7f01dcdea7ef7059165470357d5186ff93

Change-Id: I2c24d06d9fad26c65fa13cdcaa2c3f908971106c