Conflicts:
	sw/inc/viewsh.hxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/ui/index/cnttab.cxx
	sw/source/ui/ribbar/inputwin.cxx