Conflicts:
	vcl/headless/svpgdi.cxx
	vcl/source/app/dbggui.cxx
	vcl/source/app/help.cxx
	vcl/source/app/idlemgr.cxx
	vcl/source/app/settings.cxx
	vcl/source/app/stdtext.cxx
	vcl/source/app/svdata.cxx
	vcl/source/app/svmain.cxx
	vcl/source/control/fixed.cxx
	vcl/source/control/ilstbox.cxx
	vcl/source/control/spinbtn.cxx
	vcl/source/filter/sgfbram.cxx
	vcl/source/filter/sgvmain.cxx
	vcl/source/filter/sgvtext.cxx
	vcl/source/filter/wmf/emfwr.hxx
	vcl/source/filter/wmf/winmtf.hxx
	vcl/source/filter/wmf/wmfwr.hxx
	vcl/source/fontsubset/cff.cxx
	vcl/source/fontsubset/fontsubset.cxx
	vcl/source/fontsubset/xlat.cxx

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