diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:12:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:12:57 +0000 |
| commit | 4368d94470f71be663ba1fed12cc5b3a127bd4c6 (patch) | |
| tree | a55fccdfa7b2b534e008f9fbf1b22c6a9537b7d6 /desktop | |
| parent | 06539a7d25b848229327a8265efe4ee479d54711 (diff) | |
INTEGRATION: CWS impress23 (1.5.40); FILE MERGED
2004/12/30 09:31:32 dbo 1.5.40.2: #i38957# using Any templated ctor instead of makeAny(): testing compilers
2004/12/29 14:39:37 dbo 1.5.40.1: #i38957# removed extract_throw<>(), using Any::get<>() now
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/registry/dp_backend.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 879b471ed485..cc1f7087809c 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dp_backend.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2004-11-09 14:10:41 $ + * last change: $Author: kz $ $Date: 2005-01-21 17:12:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,11 +104,11 @@ PackageRegistryBackend::PackageRegistryBackend( m_eContext( CONTEXT_UNKNOWN ), m_readOnly( false ) { - extract_throw( &m_context, args[ 0 ] ); + m_context = args[ 0 ].get<OUString>(); if (args.getLength() > 1) { - extract_throw( &m_cachePath, args[ 1 ] ); + m_cachePath = args[ 1 ].get<OUString>(); if (args.getLength() > 2) - extract_throw( &m_readOnly, args[ 2 ] ); + m_readOnly = args[ 2 ].get<bool>(); } if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") )) @@ -590,7 +590,8 @@ Any Package::TypeInfo::getIcon( sal_Bool highContrast, sal_Bool smallIcon ) { if (! smallIcon) return Any(); - return makeAny( highContrast ? m_smallIcon_HC : m_smallIcon ); + const sal_uInt16 nIconId = (highContrast ? m_smallIcon_HC : m_smallIcon); + return Any( &nIconId, getCppuType( static_cast<sal_uInt16 const *>(0) ) ); } } |