summaryrefslogtreecommitdiff
path: root/fpicker/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 14:27:45 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-13 16:50:43 +0100
commit1848de2f4cce84862cf0843e15f38ce5d1f26108 (patch)
tree38d3983e56f5d2c900c24750e0050556435cfd6b /fpicker/source
parente4d0bb122a93d243067814b9d43f9c9ab1e4df65 (diff)
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'fpicker/source')
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.cxx2
-rw-r--r--fpicker/source/win32/filepicker/asynceventnotifier.cxx2
-rw-r--r--fpicker/source/win32/filepicker/customcontrolfactory.cxx2
-rw-r--r--fpicker/source/win32/filepicker/helppopupwindow.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 545c54b9fa3f..0f7dda31a26c 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -238,7 +238,7 @@ rtl::OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
}
catch(uno::RuntimeException&)
{
- OSL_ENSURE( false, "RuntimeException during event dispatching" );
+ OSL_FAIL( "RuntimeException during event dispatching" );
}
}
}
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 02805f007a8e..eeba8c595940 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -180,7 +180,7 @@ void SAL_CALL CAsyncEventNotifier::shutdown()
// we are waiting infinite, so error will
// be better detected in form of deadlocks
if (WaitForSingleObject(m_hThread, INFINITE) == WAIT_FAILED) {
- OSL_ENSURE(false, "Waiting for thread termination failed!");
+ OSL_FAIL("Waiting for thread termination failed!");
}
// lock mutex again to reset m_hThread
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
index d21afa49a7c9..c933821641d6 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
@@ -50,7 +50,7 @@ CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle,
TCHAR aClsName[256];
ZeroMemory(aClsName,sizeof(aClsName));
if (GetClassName(aControlHandle,aClsName,sizeof(aClsName)) == 0) {
- OSL_ENSURE(false,"Invalid window handle");
+ OSL_FAIL("Invalid window handle");
}
if (0 == _tcsicmp(aClsName,TEXT("button")))
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index f1faf3928416..46021a49777b 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -608,7 +608,7 @@ void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( )
if ( !UnregisterClass(
(LPCTSTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ) )
{
- OSL_ENSURE( false, "unregister window class failed" );
+ OSL_FAIL( "unregister window class failed" );
}
s_ClassAtom = 0;