Some small clean-up to use the PopupMenu ToolbarController

(cherry picked from commit e1687ce1)

Conflicts:
	svtools/inc/svtools/toolboxcontroller.hxx
	svtools/source/uno/toolboxcontroller.cxx

Change-Id: Ie5e0397c32352d52cf2664bdbab920923e74bd03