Conflicts:
	binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c
	filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu
	filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
	filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu
	filter/source/graphicfilter/eos2met/eos2met.cxx
	filter/source/msfilter/msvbahelper.cxx
	filter/source/svg/makefile.mk
	filter/source/svg/svgexport.cxx
	filter/source/svg/svgfilter.cxx
	filter/source/svg/svgfilter.hxx
	filter/source/svg/svgfontexport.cxx
	filter/source/svg/svgfontexport.hxx
	filter/source/svg/svgwriter.cxx
	filter/source/svg/svgwriter.hxx
	oox/inc/oox/core/relations.hxx
	oox/inc/oox/core/relationshandler.hxx
	oox/inc/oox/dump/biffdumper.hxx
	oox/inc/oox/dump/dffdumper.hxx
	oox/inc/oox/dump/dumperbase.hxx
	oox/inc/oox/dump/oledumper.hxx
	oox/inc/oox/dump/pptxdumper.hxx
	oox/inc/oox/helper/containerhelper.hxx
	oox/inc/oox/helper/propertyset.hxx
	oox/inc/oox/xls/commentsbuffer.hxx
	oox/inc/oox/xls/sharedformulabuffer.hxx
	oox/source/drawingml/shape.cxx
	oox/source/dump/oledumper.cxx
	oox/source/helper/binaryinputstream.cxx
	oox/source/helper/binaryoutputstream.cxx
	oox/source/helper/binarystreambase.cxx
	oox/source/helper/propertyset.cxx
	oox/source/ole/vbacontrol.cxx
	oox/source/ole/vbaproject.cxx
	oox/source/token/namespaces.hxx.tail
	oox/source/vml/vmlshape.cxx
	oox/source/xls/commentsbuffer.cxx
	oox/source/xls/condformatbuffer.cxx
	oox/source/xls/drawingfragment.cxx
	oox/source/xls/formulaparser.cxx
	oox/source/xls/pivotcachebuffer.cxx
	oox/source/xls/richstring.cxx
	oox/source/xls/sharedformulabuffer.cxx
	oox/source/xls/sheetdatacontext.cxx
	oox/source/xls/worksheethelper.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx