Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)

8 files changed, 20 insertions, 20 deletions

diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 0f7dda31a26c..360061978bae 100755
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -459,7 +459,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
     }
     else
     {
-        OSL_ENSURE(sal_False, "Could not start event notifier thread!");
+        OSL_FAIL("Could not start event notifier thread!");
 
         throw uno::RuntimeException(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index d2de0ac6d74b..f61ad675548a 100755
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -145,7 +145,7 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString&
     }
     catch( std::out_of_range& )
     {
-        OSL_ENSURE( sal_False, "Filter not in filter container" );
+        OSL_FAIL( "Filter not in filter container" );
         pos = -1;
     }
 
@@ -166,7 +166,7 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFi
     }
     catch( std::out_of_range& )
     {
-        OSL_ENSURE( sal_False, "Filter index out of range" );
+        OSL_FAIL( "Filter index out of range" );
         bRet = sal_False;
     }
 
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 16a8afd69c6a..93704c00d94c 100755
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -226,12 +226,12 @@ CFilePreview* CFilePreview::createInstance(
         catch( CPreviewException& )
         {
             OSL_ASSERT( !s_FilePreviewInst );
-            OSL_ENSURE( sal_False, "Creation of the preview window failed" );
+            OSL_FAIL( "Creation of the preview window failed" );
         }
         catch( CAutoOleInit::COleInitException& )
         {
             OSL_ASSERT( !s_FilePreviewInst );
-            OSL_ENSURE( sal_False, "OleInitalize failed" );
+            OSL_FAIL( "OleInitalize failed" );
         }
     }
 
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index eeba8c595940..fac8480da907 100755
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -299,7 +299,7 @@ void SAL_CALL CAsyncEventNotifier::run()
                         }
                         catch(uno::RuntimeException&)
                         {
-                            OSL_ENSURE(sal_False,"RuntimeException during event dispatching");
+                            OSL_FAIL("RuntimeException during event dispatching");
                         }
                     }
                 }
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index dedc63b3458a..ce8d26ac655d 100755
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -395,14 +395,14 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16
     // method the caller should use XFilterManager
     if ( !hwndCtrl || (aControlId == LISTBOX_FILTER) )
     {
-        OSL_ENSURE( sal_False, "invalid control id" );
+        OSL_FAIL( "invalid control id" );
         return;
     }
 
     CTRL_CLASS aCtrlClass = GetCtrlClass( hwndCtrl );
     if ( UNKNOWN == aCtrlClass )
     {
-        OSL_ENSURE( sal_False, "unsupported control class" );
+        OSL_FAIL( "unsupported control class" );
         return;
     }
 
@@ -411,7 +411,7 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16
 
     if ( !lpfnSetValue )
     {
-        OSL_ENSURE( sal_False, "unsupported control action" );
+        OSL_FAIL( "unsupported control action" );
         return;
     }
 
@@ -437,14 +437,14 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16
     // method the caller should use XFilterManager
     if ( !hwndCtrl || (aControlId == LISTBOX_FILTER) )
     {
-        OSL_ENSURE( sal_False, "invalid control id" );
+        OSL_FAIL( "invalid control id" );
         return Any( );
     }
 
     CTRL_CLASS aCtrlClass = GetCtrlClass( hwndCtrl );
     if ( UNKNOWN == aCtrlClass )
     {
-        OSL_ENSURE( sal_False, "unsupported control class" );
+        OSL_FAIL( "unsupported control class" );
         return Any( );
     }
 
@@ -453,7 +453,7 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16
 
     if ( !lpfnGetValue )
     {
-        OSL_ENSURE( sal_False, "unsupported control action" );
+        OSL_FAIL( "unsupported control action" );
         return Any( );
     }
 
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 379f5b771d50..5171ec064c85 100755
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -272,7 +272,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
     // Print a message if an error occurred.
     if ( g_xFactory.is() == sal_False )
     {
-        OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
+        OSL_FAIL("Can't create RegistryServiceFactory");
         return(-1);
     }
 
@@ -363,7 +363,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
     // Print a message if an error occurred.
     if ( xComponent.is() == sal_False )
     {
-        OSL_ENSURE(sal_False, "Error shuting down");
+        OSL_FAIL("Error shuting down");
     }
 
     // Dispose and clear factory
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 899d8af2488c..8204b51cd930 100755
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -252,7 +252,7 @@ sal_Bool CMtaFolderPicker::browseForFolder( )
 
         if ( WaitForSingleObject( m_hEvtThrdReady, MAX_WAITTIME ) != WAIT_OBJECT_0 )
         {
-            OSL_ENSURE( sal_False, "sta thread not ready" );
+            OSL_FAIL( "sta thread not ready" );
             return sal_False;
         }
 
@@ -721,7 +721,7 @@ unsigned int CMtaFolderPicker::run( )
     // we stop here and return
     if ( FAILED( hr ) )
     {
-        OSL_ENSURE( sal_False, "CoInitialize failed" );
+        OSL_FAIL( "CoInitialize failed" );
         return sal::static_int_cast< unsigned int >(-1);
     }
 
@@ -740,7 +740,7 @@ unsigned int CMtaFolderPicker::run( )
     }
     else
     {
-        OSL_ENSURE( sal_False, "failed to create sta thread" );
+        OSL_FAIL( "failed to create sta thread" );
         nRet = sal::static_int_cast< unsigned int >(-1);
     }
 
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 7c5a90ca67db..c253de2f3227 100755
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -110,7 +110,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
     // Print a message if an error occurred.
     if ( g_xFactory.is() == sal_False )
     {
-        OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
+        OSL_FAIL("Can't create RegistryServiceFactory");
         return(-1);
     }
 
@@ -127,7 +127,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
 
     if ( xFolderPicker.is() == sal_False )
     {
-        OSL_ENSURE( sal_False, "Error creating FolderPicker Service" );
+        OSL_FAIL( "Error creating FolderPicker Service" );
         return(-1);
     }
 
@@ -161,7 +161,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
     // Print a message if an error occurred.
     if ( xComponent.is() == sal_False )
     {
-        OSL_ENSURE(sal_False, "Error shuting down");
+        OSL_FAIL("Error shuting down");
     }
 
     // Dispose and clear factory