diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 12:24:35 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 12:24:35 +0000 |
| commit | df85028cd8fac8c88eea3acfdd2a38840626227c (patch) | |
| tree | a89c770080f00e9e73175540aed17d356d22cf19 /desktop/source/pkgchk/unopkg | |
| parent | 4226d6e96d5bd5bd3ce2c502732e4634e20151b6 (diff) | |
INTEGRATION: CWS sb79 (1.9.28); FILE MERGED
2007/10/04 15:33:36 sb 1.9.28.1: #i79786# Do not create any user data (for the root user) in --shared mode.
Diffstat (limited to 'desktop/source/pkgchk/unopkg')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 20509de5a3bf..95b88491960b 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.11 $ + * $Revision: 1.12 $ * - * last change: $Author: ihi $ $Date: 2007-11-22 15:05:30 $ + * last change: $Author: ihi $ $Date: 2007-11-23 13:24:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,6 +43,7 @@ #include "../../app/lockfile.hxx" #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" +#include "rtl/bootstrap.hxx" #include "rtl/strbuf.hxx" #include "rtl/ustrbuf.hxx" #include "osl/process.h" @@ -436,9 +437,16 @@ Reference<XComponentContext> connectToOffice( //============================================================================== Reference<XComponentContext> getUNO( - DisposeGuard & disposeGuard, bool verbose, bool bGui, + DisposeGuard & disposeGuard, bool verbose, bool shared, bool bGui, Reference<XComponentContext> & out_localContext) { + // do not create any user data (for the root user) in --shared mode: + if (shared) { + rtl::Bootstrap::set( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_CacheUrl")), + rtl::OUString()); + } + // hold lock during process runtime: static ::desktop::Lockfile s_lockfile( false /* no IPC server */ ); Reference<XComponentContext> xComponentContext( |