Reviewed on:
	https://gerrit.libreoffice.org/13413
Conflicts:
	sw/qa/extras/uiwriter/uiwriter.cxx

Change-Id: I26a8707046d7f30381fb51c41e49f8dee4796ba7