Backport SVN commit 1044569 by zachmann:
o use the same mechanism to detect collision on adding a shape as on
removing.
svn path=/branches/koffice/2.1/koffice/; revision=1048876