Conflicts:
	basic/source/runtime/makefile.mk
	basic/source/runtime/step2.cxx
	desktop/prj/build.lst
	desktop/source/app/app.cxx
	desktop/source/deployment/registry/dp_backend.cxx
	drawinglayer/source/attribute/fontattribute.cxx
	editeng/inc/editeng/fontitem.hxx
	editeng/source/editeng/edtspell.cxx
	editeng/source/misc/svxacorr.cxx
	framework/inc/services/substitutepathvars.hxx
	framework/source/services/substitutepathvars.cxx
	sfx2/qa/cppunit/makefile.mk
	sfx2/source/doc/SfxDocumentMetaData.cxx
	sfx2/source/doc/objxtor.cxx
	svx/source/dialog/svxruler.cxx
	sysui/desktop/icons/so9_base_app.ico
	sysui/desktop/icons/so9_calc_app.ico
	sysui/desktop/icons/so9_draw_app.ico
	sysui/desktop/icons/so9_impress_app.ico
	sysui/desktop/icons/so9_main_app.ico
	sysui/desktop/icons/so9_math_app.ico
	sysui/desktop/icons/so9_writer_app.ico
	xmlhelp/source/cxxhelp/provider/databases.cxx
	xmlhelp/source/cxxhelp/provider/db.cxx
	xmlhelp/source/cxxhelp/provider/db.hxx

 - there was a 2nd dir re-using that pagein object file

(ULONG no longer exists)

because the underlying uno infrastructure has been shutdown already,
we need to ensure their lifecycle more carefully.

You can't hope to change *some* virtual methods of a hierarchy and
leave others untouched, they all have to be changed together.

This reverts commit 9f46bee92be38f2d59295cabd9f1fdb149708153.

do not hardcode libreoffice wrapper name; the compat libreoffice
symlink is created if BrOffice brand is being built

Xavier SVX_LIGHT deletion forgot just on occurence.
This patch delete the last one.

Lots of re-work here; un-conditionally use the splash component to do
more intelligent fast starting. Throw up the splash screen before we
start doing 'pagein' work (to get better progress / launch feedback),
and hide javaldx too.