(cherry picked from commit 2fc5d294)

Conflicts:
	svx/inc/svx/fillctrl.hxx
	svx/source/tbxctrls/fillctrl.cxx

Change-Id: I3be23f7ec199c49beb7c5cecfb835977e2bedcea