diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:14:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:14:03 +0000 |
| commit | 816402c6f2524e8fcaf569bdf8628ebef514bcb4 (patch) | |
| tree | a860ffe7cbc01f3758722b1d3f6da2d0a30b75fe | |
| parent | 82135ec5e1dd377f7e9a555474d29a0400c3e846 (diff) | |
INTEGRATION: CWS sb59 (1.4.202); FILE MERGED
2006/07/20 07:55:33 sb 1.4.202.1: #i67537# Made code warning-free.
| -rw-r--r-- | desktop/source/migration/services/basicmigration.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 303acac368..201ab25288 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -4,9 +4,9 @@ * * $RCSfile: basicmigration.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 09:46:25 $ + * last change: $Author: obo $ $Date: 2006-10-12 14:14:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -248,8 +248,10 @@ namespace migration *pIter >>= aValue; if ( aValue.Name.equalsAscii( "UserData" ) ) { - sal_Bool bSuccess = aValue.Value >>= m_sSourceDir; - OSL_ENSURE( bSuccess == sal_True, "BasicMigration::initialize: argument UserData has wrong type!" ); + if ( !(aValue.Value >>= m_sSourceDir) ) + { + OSL_ENSURE( false, "BasicMigration::initialize: argument UserData has wrong type!" ); + } m_sSourceDir += sSourceUserBasic; break; } @@ -260,7 +262,7 @@ namespace migration // XJob // ----------------------------------------------------------------------------- - Any BasicMigration::execute( const Sequence< beans::NamedValue >& Arguments ) + Any BasicMigration::execute( const Sequence< beans::NamedValue >& ) throw (lang::IllegalArgumentException, Exception, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -275,7 +277,7 @@ namespace migration // ============================================================================= Reference< XInterface > SAL_CALL BasicMigration_create( - Reference< XComponentContext > const & xContext ) + Reference< XComponentContext > const & ) SAL_THROW( () ) { return static_cast< lang::XTypeProvider * >( new BasicMigration() ); |