Currently HSSF (via DrawingManager2) and HSLF (via HSLFSheet) have duplicated logic of allocating escher shape ids. This patch unifies the handling.
Applied via r1803483