diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-22 14:05:30 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-22 14:05:30 +0000 |
| commit | 7aba44da58c6a10c718df711c9e1a4c657fcaa0d (patch) | |
| tree | 47df21f523bce758765b858adc9a009f4bb9bfbf /desktop/source/pkgchk | |
| parent | d7a1ae072645184db92b5a1dba08732b1fc914d9 (diff) | |
INTEGRATION: CWS jl79 (1.10.12); FILE MERGED
2007/11/02 08:59:47 jl 1.10.12.1: #i82775# unopkg disposed the bridges of the office. Now it does this only with the local bridges
Diffstat (limited to 'desktop/source/pkgchk')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index fe083310f0..e49335b5ba 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unopkg_misc.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: vg $ $Date: 2007-10-15 13:01:10 $ + * last change: $Author: ihi $ $Date: 2007-11-22 15:05:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -436,12 +436,14 @@ Reference<XComponentContext> connectToOffice( //============================================================================== Reference<XComponentContext> getUNO( - DisposeGuard & disposeGuard, bool verbose, bool bGui ) + DisposeGuard & disposeGuard, bool verbose, bool bGui, + Reference<XComponentContext> & out_localContext) { // hold lock during process runtime: static ::desktop::Lockfile s_lockfile( false /* no IPC server */ ); Reference<XComponentContext> xComponentContext( bootstrapStandAlone( disposeGuard, verbose ) ); + out_localContext = xComponentContext; if (::dp_misc::office_is_running()) { xComponentContext.set( connectToOffice( xComponentContext, verbose ) ); |