this partially changes behaviour introduced with commit bb00a009
but without the performace problems from the old code
thanks to kendy for helping

(cherry picked from commit 2fcf8923)

Change-Id: I5dab81b58262f67db1c70223c612636a8b8c90ee
Reviewed-on: https://gerrit.libreoffice.org/18816Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit a9670e07)