additionally deduplicate code and remove unnecessary abstraction

Change-Id: Ib826b5cac74e95ce4ae8d02368b0983eb4942b29
Reviewed-on: https://gerrit.libreoffice.org/52027Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>