Reduce duplication by replacing lots of deprecated methods with calls to their replacement (which is basically the same code anyway)

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1540878 13f79535-47bb-0310-9956-ffa450edef68