Conflicts:
	sw/source/filter/basflt/fltini.cxx
	sw/source/ui/dialog/ascfldlg.cxx

Change-Id: Ifa12105aa6f747e2797891b6c71128bd96f78bf3