[PATCH] Fix for #118524# (F'up to #118485#, #108221#, #67705#)

[Armin Le Grand]

        Hi *,

here is a patch to fix Reginas first findings and some of my own 
regarding the original fix mentioned in the header. May someone please 
have a look and add it to the SVN.

For details, please refer to the task itself (see 
https://issues.apache.org/ooo/show_bug.cgi?id=118524)

Sincerely,
        Armin
--
ALG