Conflicts:
	starmath/qa/cppunit/makefile.mk
	sw/source/core/layout/fly.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/ui/inc/view.hxx
	sw/source/ui/shells/grfsh.cxx