Co-work with Rodolfo Ribeiro Gomes <rodolforg@gmail.com>. Thanks a lot man!

Verify if there is a space before insert a new command to not merge
variables.

Also, just make atributions in EndPos when it is needed, to make this more clear.

Change-Id: Ia5ddb4c4c8233b3779c0ee0c7009e181cfe5d1c3
Reviewed-on: https://gerrit.libreoffice.org/3983Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>