(cherry picked from commit e94681fb)

Conflicts:
	sc/source/ui/app/typemap.cxx
	sc/source/ui/view/galwrap.cxx
	sc/source/ui/view/makefile.mk
	sc/source/ui/view/tabvwsh9.cxx
	sd/source/ui/view/drviews9.cxx
	svx/Package_inc.mk
	svx/inc/GalleryControl.hxx
	svx/inc/galbrws2.hxx
	svx/inc/svx/galbrws.hxx
	svx/inc/svx/gallery.hxx
	svx/source/gallery2/GalleryControl.cxx
	svx/source/gallery2/galbrws.cxx
	svx/source/gallery2/galbrws2.cxx
	svx/source/gallery2/galexpl.cxx
	sw/source/ui/shells/basesh.cxx

Change-Id: I49c2b99ca551f058b852c0e5e28cc2fe8c205031