tree 5aac3e320c294f05c0c2ccd83f5bf58cd0a78ffe
parent 1544769ad718df1a31d5499fb6b6fbc591c38d19
author Jürgen Schmidt <jsc@apache.org> 1379668012 +0000
committer Jürgen Schmidt <jsc@apache.org> 1379668012 +0000

#123283# merge fix from trunk

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