correct application of chosen underline style in Calc cells and Drawing objects
in Writer

(cherry picked from commit fd23db16)

Change-Id: Id77299c173eef99ea2eea0c0896e9bfd0bd9d1eb