Conflicts:
	sc/source/core/tool/dbcolect.cxx
	sc/source/filter/excel/xiname.cxx
	sc/source/filter/xml/xmldrani.cxx
	sc/source/ui/view/tabview2.cxx