Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/8473

Change-Id: Ie1b0ac3cb4d4b9bf305323599d5e4b63f913fb1b