more sal_Int32 to sal_uInt32 and simplification

Change-Id: I061fdc9e0743715d1b358a16d72486cfb62a35aa