Conflicts:
	sw/UI_swriter.mk

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