RF - minor cleanup of pdf_odf code