#124311# merge fixes from AOO410 branch

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1573602 13f79535-47bb-0310-9956-ffa450edef68