i125476 Reverted i125187 but kept comments for the case someone else is about to do the same fix

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