(cherry picked from commit aae247a3)

Conflicts:
	sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
	sfx2/inc/sfx2/sidebar/Theme.hxx
	sfx2/source/sidebar/SidebarChildWindow.cxx
	sfx2/source/sidebar/SidebarController.cxx
	sfx2/source/sidebar/SidebarDockingWindow.cxx

Change-Id: Ib59132d6d5e177d5a02ee24973b0fb07114db60a