(cherry picked from commit d4b5b8bf)

Conflicts:
	vcl/win/source/gdi/salgdi_gdiplus.cxx

Change-Id: I8191f945de10786982fcd1e94afc4f8adbe653bc