Conflicts:
	cui/source/inc/treeopt.hxx
	cui/source/options/treeopt.cxx

Change-Id: I971c7760e7252321aeca8a4f403515562a9057bb
Reviewed-on: https://gerrit.libreoffice.org/10323Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>