[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#51638 In "unopkg gui" dispose component contex...

[Caolán McNamara (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1263

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/1263/1

Resolves: fdo#51638 In "unopkg gui" dispose component context from DeInitVCL

...the same way it is done in soffice.bin.  framework's Desktop::dispose()
requires the solar mutex to be still alive, which is destroyed in DeInitVCL, so
if the component context/service manager is only disposed afterwards, the solar
mutex is already gone.

This required moving disposeBridges() around, but it allowed to get rid of
DisposeGuard.

(cherry picked from commit 37cc83e594fa8ca131fc5fb98506287b7daedffd)

Conflicts:
	desktop/source/pkgchk/unopkg/unopkg_app.cxx
	desktop/source/pkgchk/unopkg/unopkg_shared.h

Change-Id: Ibec3d19040fdae23f492cd1e29084e673403e00b
---
M desktop/source/deployment/gui/dp_gui_service.cxx
M desktop/source/deployment/inc/dp_misc.h
M desktop/source/deployment/misc/dp_misc.cxx
M desktop/source/pkgchk/unopkg/unopkg_app.cxx
M desktop/source/pkgchk/unopkg/unopkg_misc.cxx
M desktop/source/pkgchk/unopkg/unopkg_shared.h
6 files changed, 57 insertions(+), 81 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibec3d19040fdae23f492cd1e29084e673403e00b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Caolán McNamara <caolanm at redhat.com>
Gerrit-Reviewer: Stephan Bergmann <sbergman at redhat.com>