[Libreoffice] Review + Cherrypick request for 3.4.2

[Muthu Subramanian K]

Hi,

It would be great if somebody can review and cherry pick these fixes:

http://cgit.freedesktop.org/libreoffice/filters/commit/?id=8faf3f2e8b085285b51bd6a993efd2c9f68714d1

and

http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=7589a8d3f6d3cb9f08f39059dedf05b7636cbc0f

for 3.4.2, please?

Thank you!
Muthu Subramanian