Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8

Conflicts:
	include/vcl/metric.hxx
	svtools/source/control/ctrlbox.cxx
	svtools/source/control/ctrltool.cxx
	svtools/source/control/stdmenu.cxx
	svx/source/sidebar/nbdtmg.cxx