diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-12 23:01:55 -0200 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-12-13 11:57:55 +0400 |
| commit | 00a67c0f9056729695e6004707d64b448756fa6f (patch) | |
| tree | ad780d6c78b55977a00f1ff6b3d418c24bf41d30 /comphelper/source/property | |
| parent | d5b25bdd1247363c5745dd5fcbc2ec784063b6bd (diff) | |
Fix for fdo43460 Part VII getLength() to isEmpty()
Part VII
Module
comphelper
Diffstat (limited to 'comphelper/source/property')
| -rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/property/propagg.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/property/property.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/property/propertybag.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 77eb3a50d13e..de1b3d1f89e2 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -115,7 +115,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const ::rtl::OUStri Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); if ( xInfo.is() ) { - if ( !aPropertyName.getLength() ) + if ( aPropertyName.isEmpty() ) { Sequence< Property> aSeq = xInfo->getProperties(); const Property* pIter = aSeq.getConstArray(); @@ -139,7 +139,7 @@ void SAL_CALL GenericPropertySet::removePropertyChangeListener( const ::rtl::OUS aGuard.clear(); if ( xInfo.is() ) { - if ( !aPropertyName.getLength() ) + if ( aPropertyName.isEmpty() ) { Sequence< Property> aSeq = xInfo->getProperties(); const Property* pIter = aSeq.getConstArray(); diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 2b3b6ed05dc0..be24a1d64ad2 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -513,7 +513,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun: if (1 == nLen) { const ::com::sun::star::beans::PropertyChangeEvent& evt = _rEvents.getConstArray()[0]; - OSL_ENSURE(evt.PropertyName.getLength() > 0, "OPropertySetAggregationHelper::propertiesChange : invalid event !"); + OSL_ENSURE(!evt.PropertyName.isEmpty(), "OPropertySetAggregationHelper::propertiesChange : invalid event !"); // we had a bug where this assertion would have us saved a whole day :) (72514) sal_Int32 nHandle = rPH.getHandleByName( evt.PropertyName ); diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index 50a7f3ff5bdb..9f54602fcfdf 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -126,7 +126,7 @@ void copyProperties(const Reference<XPropertySet>& _rxSource, aBuffer.append( "'" ); Exception aBaseException; - if ( ( aException >>= aBaseException ) && aBaseException.Message.getLength() ) + if ( ( aException >>= aBaseException ) && !aBaseException.Message.isEmpty() ) { aBuffer.append( ", saying '" ); aBuffer.append( ::rtl::OString( aBaseException.Message.getStr(), aBaseException.Message.getLength(), osl_getThreadTextEncoding() ) ); diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx index 432d97e53b0e..4583153d789c 100644 --- a/comphelper/source/property/propertybag.cxx +++ b/comphelper/source/property/propertybag.cxx @@ -91,7 +91,7 @@ namespace comphelper { void lcl_checkForEmptyName( const bool _allowEmpty, const ::rtl::OUString& _name ) { - if ( !_allowEmpty && !_name.getLength() ) + if ( !_allowEmpty && _name.isEmpty() ) throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The property name must not be empty." ) ), // TODO: resource |