Conflicts:
	binfilter/bf_forms/source/component/forms_Filter.cxx
	binfilter/bf_sw/source/core/inc/node2lay.hxx
	binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
	binfilter/inc/bf_sw/swdbtoolsclient.hxx
	filter/source/xsltdialog/xmlfileview.cxx
	oox/source/ole/axcontrol.cxx
	oox/source/vml/vmlformatting.cxx
	oox/source/xls/autofiltercontext.cxx
	oox/source/xls/externallinkfragment.cxx
	oox/source/xls/formulaparser.cxx
	oox/source/xls/pivotcachebuffer.cxx
	oox/source/xls/pivotcachefragment.cxx
	oox/source/xls/sheetdatacontext.cxx
	writerfilter/source/dmapper/GraphicImport.cxx
	writerfilter/source/dmapper/SettingsTable.cxx
	writerfilter/source/ooxml/model.xml