Conflicts:
	cui/source/tabpages/backgrnd.cxx
	editeng/source/items/frmitems.cxx
	editeng/source/items/numitem.cxx
	include/editeng/brushitem.hxx
	include/svx/xoutbmp.hxx
	sc/source/filter/html/htmlexp.cxx
	sc/source/filter/html/htmlexp2.cxx
	svx/source/core/extedit.cxx
	svx/source/core/graphichelper.cxx
	svx/source/sidebar/nbdtmg.cxx
	sw/source/ui/shells/txtnum.cxx

Change-Id: I1f548a01574a18e3f3a402ee491358fa36b349e7
Reviewed-on: https://gerrit.libreoffice.org/5907Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>