Conflicts:
	sc/source/ui/view/select.cxx
	sc/source/ui/view/viewdata.cxx
	sw/source/core/text/redlnitr.cxx
	sw/source/core/text/txtfrm.cxx
	sw/source/core/text/txtftn.cxx
	sw/source/ui/table/tabledlg.cxx

Change-Id: I23371b913514d656552bc6f7fb4ba554ee6a3694