(cherry picked from commit 7b26aba9)

Conflicts:
	sd/sdi/sdraw.sdi
	sd/source/ui/framework/tools/FrameworkHelper.cxx
	sd/source/ui/inc/framework/FrameworkHelper.hxx
	sd/source/ui/view/ViewShellBase.cxx
	sd/source/ui/view/drviews6.cxx
	sfx2/Package_inc.mk
	sfx2/inc/sfx2/sidebar/Sidebar.hxx

Change-Id: Ic6b518e734fe59a7b713e85e934487347b847c5a