diff options
Diffstat (limited to 'stoc/source/registry_tdprovider')
-rw-r--r-- | stoc/source/registry_tdprovider/base.hxx | 4 | ||||
-rw-r--r-- | stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx | 33 | ||||
-rw-r--r-- | stoc/source/registry_tdprovider/tdmodule.cxx | 3 | ||||
-rw-r--r-- | stoc/source/registry_tdprovider/tdprovider.cxx | 7 | ||||
-rw-r--r-- | stoc/source/registry_tdprovider/tdservice.cxx | 2 |
5 files changed, 18 insertions, 31 deletions
diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx index 4bb05982c847..532b81dd8468 100644 --- a/stoc/source/registry_tdprovider/base.hxx +++ b/stoc/source/registry_tdprovider/base.hxx @@ -135,7 +135,7 @@ inline sal_Int32 getRTValueAsInt32( const RTConstValue & rVal ) case RT_TYPE_UINT32: return rVal.m_value.aULong; default: - OSL_ENSURE( sal_False, "### unexpected value type!" ); + OSL_FAIL( "### unexpected value type!" ); return 0; } } @@ -170,7 +170,7 @@ inline Any getRTValue( const RTConstValue & rVal ) return Any( &aStr, ::getCppuType( (const OUString *)0 ) ); } default: - OSL_ENSURE( sal_False, "### unexpected RTValue!" ); + OSL_FAIL( "### unexpected RTValue!" ); return Any(); } } diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx index 9feae0da9ef0..3aea56231ad9 100644 --- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx +++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx @@ -153,8 +153,7 @@ TypeDescriptionEnumerationImpl::createInstance( } else { - OSL_ENSURE( - sal_False, + OSL_FAIL( "TypeDescriptionEnumerationImpl::createInstance " "- Invalid registry key!" ); } @@ -164,8 +163,7 @@ TypeDescriptionEnumerationImpl::createInstance( { // openKey, getValueType, getBinaryValue - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::createInstance " + OSL_FAIL( "TypeDescriptionEnumerationImpl::createInstance " "- Caught InvalidRegistryException!" ); } @@ -218,8 +216,7 @@ TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl() catch (...) { // No exceptions from dtors, please! - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl " + OSL_FAIL( "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl " "- Caught exception!" ); } @@ -238,8 +235,7 @@ TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl() catch (Exception &) { // No exceptions from dtors, please! - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl " + OSL_FAIL( "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl " "- Caught exception!" ); } @@ -435,8 +431,7 @@ bool TypeDescriptionEnumerationImpl::queryMore() } else { - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::queryMore " + OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore " "- Invalid registry key!" ); } @@ -445,8 +440,7 @@ bool TypeDescriptionEnumerationImpl::queryMore() { // getValueType, getBinaryValue - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::queryMore " + OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore " "- Caught InvalidRegistryException!" ); // Don't stop iterating! @@ -465,8 +459,7 @@ bool TypeDescriptionEnumerationImpl::queryMore() } catch ( registry::InvalidRegistryException const & ) { - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::queryMore " + OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore " "- Caught InvalidRegistryException!" ); } } @@ -532,8 +525,7 @@ bool TypeDescriptionEnumerationImpl::queryMore() { // getBinaryValue - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::queryMore " + OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore " "- Caught InvalidRegistryException!" ); } } @@ -551,8 +543,7 @@ bool TypeDescriptionEnumerationImpl::queryMore() } catch ( registry::InvalidRegistryException const & ) { - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::queryMore " + OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore " "- Caught InvalidRegistryException!" ); } */ @@ -614,8 +605,7 @@ TypeDescriptionEnumerationImpl::queryNext() } else { - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::queryNext " + OSL_FAIL( "TypeDescriptionEnumerationImpl::queryNext " "- Invalid registry key!" ); } } @@ -624,8 +614,7 @@ TypeDescriptionEnumerationImpl::queryNext() { // getValueType, getBinaryValue - OSL_ENSURE( sal_False, - "TypeDescriptionEnumerationImpl::queryNext " + OSL_FAIL( "TypeDescriptionEnumerationImpl::queryNext " "- Caught InvalidRegistryException!" ); } diff --git a/stoc/source/registry_tdprovider/tdmodule.cxx b/stoc/source/registry_tdprovider/tdmodule.cxx index f187c8853415..82464efb9442 100644 --- a/stoc/source/registry_tdprovider/tdmodule.cxx +++ b/stoc/source/registry_tdprovider/tdmodule.cxx @@ -99,8 +99,7 @@ ModuleTypeDescriptionImpl::getMembers() } catch ( NoSuchElementException const & ) { - OSL_ENSURE( sal_False, - "ModuleTypeDescriptionImpl::getMembers - " + OSL_FAIL( "ModuleTypeDescriptionImpl::getMembers - " " Caught NoSuchElementException!" ); } } diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx index eb2629558fcc..bcebd85ffd44 100644 --- a/stoc/source/registry_tdprovider/tdprovider.cxx +++ b/stoc/source/registry_tdprovider/tdprovider.cxx @@ -419,8 +419,7 @@ Any ProviderImpl::getByHierarchicalNameImpl( const OUString & rName ) } catch ( InvalidRegistryException const & ) { - OSL_ENSURE( sal_False, - "ProviderImpl::getByHierarchicalName " + OSL_FAIL( "ProviderImpl::getByHierarchicalName " "- Caught InvalidRegistryException!" ); // openKey, closeKey, getValueType, getBinaryValue, isValid @@ -599,11 +598,11 @@ com::sun::star::uno::Reference< XTypeDescription > createTypeDescription( case RT_TYPE_INVALID: case RT_TYPE_OBJECT: // deprecated and not used case RT_TYPE_UNION: // deprecated and not used - OSL_ENSURE( sal_False, "createTypeDescription - Unsupported Type!" ); + OSL_FAIL( "createTypeDescription - Unsupported Type!" ); break; default: - OSL_ENSURE( sal_False, "createTypeDescription - Unknown Type!" ); + OSL_FAIL( "createTypeDescription - Unknown Type!" ); break; } diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx index 4a87927b6429..76c50932f22b 100644 --- a/stoc/source/registry_tdprovider/tdservice.cxx +++ b/stoc/source/registry_tdprovider/tdservice.cxx @@ -543,7 +543,7 @@ void ServiceTypeDescriptionImpl::getReferences() case RT_REF_NEEDS: break; default: - OSL_ENSURE( sal_False, "### unsupported reference type!" ); + OSL_FAIL( "### unsupported reference type!" ); break; } } |