(cherry picked from commit dd4bed5d)

Conflicts:
	svtools/inc/svtools/optionsdrawinglayer.hxx
	svtools/source/config/optionsdrawinglayer.cxx
	sw/source/core/crsr/viscrs.cxx

Change-Id: I21167b58a9b81f5fa15c7def5fb4b6023f91f32b