Conflicts:
	sfx2/Library_sfx.mk
	sfx2/inc/sfx2/sfxcommands.h
	sfx2/inc/sfx2/sfxsids.hrc
	sfx2/source/appl/appserv.cxx
	svtools/Library_svt.mk

Change-Id: I4305d81cb5fd6f5192a29f85835c78f31310b0d6