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>