(cherry picked from commit f18ad613)

Conflicts:
	svtools/source/filter/jpeg/jpeg.cxx
	svx/inc/svx/svdundo.hxx
	svx/source/svdraw/svdograf.cxx
	vcl/source/gdi/pngread.cxx

Change-Id: I733551fa9447eb8f45e9163a9c0189f013b03e82