Fixed #60858, which showed a regression of the fix for #56420 introduced by my refactoring to fix #56822.

Includes new unit test based on the bug sample file.

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