(cherry picked from commit cf417aec)

Conflicts:
	extras/source/gallery/gallery_system/sg2.sdg
	extras/source/gallery/gallery_system/sg2.thm
	svx/inc/galtheme.hrc
	svx/inc/svx/fontworkgallery.hxx
	svx/inc/svx/gallery.hxx
	svx/inc/svx/galtheme.hxx
	svx/source/gallery2/galctrl.cxx
	svx/source/gallery2/galexpl.cxx
	svx/source/gallery2/galobj.cxx
	svx/source/tbxctrls/fontworkgallery.cxx
	vcl/inc/vcl/outdev.hxx
	vcl/source/gdi/outdev6.cxx

Change-Id: I519a2cf4e16bb42ecfd9c4b48094e65adcc35599
(cherry picked from commit ddec662e8dc234b7196c1b3c28db5da743557ec6)