Remove indirection...

Change-Id: Ia01ed40391a4d5725a9f9e22817406216020c0d2
Remove com::sun::star.

Change-Id: Id656f1ef1cdfb695bcfcb35e393def3682e8c556