[PATCH] Change in core[libreoffice-3-6-2]: fdo#54385: Displaying help/version early on UNX requires ser...

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/695

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/695/1

fdo#54385: Displaying help/version early on UNX requires service manager

This regression was introduced with 6c6358a6822d3562b9b8c7668a7d60d6c644dfe8
"Related fdo#53006: Do not instantiate service manager too early."

(cherry picked from commit 2f14e2e67c58fe6948501d57a38cd0d2ad84dfff)
(cherry picked from commit 7b33d564bc0079e5d8309e4b5081b1d44e1efd12)

Conflicts:
	desktop/inc/app.hxx
	desktop/source/app/app.cxx
	desktop/source/app/appinit.cxx
	desktop/source/app/sofficemain.cxx
(with ensureProcessServiceManager still available in libreoffice-3-6-2, this
cherry-pick shrinks up dramatically)

Change-Id: If22ea3ac6474188bf0792246620e5c705a813445
---
M desktop/source/app/sofficemain.cxx
1 file changed, 2 insertions(+), 0 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/695
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If22ea3ac6474188bf0792246620e5c705a813445
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-2
Gerrit-Owner: Stephan Bergmann <sbergman at redhat.com>