This commit fixes commit aa799f64,
and partially reverts commits bd505fdb
and 9104d5e8 that seem unnecessary
now. Unit test included, the existing unit tests of partially
reverted commits are kept.

Change-Id: I2a02cda546f5d484553c3b9467993fca36dae140
Reviewed-on: https://gerrit.libreoffice.org/33722Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>