[REVEIW-3-6][REVIEW-3-5] fix for fdo#54718

[Noel Power]

This could be potentially quite a nasty problem with basic

https://bugs.freedesktop.org/show_bug.cgi?id=54718

fix to cherry-pick is

http://cgit.freedesktop.org/libreoffice/core/commit/?id=986a0f4eabae324091434c2670bb9592fadc1536