(cherry picked from commit 9956ed13)

Conflicts:
	filter/source/msfilter/escherex.cxx
	include/vcl/gfxlink.hxx
	svx/source/xml/xmlgrhlp.cxx
	sw/source/ui/docvw/romenu.cxx
	vcl/source/filter/graphicfilter.cxx

Change-Id: Ibcbb69b9c57cd8a438788e9a9c95744e99b6fcdd