diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:02:30 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:02:30 +0000 |
| commit | b686b44f76a42055e6cc38fc6c7c66acac581431 (patch) | |
| tree | 3579354fee549d69a2d445b00421a37918f99096 /extensions | |
| parent | 318420e10f8957b21372e4a5c90feedc52f79544 (diff) | |
INTEGRATION: CWS wae4extensions (1.11.78); FILE MERGED
2007/10/03 12:48:53 ericb 1.11.78.2: #i81612# fix warning because of uninitialized values
2007/09/27 07:18:26 fs 1.11.78.1: #i81612# warning-free code
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/resource/resource.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx index 5a93685b9eca..ef481c0c5a19 100644 --- a/extensions/source/resource/resource.cxx +++ b/extensions/source/resource/resource.cxx @@ -4,9 +4,9 @@ * * $RCSfile: resource.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2007-04-26 08:09:28 $ + * last change: $Author: ihi $ $Date: 2008-01-14 15:02:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -269,7 +269,7 @@ Any SAL_CALL ResourceService::invoke OGuard aGuard( Application::GetSolarMutex() ); for( sal_Int32 n = 0; n < nElements; n++ ) { - sal_Int32 nId; + sal_Int32 nId = 0; if( !(pIn[n] >>= nId) ) { if( xC.is() ) @@ -322,7 +322,7 @@ Any SAL_CALL ResourceService::invoke Reference< XTypeConverter > xC = getTypeConverter(); OGuard aGuard( Application::GetSolarMutex() ); - sal_Int32 nId; + sal_Int32 nId = 0; if( !(Params.getConstArray()[0] >>= nId) ) { if( xC.is() ) @@ -423,15 +423,12 @@ Any SAL_CALL ResourceService::getValue(const OUString& PropertyName) OGuard aGuard( Application::GetSolarMutex() ); if( PropertyName.equalsAscii("FileName" )) return makeAny( aFileName ); - else - { - Reference< XInvocation > xI = getDefaultInvocation(); - if( xI.is() ) - return xI->getValue( PropertyName ); - else - throw UnknownPropertyException(); - } - return Any(); + + Reference< XInvocation > xI = getDefaultInvocation(); + if( xI.is() ) + return xI->getValue( PropertyName ); + + throw UnknownPropertyException(); } // XInvokation |