(cherry picked from commit fee688fd)

Conflicts:
	svx/inc/svx/gallery.hxx

Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3
Reviewed-on: https://gerrit.libreoffice.org/3507Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>