From 8cbadd8956403b0b0018592f78bf826cd76427c1 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 19 Mar 2011 14:11:43 +0100 Subject: Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...) --- odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx | 2 +- .../OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx | 2 +- .../OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx | 2 +- odk/examples/cpp/complextoolbarcontrols/exports.cxx | 2 +- odk/examples/cpp/remoteclient/remoteclient.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx index ecea9b26..1a90ff68 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx @@ -145,7 +145,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } catch (::com::sun::star::registry::InvalidRegistryException& ) { - OSL_ENSURE(sal_False, "SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); + OSL_FAIL("SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); } return sal_False; diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx index b2efd837..57a76079 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx @@ -78,7 +78,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); + OSL_FAIL( "### InvalidRegistryException!" ); } } return sal_False; diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx index 1361e165..7ca89386 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx @@ -344,7 +344,7 @@ sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKe } catch (InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); + OSL_FAIL( "### InvalidRegistryException!" ); } } return sal_False; diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx index 72ddf40d..6978c5d1 100644 --- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx @@ -80,7 +80,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager return sal_True; } catch(const css::registry::InvalidRegistryException&) - { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } + { OSL_FAIL( "### InvalidRegistryException!" ); } return sal_False; } diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx index 7aaa437e..eb89be7f 100644 --- a/odk/examples/cpp/remoteclient/remoteclient.cxx +++ b/odk/examples/cpp/remoteclient/remoteclient.cxx @@ -254,7 +254,7 @@ sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); + OSL_FAIL( "### InvalidRegistryException!" ); } } return sal_False; -- cgit v1.2.3