Reapply patches from ODFTOOLKIT-331, since they were wiped out by the recent revert


git-svn-id: https://svn.apache.org/repos/asf/incubator/odf/trunk@1375358 13f79535-47bb-0310-9956-ffa450edef68
3 files changed