diff options
Diffstat (limited to 'comphelper/source/property/propertycontainerhelper.cxx')
| -rw-r--r-- | comphelper/source/property/propertycontainerhelper.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 0b420a3eebd8..6233efbc011f 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -255,7 +256,7 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( PropertiesIterator aPos = searchHandle(_nHandle); if (aPos == m_aProperties.end()) { - OSL_ENSURE( false, "OPropertyContainerHelper::convertFastPropertyValue: unknown handle!" ); + OSL_FAIL( "OPropertyContainerHelper::convertFastPropertyValue: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper return bModified; @@ -274,8 +275,7 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( Any aNewRequestedValue( _rValue ); // normalization - // (#102329# - 2002-08-14 - fs@openoffice.org) - // (#i29490# - 2004-06-16 - fs@openoffice.org) + // #i29490# if ( !aNewRequestedValue.getValueType().equals( aPos->aProperty.Type ) ) { // the actually given value is not of the same type as the one required Any aProperlyTyped( NULL, aPos->aProperty.Type.getTypeLibType() ); @@ -399,7 +399,7 @@ void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An PropertiesIterator aPos = searchHandle(_nHandle); if (aPos == m_aProperties.end()) { - OSL_ENSURE( false, "OPropertyContainerHelper::setFastPropertyValue: unknown handle!" ); + OSL_FAIL( "OPropertyContainerHelper::setFastPropertyValue: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper return; @@ -441,7 +441,7 @@ void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHa PropertiesIterator aPos = const_cast<OPropertyContainerHelper*>(this)->searchHandle(_nHandle); if (aPos == m_aProperties.end()) { - OSL_ENSURE( false, "OPropertyContainerHelper::getFastPropertyValue: unknown handle!" ); + OSL_FAIL( "OPropertyContainerHelper::getFastPropertyValue: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper return; @@ -501,7 +501,7 @@ void OPropertyContainerHelper::modifyAttributes(sal_Int32 _nHandle, sal_Int32 _n PropertiesIterator aPos = searchHandle(_nHandle); if (aPos == m_aProperties.end()) { - OSL_ENSURE( false, "OPropertyContainerHelper::modifyAttributes: unknown handle!" ); + OSL_FAIL( "OPropertyContainerHelper::modifyAttributes: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper return; @@ -550,3 +550,4 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |