fdo#39440 reduce scope of local variables

This addresses some cppcheck warnings.

Change-Id: I404f121ee2e5020359a662f54ffe341f466cd1d5
Reviewed-on: https://gerrit.libreoffice.org/13608
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>