diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 12:10:31 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 12:10:31 +0000 |
| commit | c5521bdfeafebc03691b98ce4b6671fb28aba0a0 (patch) | |
| tree | 6739a8723851ae6957d5c97ed71c853b5590542b /sc/source/ui/unoobj/miscuno.cxx | |
| parent | 1de2809d8cacc50318e2b3cc2afdf2d0862be643 (diff) | |
INTEGRATION: CWS calcuno01 (1.8.304); FILE MERGED
2004/01/05 11:52:46 sab 1.8.304.1: #i22706#; improve API using
Diffstat (limited to 'sc/source/ui/unoobj/miscuno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/miscuno.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 762af4e95989..2cea9cbc96e3 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: miscuno.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: sab $ $Date: 2002-09-26 09:05:05 $ + * last change: $Author: vg $ $Date: 2005-03-23 13:10:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,9 +88,7 @@ uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::A { if ( rAny.getValueTypeClass() == uno::TypeClass_INTERFACE ) { - uno::Reference<uno::XInterface> xInterface; - rAny >>= xInterface; - return xInterface; + return uno::Reference<uno::XInterface>(rAny, uno::UNO_QUERY); } return uno::Reference<uno::XInterface>(); //! Exception? } @@ -104,7 +102,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope { try { - uno::Any aAny = xProp->getPropertyValue( rName ); + uno::Any aAny(xProp->getPropertyValue( rName )); //! type conversion??? // operator >>= shouldn't be used for bool (?) if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN ) @@ -130,9 +128,8 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp { try { - uno::Any aAny = xProp->getPropertyValue( rName ); //! type conversion??? - aAny >>= nRet; + xProp->getPropertyValue( rName ) >>= nRet; } catch(uno::Exception&) { @@ -151,7 +148,7 @@ sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XProp { try { - uno::Any aAny = xProp->getPropertyValue( rName ); + uno::Any aAny(xProp->getPropertyValue( rName )); if ( aAny.getValueTypeClass() == uno::TypeClass_ENUM ) { |