Change-Id: I3a1000baa049b11728c46efbc2f0af0d8f34cf2b

Conflicts:
	include/svx/charmap.hxx
	include/svx/float3d.hxx
	include/svx/fontwork.hxx
	include/svx/galctrl.hxx
	svx/inc/svdibrow.hxx
	svx/source/dialog/dlgctl3d.cxx
	svx/source/dialog/fontwork.cxx
	svx/source/engine3d/float3d.cxx
	svx/source/fmcomp/gridctrl.cxx
	svx/source/gallery2/galbrws1.cxx
	svx/source/inc/docrecovery.hxx