diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-19 14:06:18 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-19 14:06:18 +0100 |
commit | 352f1a58e24c9c3ec45829111a77fa9fbd8065ab (patch) | |
tree | f4d3ec761af697a535fad86c5fec2e045c933d0e /package/source/xstor/xfactory.cxx | |
parent | 00d5ba291e359368ee484a7c0c43281c22bd3df6 (diff) |
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
Diffstat (limited to 'package/source/xstor/xfactory.cxx')
-rw-r--r-- | package/source/xstor/xfactory.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index e0e1ce8148e4..80be2484a307 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -134,7 +134,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr { if( !( aArguments[1] >>= nStorageMode ) ) { - OSL_ENSURE( sal_False, "Wrong second argument!\n" ); + OSL_FAIL( "Wrong second argument!\n" ); throw lang::IllegalArgumentException(); // TODO: } // it's allways possible to read written storage in this implementation @@ -154,13 +154,13 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr { if ( !aURL.getLength() ) { - OSL_ENSURE( sal_False, "Empty URL is provided!\n" ); + OSL_FAIL( "Empty URL is provided!\n" ); throw lang::IllegalArgumentException(); // TODO: } if ( aURL.equalsIgnoreAsciiCaseAsciiL( "vnd.sun.star.pkg", 16 ) ) { - OSL_ENSURE( sal_False, "Packages URL's are not valid for storages!\n" ); // ??? + OSL_FAIL( "Packages URL's are not valid for storages!\n" ); // ??? throw lang::IllegalArgumentException(); // TODO: } @@ -179,7 +179,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr } else if ( !( aArguments[0] >>= xStream ) && !( aArguments[0] >>= xInputStream ) ) { - OSL_ENSURE( sal_False, "Wrong first argument!\n" ); + OSL_FAIL( "Wrong first argument!\n" ); throw uno::Exception(); // TODO: Illegal argument } @@ -240,12 +240,12 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 ); } else - OSL_ENSURE( sal_False, "Unacceptable property, will be ignored!\n" ); + OSL_FAIL( "Unacceptable property, will be ignored!\n" ); } } else { - OSL_ENSURE( sal_False, "Wrong third argument!\n" ); + OSL_FAIL( "Wrong third argument!\n" ); throw uno::Exception(); // TODO: Illegal argument } @@ -262,7 +262,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr if ( !xSeekable.is() ) { // TODO: wrap stream to let it be seekable - OSL_ENSURE( sal_False, "Nonseekable streams are not supported for now!\n" ); + OSL_FAIL( "Nonseekable streams are not supported for now!\n" ); } if ( !CheckPackageSignature_Impl( xInputStream, xSeekable ) ) @@ -282,7 +282,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr if ( !xSeekable.is() ) { // TODO: wrap stream to let it be seekable - OSL_ENSURE( sal_False, "Nonseekable streams are not supported for now!\n" ); + OSL_FAIL( "Nonseekable streams are not supported for now!\n" ); } if ( !CheckPackageSignature_Impl( xStream->getInputStream(), xSeekable ) ) |