(cherry picked from commit c3198835)

Conflicts:
	basic/source/comp/parser.cxx
	basic/source/comp/token.cxx
	dbaccess/source/ui/dlg/generalpage.cxx
	sc/source/ui/unoobj/chart2uno.cxx
	vcl/quartz/salbmp.cxx

Change-Id: Ic9580f2d4a44959cb3e38906eb4153b2c2a54899