diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-17 10:52:33 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-17 10:52:33 +0000 |
| commit | 6b6a4854179857621c5b71b1cdb003e15c89ac08 (patch) | |
| tree | 757a724ae4eaf41d2cb3a02c3ab1daf21f593f14 /desktop/source/pkgchk | |
| parent | dc0944e5a5bd135d049f8dd2e079db9ce63d6ec7 (diff) | |
INTEGRATION: CWS jl68 (1.6.50); FILE MERGED
2007/08/01 09:23:59 jl 1.6.50.3: #i80018# undoing last change (using default bootstrapping. This will be done on a separate CWS
2007/08/01 07:12:53 jl 1.6.50.2: #i80121# ccatching DisposedException now when disposing all bridges
2007/07/16 12:28:23 jl 1.6.50.1: #i78167# unopkg now can be used with bootstrap parameter, for example -env:UNO_JAVA_JFW_INSTALLDATA=xyz
Diffstat (limited to 'desktop/source/pkgchk')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 63f11d8841..84d903965c 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.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2007-07-26 08:55:07 $ + * last change: $Author: ihi $ $Date: 2007-08-17 11:52:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -146,6 +146,21 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ) } return false; } +//============================================================================== + +bool isBootstrapVariable(sal_uInt32 * pIndex) +{ + OSL_ASSERT(osl_getCommandArgCount() >= *pIndex); + + OUString arg; + osl_getCommandArg(*pIndex, &arg.pData); + if (arg.matchAsciiL("-env:", 5)) + { + ++(*pIndex); + return true; + } + return false; +} //============================================================================== bool readArgument( @@ -352,14 +367,15 @@ Reference<XComponentContext> bootstrapStandAlone( // bootstrap standalone UNO using types.rdb and services.rdb // directly avoiding any rc entries Reference<beans::XPropertySet> xProps( - ::cppu::createRegistryServiceFactory( - getExecutableDir() + OUSTR("/types.rdb"), - getExecutableDir() + OUSTR("/services.rdb"), - true /* read-only */ ), - UNO_QUERY_THROW ); + ::cppu::createRegistryServiceFactory( + getExecutableDir() + OUSTR("/types.rdb"), + getExecutableDir() + OUSTR("/services.rdb"), + true /* read-only */ ), + UNO_QUERY_THROW ); Reference<XComponentContext> xContext( - xProps->getPropertyValue( OUSTR("DefaultContext") ), - UNO_QUERY_THROW ); + xProps->getPropertyValue( OUSTR("DefaultContext") ), + UNO_QUERY_THROW ); + // assure disposing of local component context: disposeGuard.reset( Reference<lang::XComponent>( xContext, UNO_QUERY ) ); |