and some fixes in that region

(cherry picked from commit 2ece2411)

Conflicts:
	default_images/svx/res/cropmarkers.png
	default_images/svx/res/cropmarkers2.png
	default_images/svx/res/cropmarkersACC.png
	default_images/svx/res/markers.png
	default_images/svx/res/markers2.png
	default_images/svx/res/markersACC.png
	officecfg/registry/schema/org/openoffice/Office/Calc.xcs
	officecfg/registry/schema/org/openoffice/Office/Draw.xcs
	officecfg/registry/schema/org/openoffice/Office/Impress.xcs
	officecfg/registry/schema/org/openoffice/Office/Writer.xcs
	officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
	sc/source/core/tool/viewopti.cxx
	sd/source/ui/app/optsitem.cxx
	svx/inc/svx/svdhdl.hxx
	svx/source/svdraw/svdhdl.cxx
	svx/source/svdraw/svdstr.src
	sw/source/ui/config/viewopt.cxx
	sw/source/ui/docvw/edtwin.cxx

Change-Id: I4094c2ca18a3c29e8e24a15ddeb040808ce4605d