diff options
Diffstat (limited to 'ucb/source/ucp/file')
| -rw-r--r-- | ucb/source/ucp/file/bc.cxx | 15 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filinpstr.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filstr.cxx | 4 |
3 files changed, 9 insertions, 14 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 444ba7055881..8242276ad604 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -546,14 +546,12 @@ BaseContent::getContentType() } else { - OSL_ENSURE( false, - "BaseContent::getContentType - Property value was null!" ); + OSL_FAIL( "BaseContent::getContentType - Property value was null!" ); } } catch ( sdbc::SQLException const & ) { - OSL_ENSURE( false, - "BaseContent::getContentType - Caught SQLException!" ); + OSL_FAIL( "BaseContent::getContentType - Caught SQLException!" ); } } } @@ -679,15 +677,13 @@ BaseContent::createNewContent( if ( xRow->wasNull() ) { IsDocument = false; -// OSL_ENSURE( false, -// "BaseContent::createNewContent - Property value was null!" ); +// OSL_FAIL( // "BaseContent::createNewContent - Property value was null!" ); // return Reference< XContent >(); } } catch ( sdbc::SQLException const & ) { - OSL_ENSURE( false, - "BaseContent::createNewContent - Caught SQLException!" ); + OSL_FAIL( "BaseContent::createNewContent - Caught SQLException!" ); return Reference< XContent >(); } @@ -1215,8 +1211,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, } catch ( sdbc::SQLException const & ) { - OSL_ENSURE( false, - "BaseContent::insert - Caught SQLException!" ); + OSL_FAIL( "BaseContent::insert - Caught SQLException!" ); contentTypeSet = false; } diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 555a83bb0272..1299b33284ae 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -74,11 +74,11 @@ XInputStream_impl::~XInputStream_impl() } catch (io::IOException const &) { - OSL_ENSURE(false, "unexpected situation"); + OSL_FAIL("unexpected situation"); } catch (uno::RuntimeException const &) { - OSL_ENSURE(false, "unexpected situation"); + OSL_FAIL("unexpected situation"); } } diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 63b8fd46b140..6ecf53620377 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -136,11 +136,11 @@ XStream_impl::~XStream_impl() } catch (io::IOException const &) { - OSL_ENSURE(false, "unexpected situation"); + OSL_FAIL("unexpected situation"); } catch (uno::RuntimeException const &) { - OSL_ENSURE(false, "unexpected situation"); + OSL_FAIL("unexpected situation"); } } |