diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 12:08:22 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-13 16:50:43 +0100 |
commit | 6495f3945ec0dd4cef37b8dfd5217562de4a3269 (patch) | |
tree | 8547adeed9ab7d2452d7efbe0c5cad284930695f /desktop/source/deployment/misc | |
parent | 1f6580e985d5c3aa0f3161dd884e71a673e7a0b1 (diff) |
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'desktop/source/deployment/misc')
-rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 6 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_platform.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index ba7952364663..1a46cdda3d5a 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -160,7 +160,7 @@ bool compareExtensionFolderWithLastSynchronizedFile( } else if (err1 != ::osl::File::E_None) { - OSL_ENSURE(0, "Cannot access extension folder"); + OSL_FAIL("Cannot access extension folder"); return true; //sync just in case } @@ -174,7 +174,7 @@ bool compareExtensionFolderWithLastSynchronizedFile( } else if (err2 != ::osl::File::E_None) { - OSL_ENSURE(0, "Cannot access file lastsynchronized"); + OSL_FAIL("Cannot access file lastsynchronized"); return true; //sync just in case } @@ -389,7 +389,7 @@ bool office_is_running() } else { - OSL_ENSURE(0, "NOT osl_Process_E_None "); + OSL_FAIL("NOT osl_Process_E_None "); //if osl_getExecutable file than we take the risk of creating a pipe ret = existsOfficePipe(); } diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index eefe9282c69d..d191dd680aa0 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -202,7 +202,7 @@ namespace ret = checkOSandCPU(OUSTR("DragonFly"), OUSTR("X86_64")); else { - OSL_ENSURE(0, "Extension Manager: The extension supports an unknown platform. " + OSL_FAIL("Extension Manager: The extension supports an unknown platform. " "Check the platform element in the description.xml"); ret = false; } |