Conflicts:

	scp2/source/ooo/file_ooo.scp

Change-Id: I84a561fe081040a56acd394b789e2ce1cb488457
Reviewed-on: https://gerrit.libreoffice.org/1812Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>