Conflicts:
	sc/inc/scabstdlg.hxx
	sc/source/ui/attrdlg/scdlgfact.cxx
	sc/source/ui/attrdlg/scdlgfact.hxx
	sc/source/ui/inc/hfedtdlg.hxx
	sc/source/ui/pagedlg/hfedtdlg.cxx

Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268
Reviewed-on: https://gerrit.libreoffice.org/3911Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>