Conflicts:
	offapi/com/sun/star/ui/dialogs/XFilePicker.idl

Change-Id: I89cec47234e275d4753a779e320fc6288c6a4fbc
Reviewed-on: https://gerrit.libreoffice.org/16985Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>