Some small clean-up to use the PopupMenu ToolbarController
(cherry picked from commit e1687ce159e787d98f79d29a3d2131cca4b6ec71)
Conflicts:
svtools/inc/svtools/toolboxcontroller.hxx
svtools/source/uno/toolboxcontroller.cxx
Change-Id: Ie5e0397c32352d52cf2664bdbab920923e74bd03
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details
Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a