Merged from Apache OO with adaptions.
http://svn.apache.org/viewvc?rev=1381445&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>

Original Author: Marina Plakalovic <makkica@openoffice.org>
Original Author: Eike Rathke [er] <eike.rathke@oracle.com>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>

slightly reworked patch by <makkica>

 # HG changeset patch
 # User Eike Rathke [er] <eike.rathke@oracle.com>
 # Date 1284055400 -7200
 # Node ID 237cb91dd986ff11eb100cc631206cda102e91f7
 # Parent  1c32319bb02fdf173de6a609fca9f2e9c9f4c73a

Change-Id: Id168462272dc8d618513319ebab41fde5c728b08