diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 08:33:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 08:33:36 +0000 |
| commit | 91ab3dfc54fd7c66b06a4a278382300c2fab6e05 (patch) | |
| tree | 01f3e363246071eff8c5c2ea8fce1447f4131837 /extensions/source | |
| parent | dc5869c58a4eed04d082ed05ac51a2b7157a73c6 (diff) | |
INTEGRATION: CWS osxpatchpool (1.2.18); FILE MERGED
2006/09/04 06:55:50 obr 1.2.18.2: #i68785# added comment from lat patch
2006/08/28 08:57:42 obr 1.2.18.1: #i68785# gcc 3.3 does not like Any::get<>()
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 3c24c997b541..7bc9a763e93c 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -4,9 +4,9 @@ * * $RCSfile: updatecheck.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 13:30:09 $ + * last change: $Author: vg $ $Date: 2006-09-25 09:33:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -110,8 +110,23 @@ T getValue( const uno::Sequence< beans::NamedValue >& rNamedValues, const sal_Ch throw (uno::RuntimeException) { for( sal_Int32 n=0; n < rNamedValues.getLength(); n++ ) + { + // Unfortunatly gcc-3.3 does not like Any.get<T>(); if( rNamedValues[n].Name.equalsAscii( pszName ) ) - return rNamedValues[n].Value.get<T>(); + { + T value; + if( ! (rNamedValues[n].Value >>= value) ) + throw uno::RuntimeException( + ::rtl::OUString( + cppu_Any_extraction_failure_msg( + &rNamedValues[n].Value, + ::cppu::getTypeFavourUnsigned(&value).getTypeLibType() ), + SAL_NO_ACQUIRE ), + uno::Reference<uno::XInterface>() ); + + return value; + } + } return T(); } |