(cherry picked from commit 2448e6cf)

 Conflicts:
	svl/source/numbers/zforfind.cxx

Change-Id: Idbfecf0ff08843db9970a301ab3c3a7317c08cda
Reviewed-on: https://gerrit.libreoffice.org/49851Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>