Conflicts:
	include/svtools/fileview.hxx
	svtools/source/contnr/fileview.cxx

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