This is a follow-up patch of 06f61121.

Since the rebasing process is not finished yet, I submit it to
Gerrit, so that the changes are available for later when they can
be applied again to the related files.

Change-Id: I047ade3f9a6b3927ddab8b94a53113b17483c06f
Reviewed-on: https://gerrit.libreoffice.org/486Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com>
Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>