Conflicts:
	framework/inc/dispatch/oxt_handler.hxx
	framework/inc/services/layoutmanager.hxx
	framework/inc/tabwin/tabwindow.hxx
	framework/source/dispatch/menudispatcher.cxx
	framework/source/helper/dockingareadefaultacceptor.cxx
	framework/source/helper/ocomponentaccess.cxx
	framework/source/helper/ocomponentenumeration.cxx
	framework/source/helper/oframes.cxx
	framework/source/layoutmanager/toolbarlayoutmanager.hxx
	framework/source/recording/dispatchrecorder.cxx
	framework/source/services/desktop.cxx
	framework/source/services/frame.cxx
	framework/source/services/urltransformer.cxx

Change-Id: Ibb04e3f6f0796e7f2be16dcce38542f8b90708d4
Reviewed-on: https://gerrit.libreoffice.org/8265Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>