PDFBOX-2002: removed two methods deprecated since 2010 and reformatted

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