Resync/update with trunk as preparation to integration

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

#124311# merge from AOO410 branch

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