summaryrefslogtreecommitdiff
path: root/shell
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
commit7c66790faa8491c0d28c6cde38ea08c054ec59b5 (patch)
tree2e17489dadc6f885e7842b1cbcc3a1d05416bca7 /shell
parentdfa833215b5ad25790ed4827353cbd4fde42e663 (diff)
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
Diffstat (limited to 'shell')
-rwxr-xr-xshell/source/win32/workbench/TestProxySet.cxx8
-rwxr-xr-xshell/source/win32/workbench/TestSmplMail.cxx6
-rwxr-xr-xshell/source/win32/workbench/TestSysShExec.cxx10
3 files changed, 12 insertions, 12 deletions
diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
index e65deece1e..6828db6c92 100755
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ b/shell/source/win32/workbench/TestProxySet.cxx
@@ -101,7 +101,7 @@ int SAL_CALL main(int, char*, char* )
// 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);
}
@@ -118,7 +118,7 @@ int SAL_CALL main(int, char*, char* )
if ( !xProxySettings.is() )
{
- OSL_ENSURE( sal_False, "Error creating SystemProxySettings Service" );
+ OSL_FAIL( "Error creating SystemProxySettings Service" );
return(-1);
}
@@ -145,7 +145,7 @@ int SAL_CALL main(int, char*, char* )
if ( !xProxySettings.is() )
{
- OSL_ENSURE( sal_False, "Error creating SystemProxySettings Service" );
+ OSL_FAIL( "Error creating SystemProxySettings Service" );
return(-1);
}
@@ -187,7 +187,7 @@ int SAL_CALL main(int, char*, char* )
// 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/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 09f11925c2..20a0ae7e0c 100755
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -96,7 +96,7 @@ int SAL_CALL main(int , char*, char* )
// 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);
}
@@ -113,7 +113,7 @@ int SAL_CALL main(int , char*, char* )
if ( !xSmplMailClientSuppl.is() )
{
- OSL_ENSURE( sal_False, "Error creating SimpleSystemMail Service" );
+ OSL_FAIL( "Error creating SimpleSystemMail Service" );
return(-1);
}
@@ -175,7 +175,7 @@ int SAL_CALL main(int , char*, char* )
// 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/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index 797947e1cd..946dadac5e 100755
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -106,7 +106,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
// 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);
}
@@ -121,7 +121,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
if ( !xSysShExec.is() )
{
- OSL_ENSURE( sal_False, "Error creating SystemShellExecute Service" );
+ OSL_FAIL( "Error creating SystemShellExecute Service" );
return(-1);
}
@@ -135,11 +135,11 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
}
catch( SystemShellExecuteException& )
{
- OSL_ENSURE( sal_False, "Error executing system command" );
+ OSL_FAIL( "Error executing system command" );
}
catch( IllegalArgumentException& )
{
- OSL_ENSURE( sal_False, "Invalid parameter" );
+ OSL_FAIL( "Invalid parameter" );
}
//--------------------------------------------------
@@ -152,7 +152,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
// 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