some places were using the wrong enum constant, and some places were
unnnecessarily converting to sal_Int16

Change-Id: I754993533c840cd33106820d99af2dc951f26a80