diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:27:45 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-13 16:50:43 +0100 |
commit | 1848de2f4cce84862cf0843e15f38ce5d1f26108 (patch) | |
tree | 38d3983e56f5d2c900c24750e0050556435cfd6b /basic | |
parent | e4d0bb122a93d243067814b9d43f9c9ab1e4df65 (diff) |
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/basmgr/basicmanagerrepository.cxx | 2 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 2 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 14 | ||||
-rw-r--r-- | basic/source/uno/scriptcont.cxx | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 2057a065e96c..c01b736c10d8 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -594,7 +594,7 @@ namespace basic // a BasicManager which is still in our repository is being deleted. // That's bad, since by definition, we *own* all instances in our // repository. - OSL_ENSURE( false, "ImplRepository::Notify: nobody should tamper with the managers, except ourself!" ); + OSL_FAIL( "ImplRepository::Notify: nobody should tamper with the managers, except ourself!" ); m_aStore.erase( loop ); break; } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 28b783c3d7d8..5185ff77abde 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -178,7 +178,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV } catch( Exception& ) { - OSL_ENSURE( false, "DocObjectWrapper::DocObjectWrapper: Caught exception!" ); + OSL_FAIL( "DocObjectWrapper::DocObjectWrapper: Caught exception!" ); } } diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 48f8169d71d3..d654d58f1607 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -884,7 +884,7 @@ sal_Bool SfxLibraryContainer::init_Impl( aMessage.append( ::rtl::OUStringToOString( rLib.aName, osl_getThreadTextEncoding() ) ); aMessage.append( "'.\n\nException:" ); aMessage.append( ::rtl::OUStringToOString( ::comphelper::anyToString( aError ), osl_getThreadTextEncoding() ) ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif } } @@ -1379,7 +1379,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, aMessage.append( "invalid library element '" ); aMessage.append( ::rtl::OUStringToOString( aElementName, osl_getThreadTextEncoding() ) ); aMessage.append( "'." ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif continue; } @@ -1468,7 +1468,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, aMessage.append( "invalid library element '" ); aMessage.append( ::rtl::OUStringToOString( aElementName, osl_getThreadTextEncoding() ) ); aMessage.append( "'." ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif continue; } @@ -1893,7 +1893,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto aMessage.append( ::rtl::OUStringToOString( rLib.aName, osl_getThreadTextEncoding() ) ); aMessage.append( "'.\n\nException:" ); aMessage.append( ::rtl::OUStringToOString( ::comphelper::anyToString( aError ), osl_getThreadTextEncoding() ) ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif return; } @@ -2314,7 +2314,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) aMessage.append( ::rtl::OUStringToOString( Name, osl_getThreadTextEncoding() ) ); aMessage.append( "'.\n\nException:" ); aMessage.append( ::rtl::OUStringToOString( ::comphelper::anyToString( aError ), osl_getThreadTextEncoding() ) ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif return; } @@ -2364,7 +2364,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) aMessage.append( "couln't open library element stream - attempted to open library '" ); aMessage.append( ::rtl::OUStringToOString( Name, osl_getThreadTextEncoding() ) ); aMessage.append( "'." ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif return; } @@ -3188,7 +3188,7 @@ rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDia break; } case END_REACHED: - OSL_ENSURE( false, "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" ); + OSL_FAIL( "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" ); break; } } diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index e1b4cf40459b..ecc9c6c4cad9 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -691,7 +691,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, aMessage.append( "invalid library element '" ); aMessage.append( ::rtl::OUStringToOString( aElementName, osl_getThreadTextEncoding() ) ); aMessage.append( "'." ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif continue; } @@ -777,7 +777,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, aMessage.append( "invalid library element '" ); aMessage.append( ::rtl::OUStringToOString( aElementName, osl_getThreadTextEncoding() ) ); aMessage.append( "'." ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif continue; } |