diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-30 17:11:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-30 17:16:31 +0100 |
| commit | 37cc83e594fa8ca131fc5fb98506287b7daedffd (patch) | |
| tree | 6bab3ad21edbbccdaf5d324689f8e7b5f8b94f01 /desktop/source/deployment/inc | |
| parent | 25db3f9d3605fd1ab5b8dee86d2d13b6cb80c9b1 (diff) | |
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.
Change-Id: Ibec3d19040fdae23f492cd1e29084e673403e00b
Diffstat (limited to 'desktop/source/deployment/inc')
| -rw-r--r-- | desktop/source/deployment/inc/dp_misc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h index 248b81f69805..cf17cb529578 100644 --- a/desktop/source/deployment/inc/dp_misc.h +++ b/desktop/source/deployment/inc/dp_misc.h @@ -159,6 +159,14 @@ void syncRepositories( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); +/** workaround: for some reason the bridge threads which communicate with the + uno.exe process are not released on time +*/ +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC +void disposeBridges( + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + const & ctx); + } #endif |