Patch by: Zhang Lu
Review by: Wang Lei

(cherry picked from commit 424079cb)

Conflicts:
	formula/inc/formula/compiler.hrc
	formula/inc/formula/opcode.hxx
	oox/source/xls/formulabase.cxx
	sc/inc/helpids.h
	sc/util/hidother.src
	sc/util/makefile.mk

Change-Id: Ia04aa69aa2764842507b36ba7cc8c99e99a314e9