Conflicts:
	sc/source/ui/inc/docfunc.hxx

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