Remove some Eclipse warnings, remove confusing FunctionID/ID renaming...

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