Apache OpenOffice (AOO) Bugzilla – Attachment #5159: more cleanup based on previous patch for issue #12061