summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-19 14:09:49 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-19 14:09:49 +0100
commit970be45287de1a046df1c546abb06ad5f6b9c084 (patch)
tree0a88a771e96b5e9d884e5b087adad9d320bdbe7b /framework
parente35cffb37a792b78f8dbcd85b329fa88097b1ea5 (diff)
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
Diffstat (limited to 'framework')
-rwxr-xr-xframework/source/dispatch/interceptionhelper.cxx2
-rwxr-xr-xframework/source/layoutmanager/layoutmanager.cxx4
-rwxr-xr-xframework/source/services/autorecovery.cxx4
-rwxr-xr-xframework/source/services/sessionlistener.cxx6
4 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 8dc54239ad0e..c9db19b8ac5e 100755
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -330,7 +330,7 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent
// SAFE ->
aReadLock.lock();
if (!m_lInterceptionRegs.empty() )
- OSL_ENSURE(sal_False, "There are some pending interceptor objects, which seams to be registered during (!) the destruction of a frame.");
+ OSL_FAIL("There are some pending interceptor objects, which seams to be registered during (!) the destruction of a frame.");
aReadLock.unlock();
// <- SAFE
#endif // ODL_DEBUG_LEVEL>0
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index da7c776132b5..a8dd447f0266 100755
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1254,13 +1254,13 @@ throw (RuntimeException)
void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 )
throw (uno::RuntimeException)
{
- OSL_ENSURE( sal_False, "This method is obsolete and should not be used!\n" );
+ OSL_FAIL( "This method is obsolete and should not be used!\n" );
}
void SAL_CALL LayoutManager::resetInplaceMenuBar()
throw (uno::RuntimeException)
{
- OSL_ENSURE( sal_False, "This method is obsolete and should not be used!\n" );
+ OSL_FAIL( "This method is obsolete and should not be used!\n" );
}
//---------------------------------------------------------------------------------------------------------
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index ebc332ad8190..0514725f353c 100755
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -329,7 +329,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems)
(bLockForAddRemoveVectorItems)
)
{
- OSL_ENSURE(sal_False, "Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
+ OSL_FAIL("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
throw css::uno::RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.")),
m_xOwner);
@@ -356,7 +356,7 @@ void CacheLockGuard::unlock()
if (m_rCacheLock < 0)
{
- OSL_ENSURE(sal_False, "Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
+ OSL_FAIL("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
throw css::uno::RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")),
m_xOwner);
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 72a7e5bc2046..47c6a8494065 100755
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -176,7 +176,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
xDispatch->dispatch(aURL, args);
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
// save failed, but tell manager to go on if we havent yet dispatched the request
// in case of synchronous saving the notification is done by the caller
if ( bAsync && m_rSessionManager.is() )
@@ -204,7 +204,7 @@ void SessionListener::QuitSessionQuietly()
xDispatch->dispatch(aURL, args);
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
}
@@ -283,7 +283,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
} catch (com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
- OSL_ENSURE(sal_False, aMsg.getStr());
+ OSL_FAIL(aMsg.getStr());
}
return m_bRestored;