#124311# merge from trunk

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