This reverts commit 46e53913.

Conflicts:
	vcl/inc/salbmp.hxx
	vcl/source/gdi/gdimtf.cxx
	vcl/unx/generic/gdi/salgdi2.cxx

Change-Id: Ifa893b687c724ea71655aa4e084a44858695073e