SAL_OVERRIDE, Mac OS X sfx2 redux

Change-Id: Ic99184543e2c019e96622e445b56c21760bf025a