this is the canonical order, and it makes the code easier to read

Reviewed-on: https://gerrit.libreoffice.org/16242Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
(cherry picked from commit 0c18bedb)

Change-Id: I272e7f1e140296e582702b6dbf77a03eefb65470