Apache OpenOffice (AOO) Bugzilla – Attachment #7663: add back some missing pieces from original ooo11rc2 version for issue #16415