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

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

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

Change-Id: If456792f23429a80582a48b022d268e6179316a1