summaryrefslogtreecommitdiff
path: root/fpicker
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
commit4363d620076d3624d96bdde5ad72d88065858071 (patch)
treea7da5dc94879b317210c6ca046bb252316541639 /fpicker
parentdbb2c4348eb885830a5588071fdf8a1d8871b89b (diff)
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'fpicker')
-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 04b5e7388e..6f2bcfc497 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 3f1f6eb30a..31ce79c088 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 5332fe4087..36f2a3748a 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 42c1ec1327..33b26a0c5d 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;