mass-correct XML structure: second pass

Change-Id: If783c2d02662499dc41174b37beb9398013f8b93
Reviewed-on: https://gerrit.libreoffice.org/11173
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>