(cherry picked from commit 6a820f13)

Conflicts:
	svtools/source/uno/wizard/wizardshell.cxx

Change-Id: I2d67451c6fb536149603777a84d9b73494b6ed84