(cherry picked from commit a2bbabbe)

Conflicts:
	offapi/com/sun/star/text/ViewSettings.idl
	officecfg/registry/schema/org/openoffice/Office/Writer.xcs
	sw/source/ui/config/usrpref.cxx
	sw/source/ui/uiview/viewport.cxx

Change-Id: I939ec22527a0b654de5f379e781c24c0a3088739