Index: connectivity/source/commontools/dbcharset.cxx =================================================================== --- connectivity/source/commontools/dbcharset.cxx (revision 1565575) +++ connectivity/source/commontools/dbcharset.cxx (working copy) @@ -110,7 +110,7 @@ ensureConstructed( ); rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; - if ( _rIanaName.getLength() ) + if ( !_rIanaName.isEmpty() ) { // byte string conversion ::rtl::OString sMimeByteString( _rIanaName.getStr(), _rIanaName.getLength(), RTL_TEXTENCODING_ASCII_US ); Index: connectivity/source/commontools/dbtools.cxx =================================================================== --- connectivity/source/commontools/dbtools.cxx (revision 1565575) +++ connectivity/source/commontools/dbtools.cxx (working copy) @@ -257,7 +257,7 @@ const ::rtl::OUString& _rsTitleOrPath, const Reference< XMultiServiceFactory >& _rxFactory ) { - ENSURE_OR_RETURN( _rsTitleOrPath.getLength(), "getDataSource_allowException: invalid arg !", NULL ); + ENSURE_OR_RETURN( !_rsTitleOrPath.isEmpty(), "getDataSource_allowException: invalid arg !", NULL ); Reference< XNameAccess> xDatabaseContext( _rxFactory->createInstance( @@ -297,7 +297,7 @@ if (xDataSource.is()) { // do it with interaction handler - if(!_rsUser.getLength() || !_rsPwd.getLength()) + if(_rsUser.isEmpty() || _rsPwd.isEmpty()) { Reference xProp(xDataSource,UNO_QUERY); ::rtl::OUString sPwd, sUser; @@ -312,7 +312,7 @@ { OSL_ENSURE(sal_False, "dbtools::getConnection: error while retrieving data source properties!"); } - if(bPwdReq && !sPwd.getLength()) + if(bPwdReq && sPwd.isEmpty()) { // password required, but empty -> connect using an interaction handler Reference xConnectionCompletion(xProp, UNO_QUERY); if (xConnectionCompletion.is()) @@ -435,7 +435,7 @@ xRowSetProps->getPropertyValue(::rtl::OUString::createFromAscii("URL")) >>= sURL; Reference< XConnection > xPureConnection; - if (sDataSourceName.getLength()) + if ( !sDataSourceName.isEmpty() ) { // the row set's data source property is set // -> try to connect, get user and pwd setting for that ::rtl::OUString sUser, sPwd; @@ -447,7 +447,7 @@ xPureConnection = getConnection_allowException( sDataSourceName, sUser, sPwd, _rxFactory ); } - else if (sURL.getLength()) + else if ( !sURL.isEmpty() ) { // the row set has no data source, but a connection url set // -> try to connection with that url Reference< XDriverManager > xDriverManager( @@ -459,7 +459,7 @@ xRowSetProps->getPropertyValue(sUserProp) >>= sUser; if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), xRowSetProps)) xRowSetProps->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd; - if (sUser.getLength()) + if ( !sUser.isEmpty() ) { // use user and pwd together with the url Sequence< PropertyValue> aInfo(2); aInfo.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); @@ -585,7 +585,7 @@ OSL_PRECOND( _rxConnection.is(), "::dbtools::getFieldsByCommandDescriptor: invalid connection!" ); OSL_PRECOND( ( CommandType::TABLE == _nCommandType ) || ( CommandType::QUERY == _nCommandType ) || ( CommandType::COMMAND == _nCommandType ), "::dbtools::getFieldsByCommandDescriptor: invalid command type!" ); - OSL_PRECOND( _rCommand.getLength(), "::dbtools::getFieldsByCommandDescriptor: invalid command (empty)!" ); + OSL_PRECOND( !_rCommand.isEmpty(), "::dbtools::getFieldsByCommandDescriptor: invalid command (empty)!" ); Reference< XNameAccess > xFields; @@ -877,7 +877,7 @@ OSL_ENSURE(_rxMetaData.is(), "impl_doComposeTableName : invalid meta data !"); if ( !_rxMetaData.is() ) return ::rtl::OUString(); - OSL_ENSURE(_rName.getLength(), "impl_doComposeTableName : at least the name should be non-empty !"); + OSL_ENSURE( !_rName.isEmpty(), "impl_doComposeTableName : at least the name should be non-empty !"); const ::rtl::OUString sQuoteString = _rxMetaData->getIdentifierQuoteString(); const NameComponentSupport aNameComps( lcl_getNameComponentSupport( _rxMetaData, _eComposeRule ) ); @@ -886,19 +886,19 @@ ::rtl::OUString sCatalogSep; sal_Bool bCatlogAtStart = sal_True; - if ( _rCatalog.getLength() && aNameComps.bCatalogs ) + if ( !_rCatalog.isEmpty() && aNameComps.bCatalogs ) { sCatalogSep = _rxMetaData->getCatalogSeparator(); bCatlogAtStart = _rxMetaData->isCatalogAtStart(); - if ( bCatlogAtStart && sCatalogSep.getLength()) + if ( bCatlogAtStart && !sCatalogSep.isEmpty() ) { aComposedName.append( _bQuote ? quoteName( sQuoteString, _rCatalog ) : _rCatalog ); aComposedName.append( sCatalogSep ); } } - if ( _rSchema.getLength() && aNameComps.bSchemas ) + if ( !_rSchema.isEmpty() && aNameComps.bSchemas ) { aComposedName.append( _bQuote ? quoteName( sQuoteString, _rSchema ) : _rSchema ); aComposedName.appendAscii( "." ); @@ -906,9 +906,9 @@ aComposedName.append( _bQuote ? quoteName( sQuoteString, _rName ) : _rName ); - if ( _rCatalog.getLength() + if ( !_rCatalog.isEmpty() && !bCatlogAtStart - && sCatalogSep.getLength() + && !sCatalogSep.isEmpty() && aNameComps.bCatalogs ) { Index: connectivity/source/commontools/sqlerror.cxx =================================================================== --- connectivity/source/commontools/sqlerror.cxx (revision 1565575) +++ connectivity/source/commontools/sqlerror.cxx (working copy) @@ -269,7 +269,7 @@ sState = m_pResources->loadString( nResourceId ); } - if ( !sState.getLength() ) + if ( sState.isEmpty() ) sState = ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) ); return sState; Index: connectivity/source/commontools/CommonTools.cxx =================================================================== --- connectivity/source/commontools/CommonTools.cxx (revision 1565575) +++ connectivity/source/commontools/CommonTools.cxx (working copy) @@ -315,7 +315,7 @@ if(!isCharOk(*pStr,_rSpecials)) return sal_False; - if ( rName.getLength() + if ( !rName.isEmpty() && ( (rName.toChar() == '_') || ( (rName.toChar() >= '0') && (rName.toChar() <= '9') @@ -356,7 +356,7 @@ ::rtl::OUString quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName) { ::rtl::OUString sName = _rName; - if(_rQuote.getLength() && _rQuote.toChar() != ' ') + if( !_rQuote.isEmpty() && _rQuote.toChar() != ' ' ) sName = _rQuote + _rName + _rQuote; return sName; } Index: connectivity/source/commontools/statementcomposer.cxx =================================================================== --- connectivity/source/commontools/statementcomposer.cxx (revision 1565575) +++ connectivity/source/commontools/statementcomposer.cxx (working copy) @@ -132,7 +132,7 @@ case CommandType::TABLE: { - if ( !_rData.sCommand.getLength() ) + if ( _rData.sCommand.isEmpty() ) break; sStatement = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SELECT * FROM " ) ); @@ -163,7 +163,7 @@ // the command used by the query xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Command" ) ) ) >>= sStatement; - if ( !sStatement.getLength() ) + if ( sStatement.isEmpty() ) break; // use a composer to build a statement from the query filter/order props @@ -211,7 +211,7 @@ break; } - if ( sStatement.getLength() ) + if ( !sStatement.isEmpty() ) { // create an composer Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW ); Index: connectivity/source/commontools/predicateinput.cxx =================================================================== --- connectivity/source/commontools/predicateinput.cxx (revision 1565575) +++ connectivity/source/commontools/predicateinput.cxx (working copy) @@ -61,10 +61,10 @@ //--------------------------------------------------------------------- static sal_Unicode lcl_getSeparatorChar( const ::rtl::OUString& _rSeparator, sal_Unicode _nFallback ) { - OSL_ENSURE( 0 < _rSeparator.getLength(), "::lcl_getSeparatorChar: invalid separator string!" ); + OSL_ENSURE( !_rSeparator.isEmpty(), "::lcl_getSeparatorChar: invalid separator string!" ); sal_Unicode nReturn( _nFallback ); - if ( _rSeparator.getLength() ) + if ( !_rSeparator.isEmpty() ) nReturn = static_cast< sal_Char >( _rSeparator.getStr()[0] ); return nReturn; } @@ -150,7 +150,7 @@ ) { // yes -> force a quoted text and try again ::rtl::OUString sQuoted( _rStatement ); - if ( sQuoted.getLength() + if ( !sQuoted.isEmpty() && ( (sQuoted.getStr()[0] != '\'') || (sQuoted.getStr()[ sQuoted.getLength() - 1 ] != '\'' ) ) @@ -343,7 +343,7 @@ if(nIndex == -1) sField = _sField; sal_Int32 nType = ::connectivity::OSQLParser::getFunctionReturnType(sField,&m_aParser.getContext()); - if ( nType == DataType::OTHER || !sField.getLength() ) + if ( nType == DataType::OTHER || sField.isEmpty() ) { // first try the international version ::rtl::OUString sSql; Index: connectivity/source/commontools/filtermanager.cxx =================================================================== --- connectivity/source/commontools/filtermanager.cxx (revision 1565575) +++ connectivity/source/commontools/filtermanager.cxx (working copy) @@ -104,7 +104,7 @@ try { - if ( m_xComponentAggregate.is() && getFilterComponent( fcPublicFilter ).getLength() ) + if ( m_xComponentAggregate.is() && !getFilterComponent( fcPublicFilter ).isEmpty() ) { // only if there changed something m_xComponentAggregate->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FILTER), makeAny( getComposedFilter() ) ); } @@ -137,7 +137,7 @@ sal_Int32 i; for ( i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i ) { - if ( m_aFilterComponents[ i ].getLength() ) + if ( !m_aFilterComponents[i].isEmpty() ) { if ( nOnlyNonEmpty != -1 ) // it's the second non-empty component Index: connectivity/source/commontools/dbconversion.cxx =================================================================== --- connectivity/source/commontools/dbconversion.cxx (revision 1565575) +++ connectivity/source/commontools/dbconversion.cxx (working copy) @@ -466,7 +466,7 @@ nSecond = (sal_uInt16)_sSQLString.getToken(0,sTimeSep,nIndex).toInt32(); nIndex = 0; ::rtl::OUString sNano(_sSQLString.getToken(1,'.',nIndex)); - if ( sNano.getLength() ) + if ( !sNano.isEmpty() ) { // our time struct only supports hundredth seconds sNano = sNano.copy(0,::std::min(sNano.getLength(),2)); Index: connectivity/source/commontools/TKeys.cxx =================================================================== --- connectivity/source/commontools/TKeys.cxx (revision 1565575) +++ connectivity/source/commontools/TKeys.cxx (working copy) @@ -61,7 +61,7 @@ { sdbcx::ObjectType xRet = NULL; - if(_rName.getLength()) + if( !_rName.isEmpty() ) { OTableKeyHelper* pRet = new OTableKeyHelper(m_pTable,_rName,m_pTable->getKeyProperties(_rName)); xRet = pRet; Index: connectivity/source/commontools/ConnectionWrapper.cxx =================================================================== --- connectivity/source/commontools/ConnectionWrapper.cxx (revision 1565575) +++ connectivity/source/commontools/ConnectionWrapper.cxx (working copy) @@ -216,9 +216,9 @@ // first we create the digest we want to have rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); rtlDigestError aError = rtl_digest_update(aDigest,_rURL.getStr(),_rURL.getLength()*sizeof(sal_Unicode)); - if ( _rUserName.getLength() ) + if ( !_rUserName.isEmpty() ) aError = rtl_digest_update(aDigest,_rUserName.getStr(),_rUserName.getLength()*sizeof(sal_Unicode)); - if ( _rPassword.getLength() ) + if ( !_rPassword.isEmpty() ) aError = rtl_digest_update(aDigest,_rPassword.getStr(),_rPassword.getLength()*sizeof(sal_Unicode)); // now we need to sort the properties PropertyValue* pBegin = _rInfo.getArray(); @@ -250,7 +250,7 @@ } } } - if ( sValue.getLength() > 0 ) + if ( !sValue.isEmpty() ) { // we don't have to convert this into UTF8 because we don't store on a file system aError = rtl_digest_update(aDigest,sValue.getStr(),sValue.getLength()*sizeof(sal_Unicode)); Index: connectivity/source/commontools/parameters.cxx =================================================================== --- connectivity/source/commontools/parameters.cxx (revision 1565575) +++ connectivity/source/commontools/parameters.cxx (working copy) @@ -273,7 +273,7 @@ const ::rtl::OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength(); for ( ; pDetailFields < pDetailFieldsEnd; ++pDetailFields, ++pMasterFields ) { - if ( !pMasterFields->getLength() || !pDetailFields->getLength() ) + if ( pMasterFields->isEmpty() || pDetailFields->isEmpty() ) continue; // if not even the master part of the relationship exists in the parent , the @@ -302,7 +302,7 @@ { ::rtl::OUString sNewParamName; const ::rtl::OUString sFilterCondition = createFilterConditionFromColumnLink( *pMasterFields, *pDetailFields, sNewParamName ); - OSL_PRECOND( sNewParamName.getLength(), "ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned nonsense!" ); + OSL_PRECOND( !sNewParamName.isEmpty(), "ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned nonsense!" ); // remember meta information about this new parameter ::std::pair< ParameterInformation::iterator, bool > aInsertionPos = Index: connectivity/source/commontools/DriversConfig.cxx =================================================================== --- connectivity/source/commontools/DriversConfig.cxx (revision 1565575) +++ connectivity/source/commontools/DriversConfig.cxx (working copy) @@ -75,18 +75,18 @@ static const ::rtl::OUString s_sMetaData(RTL_CONSTASCII_USTRINGPARAM("MetaData")); ::rtl::OUString sParentURLPattern; aURLPatternNode.getNodeValue(s_sParentURLPattern) >>= sParentURLPattern; - if ( sParentURLPattern.getLength() ) + if ( !sParentURLPattern.isEmpty() ) lcl_readURLPatternNode(_aInstalled,sParentURLPattern,_rInstalledDriver); ::rtl::OUString sDriverFactory; aURLPatternNode.getNodeValue(s_sDriver) >>= sDriverFactory; - if ( sDriverFactory.getLength() ) + if ( !sDriverFactory.isEmpty() ) _rInstalledDriver.sDriverFactory = sDriverFactory; ::rtl::OUString sDriverTypeDisplayName; aURLPatternNode.getNodeValue(s_sDriverTypeDisplayName) >>= sDriverTypeDisplayName; - OSL_ENSURE(sDriverTypeDisplayName.getLength(),"No valid DriverTypeDisplayName property!"); - if ( sDriverTypeDisplayName.getLength() ) + OSL_ENSURE( !sDriverTypeDisplayName.isEmpty(), "No valid DriverTypeDisplayName property!" ); + if ( !sDriverTypeDisplayName.isEmpty() ) _rInstalledDriver.sDriverTypeDisplayName = sDriverTypeDisplayName; lcl_fillValues(aURLPatternNode,s_sProperties,_rInstalledDriver.aProperties); @@ -119,7 +119,7 @@ { TInstalledDriver aInstalledDriver; lcl_readURLPatternNode(m_aInstalled,*pPatternIter,aInstalledDriver); - if ( aInstalledDriver.sDriverFactory.getLength() ) + if ( !aInstalledDriver.sDriverFactory.isEmpty() ) m_aDrivers.insert(TInstalledDrivers::value_type(*pPatternIter,aInstalledDriver)); } } // if ( m_aInstalled.isValid() ) Index: connectivity/source/commontools/TTableHelper.cxx =================================================================== --- connectivity/source/commontools/TTableHelper.cxx (revision 1565575) +++ connectivity/source/commontools/TTableHelper.cxx (working copy) @@ -267,7 +267,7 @@ if(!isNew()) { Any aCatalog; - if ( m_CatalogName.getLength() ) + if ( !m_CatalogName.isEmpty() ) aCatalog <<= m_CatalogName; ::utl::SharedUNOComponent< XResultSet > xResult( getMetaData()->getColumns( @@ -325,7 +325,7 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames) { Any aCatalog; - if ( m_CatalogName.getLength() ) + if ( !m_CatalogName.isEmpty() ) aCatalog <<= m_CatalogName; Reference< XResultSet > xResult = getMetaData()->getPrimaryKeys(aCatalog,m_SchemaName,m_Name); @@ -354,7 +354,7 @@ void OTableHelper::refreshForgeinKeys(TStringVector& _rNames) { Any aCatalog; - if ( m_CatalogName.getLength() ) + if ( !m_CatalogName.isEmpty() ) aCatalog <<= m_CatalogName; Reference< XResultSet > xResult = getMetaData()->getImportedKeys(aCatalog,m_SchemaName,m_Name); Reference< XRow > xRow(xResult,UNO_QUERY); @@ -382,7 +382,7 @@ } - if ( sFkName.getLength() && !xRow->wasNull() ) + if ( !sFkName.isEmpty() && !xRow->wasNull() ) { if ( sOldFKName != sFkName ) { @@ -441,7 +441,7 @@ { // fill indexes Any aCatalog; - if ( m_CatalogName.getLength() ) + if ( !m_CatalogName.isEmpty() ) aCatalog <<= m_CatalogName; Reference< XResultSet > xResult = getMetaData()->getIndexInfo(aCatalog,m_SchemaName,m_Name,sal_False,sal_False); @@ -454,10 +454,10 @@ while( xResult->next() ) { aName = xRow->getString(5); - if(aName.getLength()) + if( !aName.isEmpty() ) aName += sCatalogSep; aName += xRow->getString(6); - if ( aName.getLength() ) + if ( !aName.isEmpty() ) { // don't insert the name if the last one we inserted was the same if (sPreviousRoundName != aName) Index: connectivity/source/commontools/TKey.cxx =================================================================== --- connectivity/source/commontools/TKey.cxx (revision 1565575) +++ connectivity/source/commontools/TKey.cxx (working copy) @@ -72,7 +72,7 @@ m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; - if ( m_Name.getLength() ) // foreign key + if ( !m_Name.isEmpty() ) // foreign key { Reference< XResultSet > xResult = m_pTable->getMetaData()->getImportedKeys(m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), Index: connectivity/source/commontools/TIndexes.cxx =================================================================== --- connectivity/source/commontools/TIndexes.cxx (revision 1565575) +++ connectivity/source/commontools/TIndexes.cxx (working copy) @@ -86,7 +86,7 @@ while( xResult->next() ) { sal_Bool bUnique = !xRow->getBoolean(4); - if((!aQualifier.getLength() || xRow->getString(5) == aQualifier ) && xRow->getString(6) == aName) + if(( aQualifier.isEmpty() || xRow->getString(5) == aQualifier ) && xRow->getString(6) == aName) { sal_Int32 nClustered = xRow->getShort(7); sal_Bool bPrimarKeyIndex = sal_False; @@ -157,7 +157,7 @@ ::rtl::OUString aComposedName; aComposedName = dbtools::composeTableName(m_pTable->getMetaData(),aCatalog,aSchema,aTable,sal_True,::dbtools::eInIndexDefinitions); - if ( _rForName.getLength() ) + if ( !_rForName.isEmpty() ) { aSql.append( ::dbtools::quoteName( aQuote, _rForName ) ); aSql.appendAscii(" ON "); Index: connectivity/source/commontools/DateConversion.cxx =================================================================== --- connectivity/source/commontools/DateConversion.cxx (revision 1565575) +++ connectivity/source/commontools/DateConversion.cxx (working copy) @@ -249,7 +249,7 @@ sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException) { double fValue = 0; - if (rString.getLength()) + if ( !rString.isEmpty() ) { // Muss der String formatiert werden? sal_Int16 nTypeClass = nKeyType & ~NumberFormat::DEFINED; Index: connectivity/source/commontools/dbtools2.cxx =================================================================== --- connectivity/source/commontools/dbtools2.cxx (revision 1565575) +++ connectivity/source/commontools/dbtools2.cxx (working copy) @@ -112,10 +112,10 @@ sPostFix = xRow->getString (5); sCreateParams = xRow->getString(6); // first identical type will be used if typename is empty - if ( !sTypeName.getLength() && nType == nDataType ) + if ( sTypeName.isEmpty() && nType == nDataType ) sTypeName = sTypeName2Cmp; - if( sTypeName.equalsIgnoreAsciiCase(sTypeName2Cmp) && nType == nDataType && sCreateParams.getLength() && !xRow->wasNull()) + if( sTypeName.equalsIgnoreAsciiCase(sTypeName2Cmp) && nType == nDataType && !sCreateParams.isEmpty() && !xRow->wasNull()) { bUseLiteral = sal_True; break; @@ -125,7 +125,7 @@ } sal_Int32 nIndex = 0; - if ( sAutoIncrementValue.getLength() && (nIndex = sTypeName.indexOf(sAutoIncrementValue)) != -1 ) + if ( !sAutoIncrementValue.isEmpty() && (nIndex = sTypeName.indexOf(sAutoIncrementValue)) != -1 ) { sTypeName = sTypeName.replaceAt(nIndex,sTypeName.getLength() - nIndex,::rtl::OUString()); } @@ -146,10 +146,10 @@ if ( nPrecision > 0 && nDataType != DataType::TIMESTAMP ) { aSql.append(nPrecision); - if ( (nScale > 0) || (_sCreatePattern.getLength() && sCreateParams.indexOf(_sCreatePattern) != -1) ) + if ( (nScale > 0) || (!_sCreatePattern.isEmpty() && sCreateParams.indexOf(_sCreatePattern) != -1) ) aSql.appendAscii(","); } - if ( (nScale > 0) || (_sCreatePattern.getLength() && sCreateParams.indexOf(_sCreatePattern) != -1 ) || nDataType == DataType::TIMESTAMP ) + if ( (nScale > 0) || (!_sCreatePattern.isEmpty() && sCreateParams.indexOf(_sCreatePattern) != -1 ) || nDataType == DataType::TIMESTAMP ) aSql.append(nScale); if ( nParenPos == -1 ) @@ -164,18 +164,18 @@ aSql.append(sTypeName); // simply add the type name ::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); - if ( aDefault.getLength() ) + if ( !aDefault.isEmpty() ) { aSql.append(::rtl::OUString::createFromAscii(" DEFAULT ")); aSql.append(sPreFix); aSql.append(aDefault); aSql.append(sPostFix); - } // if ( aDefault.getLength() ) + } if(::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS) aSql.append(::rtl::OUString::createFromAscii(" NOT NULL")); - if ( bIsAutoIncrement && sAutoIncrementValue.getLength()) + if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty() ) { aSql.appendAscii(" "); aSql.append(sAutoIncrementValue); @@ -201,7 +201,7 @@ descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= sTable; sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); - if ( !sComposedName.getLength() ) + if ( sComposedName.isEmpty() ) ::dbtools::throwFunctionSequenceException(_xConnection); aSql.append(sComposedName); @@ -321,7 +321,7 @@ sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); - if ( !sComposedName.getLength() ) + if ( sComposedName.isEmpty() ) ::dbtools::throwFunctionSequenceException(_xConnection); aSql.append(generateColumnNames(xColumns,xMetaData)); @@ -367,7 +367,7 @@ { ::rtl::OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,_pHelper,_sCreatePattern); const ::rtl::OUString sKeyStmt = ::dbtools::createStandardKeyStatement(descriptor,_xConnection); - if ( sKeyStmt.getLength() ) + if ( !sKeyStmt.isEmpty() ) aSql += sKeyStmt; else { @@ -667,7 +667,7 @@ try { Any aVal; - if(_sCatalog.getLength()) + if( !_sCatalog.isEmpty() ) aVal <<= _sCatalog; Reference< XResultSet > xPrivileges = _xMetaData->getTablePrivileges(aVal, _sSchema, _sTable); Reference< XRow > xCurrentRow(xPrivileges, UNO_QUERY); @@ -940,7 +940,7 @@ { ::rtl::OUString sDefaultReportEngineName; aReportEngines.getNodeValue(lcl_getDefaultReportEngine()) >>= sDefaultReportEngineName; - if ( sDefaultReportEngineName.getLength() ) + if ( !sDefaultReportEngineName.isEmpty() ) { ::utl::OConfigurationNode aReportEngineNames = aReportEngines.openNode(lcl_getReportEngineNames()); if ( aReportEngineNames.isValid() ) Index: connectivity/source/inc/OColumn.hxx =================================================================== --- connectivity/source/inc/OColumn.hxx (revision 1565575) +++ connectivity/source/inc/OColumn.hxx (working copy) @@ -99,7 +99,7 @@ m_Writable(_aWritable), m_DefinitelyWritable(_aDefinitelyWritable) { - if(!m_ColumnLabel.getLength()) + if(m_ColumnLabel.isEmpty()) m_ColumnLabel = _aColumnName; } Index: connectivity/source/parse/sqlnode.cxx =================================================================== --- connectivity/source/parse/sqlnode.cxx (revision 1565575) +++ connectivity/source/parse/sqlnode.cxx (working copy) @@ -128,7 +128,7 @@ rNewValue += rValue; sal_Int32 nIndex = (sal_Int32)-1; // Quotes durch zweifache Quotes ersetzen, sonst kriegt der Parser Probleme - if (rQuot.getLength()) + if ( !rQuot.isEmpty() ) { do { @@ -358,7 +358,7 @@ { bool lcl_isAliasNamePresent( const OSQLParseNode& _rTableNameNode ) { - return OSQLParseNode::getTableRange(_rTableNameNode.getParent()).getLength() != 0; + return ( OSQLParseNode::getTableRange(_rTableNameNode.getParent()).isEmpty() == false ); } } @@ -381,7 +381,7 @@ // special handling for parameters case parameter: { - if(rString.getLength()) + if( rString.getLength() > 0 ) rString.appendAscii(" "); if (nCount == 1) // ? m_aChildren[0]->impl_parseNodeToString_throw( rString, rParam ); @@ -621,7 +621,7 @@ // parse the sub-select to SDBC level, too ::rtl::OUStringBuffer sSubSelect; pSubQueryNode->impl_parseNodeToString_throw( sSubSelect, rParam ); - if ( sSubSelect.getLength() ) + if ( sSubSelect.getLength() > 0 ) sCommand = sSubSelect.makeStringAndClear(); } } @@ -772,7 +772,7 @@ OSL_ENSURE(0,"Error in parse tree!"); } } - return _rTable.getLength() != 0; + return ( !_rTable.isEmpty() ); } // ----------------------------------------------------------------------------- void OSQLParser::killThousandSeparator(OSQLParseNode* pLiteral) @@ -928,7 +928,7 @@ if ( pNode1 ) { OSQLParseNode* pNode2 = convertNode(nType,pLiteral2); - if ( !m_sErrorMessage.getLength() ) + if ( m_sErrorMessage.isEmpty() ) nErg = buildNode(pAppend,pCompare,pNode1,pNode2); } } @@ -1254,9 +1254,9 @@ m_nFormatKey = 0; m_nDateFormatKey = 0; - if (!m_sErrorMessage.getLength()) + if (m_sErrorMessage.isEmpty()) m_sErrorMessage = s_pScanner->getErrorMessage(); - if (!m_sErrorMessage.getLength()) + if (m_sErrorMessage.isEmpty()) m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_GENERAL); rErrorMessage = m_sErrorMessage; @@ -2480,7 +2480,7 @@ case ' ' : case '.' : break; default : - if ( !rParam.aMetaData.getCatalogSeparator().getLength() + if ( rParam.aMetaData.getCatalogSeparator().isEmpty() || rString.charAt( rString.getLength()-1 ) != rParam.aMetaData.getCatalogSeparator().toChar() ) rString.appendAscii(" "); break; @@ -2536,7 +2536,7 @@ case ' ' : case '.' : break; default : - if ( !rParam.aMetaData.getCatalogSeparator().getLength() + if ( rParam.aMetaData.getCatalogSeparator().isEmpty() || rString.charAt( rString.getLength()-1 ) != rParam.aMetaData.getCatalogSeparator().toChar() ) rString.appendAscii(" "); break; Index: connectivity/source/parse/sqliterator.cxx =================================================================== --- connectivity/source/parse/sqliterator.cxx (revision 1565575) +++ connectivity/source/parse/sqliterator.cxx (working copy) @@ -291,7 +291,7 @@ sComposedName = ::rtl::OUString(); Reference< XResultSet> xRes = _rxDBMeta->getTables( - _rCatalog.getLength() ? makeAny( _rCatalog ) : Any(), _rSchema.getLength() ? _rSchema : s_sWildcard, _rTableName, sTableTypes ); + !_rCatalog.isEmpty() ? makeAny( _rCatalog ) : Any(), !_rSchema.isEmpty() ? _rSchema : s_sWildcard, _rTableName, sTableTypes ); Reference< XRow > xCurrentRow( xRes, UNO_QUERY ); if ( xCurrentRow.is() && xRes->next() ) @@ -343,7 +343,7 @@ // parse the sub query do { - if ( !bEscapeProcessing || ( sSubQueryCommand.getLength() == 0 ) ) + if ( !bEscapeProcessing || sSubQueryCommand.isEmpty() ) break; ::rtl::OUString sError; @@ -369,7 +369,7 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const ::rtl::OUString& _rComposedName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::impl_locateRecordSource" ); - if ( !_rComposedName.getLength() ) + if ( _rComposedName.isEmpty() ) { OSL_ENSURE( false, "OSQLParseTreeIterator::impl_locateRecordSource: no object name at all?" ); return OSQLTable(); @@ -469,7 +469,7 @@ ::dbtools::eInDataManipulation); // if there is no alias for the table name assign the orignal name to it - if ( !aTableRange.getLength() ) + if ( aTableRange.isEmpty() ) aTableRange = aComposedName; // get the object representing this table/query @@ -489,7 +489,7 @@ else if (SQL_ISRULEOR2(i_pJoinCondition,search_condition,boolean_term) && // AND/OR-Verknuepfung: i_pJoinCondition->count() == 3) { - // nur AND Verknüpfung zulassen + // nur AND Verkn�pfung zulassen if ( SQL_ISTOKEN(i_pJoinCondition->getChild(1),AND) ) { impl_fillJoinConditions(i_pJoinCondition->getChild(0)); @@ -809,7 +809,7 @@ { ::rtl::OUString aColName, aTableRange; getColumnRange(pNode, aColName, aTableRange); - if (!aTableRange.getLength()) // keinen gefunden + if ( aTableRange.isEmpty() ) // keinen gefunden { // dann die Spalte in den Tabellen suchen for (ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter) @@ -835,12 +835,12 @@ } } } - if (!aTableRange.getLength()) + if ( aTableRange.isEmpty() ) return sal_False; } - if (!rTableRange.getLength()) + if ( rTableRange.isEmpty() ) rTableRange = aTableRange; else if (rTableRange != aTableRange) return sal_False; @@ -902,7 +902,7 @@ aTypeName = ::rtl::OUString::createFromAscii("VARCHAR"); } - if (aTypeName.getLength()) + if ( !aTypeName.isEmpty() ) { //TODO:Create a new class for create statement to handle field length OParseColumn* pColumn = new OParseColumn(aColumnName,aTypeName,::rtl::OUString(),::rtl::OUString(), @@ -982,7 +982,7 @@ if (SQL_ISRULE(pColumnRef,column_ref)) { getColumnRange(pColumnRef,sColumnName,aTableRange); - OSL_ENSURE(sColumnName.getLength(),"Columnname darf nicht leer sein"); + OSL_ENSURE( !sColumnName.isEmpty(),"Columnname darf nicht leer sein"); } else /*if (SQL_ISRULE(pColumnRef,general_set_fct) || SQL_ISRULE(pColumnRef,set_fct_spec) || SQL_ISRULE(pColumnRef,position_exp) || SQL_ISRULE(pColumnRef,extract_exp) || @@ -1017,7 +1017,7 @@ return; } */ - if(!aColumnAlias.getLength()) + if( aColumnAlias.isEmpty() ) aColumnAlias = sColumnName; setSelectColumnName(m_aSelectColumns,sColumnName,aColumnAlias,aTableRange,bFkt,nType,SQL_ISRULE(pColumnRef,general_set_fct) || SQL_ISRULE(pColumnRef,set_fct_spec)); } @@ -1104,7 +1104,7 @@ else // eine Expression pColumnRef->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); - OSL_ENSURE(sColumnName.getLength(),"sColumnName darf nicht leer sein"); + OSL_ENSURE(!sColumnName.isEmpty(),"sColumnName darf nicht leer sein"); } else { // here I found a predicate @@ -1466,9 +1466,9 @@ if (SQL_ISPUNCTUATION(pMark,"?")) { - sParameterName = _rColumnAlias.getLength() + sParameterName = !_rColumnAlias.isEmpty() ? _rColumnAlias - : _aColumnName.getLength() + : !_aColumnName.isEmpty() ? _aColumnName : ::rtl::OUString::createFromAscii("?"); } @@ -1531,7 +1531,7 @@ m_aParameters->get().push_back(pNewColumn); bNotFound = sal_False; } - else if(_aColumnName.getLength())// search in the tables for the right one + else if( !_aColumnName.isEmpty() )// search in the tables for the right one { Reference xColumn = findColumn( _aColumnName, _aTableRange, true ); @@ -1731,13 +1731,13 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType,sal_Bool bAggFkt) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::setSelectColumnName" ); - if(rColumnName.toChar() == '*' && !rTableRange.getLength()) + if(rColumnName.toChar() == '*' && rTableRange.isEmpty()) { // SELECT * ... OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!"); for(ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end();++aIter) appendColumns(_rColumns,aIter->first,aIter->second); } - else if( rColumnName.toChar() == '*' && rTableRange.getLength() ) + else if( rColumnName.toChar() == '*' && !rTableRange.isEmpty() ) { // SELECT .* OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!"); ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange); @@ -1745,7 +1745,7 @@ if(aFind != m_pImpl->m_pTables->end()) appendColumns(_rColumns,rTableRange,aFind->second); } - else if ( !rTableRange.getLength() ) + else if ( rTableRange.isEmpty() ) { // SELECT ... // without table specified if ( !bFkt ) @@ -2096,7 +2096,7 @@ { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::findColumn" ); Reference< XPropertySet > xColumn; - if ( rTableRange.getLength() ) + if ( !rTableRange.isEmpty() ) { ConstOSQLTablesIterator aFind = _rTables.find(rTableRange); @@ -2187,7 +2187,7 @@ ::rtl::OUString sColumnName; ::rtl::OUString aTableRange; getColumnRange(pValueExp,sColumnName,aTableRange); - OSL_ENSURE(sColumnName.getLength(),"Columnname darf nicht leer sein"); + OSL_ENSURE( !sColumnName.isEmpty(), "Columnname darf nicht leer sein" ); Reference xColumn = findColumn( sColumnName, aTableRange, true ); if ( xColumn.is() ) Index: connectivity/source/parse/PColumn.cxx =================================================================== --- connectivity/source/parse/PColumn.cxx (revision 1565575) +++ connectivity/source/parse/PColumn.cxx (working copy) @@ -112,7 +112,7 @@ Reference xColumn(i_xQueryColumns->getByName(pColumn->getRealName()),UNO_QUERY_THROW); ::rtl::OUString sLabel; xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL)) >>= sLabel; - if ( sLabel.getLength() ) + if ( !sLabel.isEmpty() ) pColumn->setLabel(sLabel); } } @@ -152,7 +152,7 @@ _rxDBMetaData->supportsMixedCaseQuotedIdentifiers() ); const ::rtl::OUString sTableName = _rxResMetaData->getTableName( _nColumnPos ); - if ( sTableName.getLength() ) + if ( !sTableName.isEmpty() ) pColumn->setTableName( ::dbtools::composeTableName( _rxDBMetaData, _rxResMetaData->getCatalogName( _nColumnPos ), _rxResMetaData->getSchemaName( _nColumnPos ), Index: connectivity/source/drivers/file/FConnection.cxx =================================================================== --- connectivity/source/drivers/file/FConnection.cxx (revision 1565575) +++ connectivity/source/drivers/file/FConnection.cxx (working copy) @@ -155,7 +155,7 @@ m_bDefaultTextEncoding = true; } - if ( aExt.getLength() ) + if ( !aExt.isEmpty() ) m_aFilenameExtension = aExt; try @@ -446,7 +446,7 @@ aError.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")); aError.ErrorCode = 0; aError.Context = static_cast< XConnection* >(this); - if (_rsMessage.getLength()) + if ( !_rsMessage.isEmpty() ) aError.NextException <<= SQLException(_rsMessage, aError.Context, ::rtl::OUString(), 0, Any()); throw aError; Index: connectivity/source/drivers/file/FDatabaseMetaData.cxx =================================================================== --- connectivity/source/drivers/file/FDatabaseMetaData.cxx (revision 1565575) +++ connectivity/source/drivers/file/FDatabaseMetaData.cxx (working copy) @@ -298,7 +298,7 @@ sal_Bool bErg = sal_False; do { - if (!aURL.getExtension().getLength()) + if ( aURL.getExtension().isEmpty() ) { sal_Unicode nChar = aURL.getBase().getStr()[0]; if(match(tableNamePattern,aURL.getBase().getStr(),'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) Index: connectivity/source/drivers/file/FPreparedStatement.cxx =================================================================== --- connectivity/source/drivers/file/FPreparedStatement.cxx (revision 1565575) +++ connectivity/source/drivers/file/FPreparedStatement.cxx (working copy) @@ -527,7 +527,7 @@ { ::rtl::OUString sColumnName,sTableRange; m_aSQLIterator.getColumnRange(_pNode,sColumnName,sTableRange); - if ( sColumnName.getLength() ) + if ( !sColumnName.isEmpty() ) { Reference xNameAccess = _xTable->getColumns(); if(xNameAccess->hasByName(sColumnName)) Index: connectivity/source/drivers/calc/CTable.cxx =================================================================== --- connectivity/source/drivers/calc/CTable.cxx (revision 1565575) +++ connectivity/source/drivers/calc/CTable.cxx (working copy) @@ -478,7 +478,7 @@ lcl_GetColumnInfo( m_xSheet, m_xFormats, m_nStartCol + i, m_nStartRow, m_bHasHeaders, aColumnName, eType, bCurrency ); - if ( !aColumnName.getLength() ) + if ( aColumnName.isEmpty() ) aColumnName = lcl_GetColumnStr( i ); sal_Int32 nPrecision = 0; //! ... Index: connectivity/source/drivers/calc/CConnection.cxx =================================================================== --- connectivity/source/drivers/calc/CConnection.cxx (revision 1565575) +++ connectivity/source/drivers/calc/CConnection.cxx (working copy) @@ -128,7 +128,7 @@ aArgs[1].Name = ::rtl::OUString::createFromAscii("ReadOnly"); aArgs[1].Value <<= (sal_Bool) sal_True; - if ( m_sPassword.getLength() ) + if ( !m_sPassword.isEmpty() ) { const sal_Int32 nPos = aArgs.getLength(); aArgs.realloc(nPos+1); Index: connectivity/source/drivers/jdbc/DatabaseMetaData.cxx =================================================================== --- connectivity/source/drivers/jdbc/DatabaseMetaData.cxx (revision 1565575) +++ connectivity/source/drivers/jdbc/DatabaseMetaData.cxx (working copy) @@ -190,7 +190,7 @@ t.pEnv->DeleteLocalRef((jstring)args[1].l); OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); } - if(tableNamePattern.getLength()) + if( !tableNamePattern.isEmpty() ) { t.pEnv->DeleteLocalRef((jstring)args[2].l); OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" ); @@ -370,7 +370,7 @@ t.pEnv->DeleteLocalRef((jstring)args[0].l); if(args[1].l) t.pEnv->DeleteLocalRef((jstring)args[1].l); - if(table.getLength()) + if( !table.isEmpty() ) t.pEnv->DeleteLocalRef((jstring)args[2].l); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } @@ -409,7 +409,7 @@ t.pEnv->DeleteLocalRef((jstring)args[0].l); if(args[1].l) t.pEnv->DeleteLocalRef((jstring)args[1].l); - if(table.getLength()) + if( !table.isEmpty() ) t.pEnv->DeleteLocalRef((jstring)args[2].l); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } @@ -529,13 +529,13 @@ t.pEnv->DeleteLocalRef((jstring)args[0].l); if(args[1].l) t.pEnv->DeleteLocalRef((jstring)args[1].l); - if(primaryTable.getLength()) + if( !primaryTable.isEmpty() ) t.pEnv->DeleteLocalRef((jstring)args[2].l); if(foreignCatalog.hasValue()) t.pEnv->DeleteLocalRef((jstring)args[3].l); if(args[4].l) t.pEnv->DeleteLocalRef((jstring)args[4].l); - if(foreignTable.getLength()) + if( !foreignTable.isEmpty() ) t.pEnv->DeleteLocalRef((jstring)args[5].l); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } @@ -565,7 +565,7 @@ if ( m_aLogger.isLoggable( LogLevel::FINEST ) ) { ::rtl::OUString sLoggedResult( sReturn ); - if ( !sLoggedResult.getLength() ) + if ( sLoggedResult.isEmpty() ) sLoggedResult = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ) ); m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult ); } @@ -1172,7 +1172,7 @@ ::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::rtl::OUString sURL = m_pConnection->getURL(); - if ( !sURL.getLength() ) + if ( sURL.isEmpty() ) { static jmethodID mID(NULL); sURL = impl_callStringMethod( "getURL", mID ); @@ -1443,9 +1443,9 @@ if(catalog.hasValue()) t.pEnv->DeleteLocalRef((jstring)args[0].l); - if(schemaPattern.getLength()) + if( !schemaPattern.isEmpty() ) t.pEnv->DeleteLocalRef((jstring)args[1].l); - if(typeNamePattern.getLength()) + if( !typeNamePattern.isEmpty() ) t.pEnv->DeleteLocalRef((jstring)args[2].l); if(args[3].l) t.pEnv->DeleteLocalRef((jintArray)args[3].l); Index: connectivity/source/drivers/jdbc/Object.cxx =================================================================== --- connectivity/source/drivers/jdbc/Object.cxx (revision 1565575) +++ connectivity/source/drivers/jdbc/Object.cxx (working copy) @@ -192,9 +192,9 @@ { ::std::auto_ptr< java_lang_Throwable > pThrow( new java_lang_Throwable( _pEnvironment, jThrow ) ); ::rtl::OUString sMessage = pThrow->getMessage(); - if ( !sMessage.getLength() ) + if ( sMessage.isEmpty() ) sMessage = pThrow->getLocalizedMessage(); - if( !sMessage.getLength() ) + if( sMessage.isEmpty() ) sMessage = pThrow->toString(); _out_rException = SQLException( sMessage, _rxContext, ::rtl::OUString(), -1, Any() ); return true; Index: connectivity/source/drivers/jdbc/JStatement.cxx =================================================================== --- connectivity/source/drivers/jdbc/JStatement.cxx (revision 1565575) +++ connectivity/source/drivers/jdbc/JStatement.cxx (working copy) @@ -176,7 +176,7 @@ if ( m_pConnection ) { ::rtl::OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); - if ( sStmt.getLength() ) + if ( !sStmt.isEmpty() ) { m_aLogger.log( LogLevel::FINER, STR_LOG_GENERATED_VALUES_FALLBACK, sStmt ); ::comphelper::disposeComponent(m_xGeneratedStatement); Index: connectivity/source/drivers/jdbc/JConnection.cxx =================================================================== --- connectivity/source/drivers/jdbc/JConnection.cxx (revision 1565575) +++ connectivity/source/drivers/jdbc/JConnection.cxx (working copy) @@ -602,14 +602,14 @@ STR_NO_CLASSNAME, "$classname$", _rDriverClass ) ); - if ( _rDriverClassPath.getLength() ) + if ( !_rDriverClassPath.isEmpty() ) { const ::rtl::OUString sError2( _aResource.getResourceStringWithSubstitution( STR_NO_CLASSNAME_PATH, "$classpath$", _rDriverClassPath ) ); sError1 += sError2; - } // if ( _rDriverClassPath.getLength() ) + } return sError1; } } @@ -684,7 +684,7 @@ java_sql_SQLException_BASE::st_getMyClass(); java_lang_Throwable::st_getMyClass(); - if ( !_sDriverClass.getLength() ) + if ( _sDriverClass.isEmpty() ) { m_aLogger.log( LogLevel::SEVERE, STR_LOG_NO_DRIVER_CLASS ); ::dbtools::throwGenericSQLException( @@ -697,7 +697,7 @@ m_aLogger.log( LogLevel::INFO, STR_LOG_LOADING_DRIVER, _sDriverClass ); // the driver manager holds the class of the driver for later use ::std::auto_ptr< java_lang_Class > pDrvClass; - if ( !_sDriverClassPath.getLength() ) + if ( _sDriverClassPath.isEmpty() ) { // if forName didn't find the class it will throw an exception pDrvClass = ::std::auto_ptr< java_lang_Class >(java_lang_Class::forName(_sDriverClass)); @@ -796,7 +796,7 @@ ::comphelper::NamedValueCollection aSettings( info ); sDriverClass = aSettings.getOrDefault( "JavaDriverClass", sDriverClass ); sDriverClassPath = aSettings.getOrDefault( "JavaDriverClassPath", sDriverClassPath); - if ( !sDriverClassPath.getLength() ) + if ( sDriverClassPath.isEmpty() ) sDriverClassPath = impl_getJavaDriverClassPath_nothrow(sDriverClass); bAutoRetrievingEnabled = aSettings.getOrDefault( "IsAutoRetrievingEnabled", bAutoRetrievingEnabled ); sGeneratedValueStatement = aSettings.getOrDefault( "AutoRetrievingStatement", sGeneratedValueStatement ); Index: connectivity/source/drivers/jdbc/PreparedStatement.cxx =================================================================== --- connectivity/source/drivers/jdbc/PreparedStatement.cxx (revision 1565575) +++ connectivity/source/drivers/jdbc/PreparedStatement.cxx (working copy) @@ -353,7 +353,7 @@ ORowSetValue aValue; aValue.fill(x); const ::rtl::OUString sValue = aValue; - if ( sValue.getLength() ) + if ( !sValue.isEmpty() ) pBigDecimal.reset(new java_math_BigDecimal(sValue)); else pBigDecimal.reset(new java_math_BigDecimal(0.0)); Index: connectivity/source/drivers/odbcbase/OStatement.cxx =================================================================== --- connectivity/source/drivers/odbcbase/OStatement.cxx (revision 1565575) +++ connectivity/source/drivers/odbcbase/OStatement.cxx (working copy) @@ -178,7 +178,7 @@ if ( m_pConnection ) { ::rtl::OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); - if ( sStmt.getLength() ) + if ( !sStmt.isEmpty() ) { ::comphelper::disposeComponent(m_xGeneratedStatement); m_xGeneratedStatement = m_pConnection->createStatement(); Index: connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx =================================================================== --- connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx (revision 1565575) +++ connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx (working copy) @@ -1219,7 +1219,7 @@ ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::rtl::OUString aValue = m_pConnection->getURL(); - if ( !aValue.getLength() ) + if ( aValue.isEmpty() ) { aValue = ::rtl::OUString::createFromAscii("sdbc:odbc:"); aValue += getURLImpl(); @@ -1366,7 +1366,7 @@ aValue.appendAscii("UCASE,"); - if ( aValue.getLength() ) + if ( aValue.getLength() > 0 ) aValue.setLength(aValue.getLength()-1); return aValue.makeStringAndClear(); @@ -1421,7 +1421,7 @@ if(nValue & SQL_FN_TD_YEAR) aValue.appendAscii("YEAR,"); - if ( aValue.getLength() ) + if ( aValue.getLength() > 0 ) aValue.setLength(aValue.getLength()-1); return aValue.makeStringAndClear(); @@ -1440,7 +1440,7 @@ if(nValue & SQL_FN_SYS_USERNAME) aValue.appendAscii("USERNAME,"); - if ( aValue.getLength() ) + if ( aValue.getLength() > 0 ) aValue.setLength(aValue.getLength()-1); return aValue.makeStringAndClear(); @@ -1501,7 +1501,7 @@ if(nValue & SQL_FN_NUM_TRUNCATE) aValue.appendAscii("TRUNCATE,"); - if ( aValue.getLength() ) + if ( aValue.getLength() > 0 ) aValue.setLength(aValue.getLength()-1); return aValue.makeStringAndClear(); Index: connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx =================================================================== --- connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx (revision 1565575) +++ connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx (working copy) @@ -877,8 +877,8 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(); @@ -891,7 +891,7 @@ aCOL += ::rtl::OUStringToOString(*pBegin,m_nTextEncoding); aCOL += pComma; } - if ( aCOL.getLength() ) + if ( !aCOL.isEmpty() ) { aCOL = aCOL.replaceAt(aCOL.getLength()-1,1,pComma); pCOL = aCOL.getStr(); @@ -900,7 +900,7 @@ pCOL = SQL_ALL_TABLE_TYPES; SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKN, SQL_NTS, (SDB_ODBC_CHAR *) pCOL, pCOL ? SQL_NTS : 0); @@ -979,14 +979,14 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(), *pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLColumnPrivileges(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0 , (SDB_ODBC_CHAR *) pPKN, SQL_NTS, (SDB_ODBC_CHAR *) pCOL, SQL_NTS); @@ -1012,14 +1012,14 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(), *pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLColumns(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKN, SQL_NTS, (SDB_ODBC_CHAR *) pCOL, SQL_NTS); @@ -1079,14 +1079,14 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding)).getStr(), *pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLProcedureColumns(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0 , (SDB_ODBC_CHAR *) pPKN, SQL_NTS, (SDB_ODBC_CHAR *) pCOL, SQL_NTS); @@ -1113,13 +1113,13 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLProcedures(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0 , (SDB_ODBC_CHAR *) pPKN, SQL_NTS); OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this); @@ -1143,13 +1143,13 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLSpecialColumns(m_aStatementHandle,_bRowVer ? SQL_ROWVER : SQL_BEST_ROWID, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0 , (SDB_ODBC_CHAR *) pPKN, SQL_NTS, (SQLSMALLINT)scope, @@ -1183,19 +1183,19 @@ if ( catalog2.hasValue() ) aFKQ = ::rtl::OUStringToOString(comphelper::getString(catalog2),m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = schema && schema->getLength() ? ::rtl::OUStringToOString(*schema,m_nTextEncoding).getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = schema && !schema->isEmpty() ? ::rtl::OUStringToOString(*schema,m_nTextEncoding).getStr() : NULL, *pPKN = table ? (aPKN = ::rtl::OUStringToOString(*table,m_nTextEncoding)).getStr(): NULL, - *pFKQ = catalog2.hasValue() && aFKQ.getLength() ? aFKQ.getStr() : NULL, - *pFKO = schema2 && schema2->getLength() ? (aFKO = ::rtl::OUStringToOString(*schema2,m_nTextEncoding)).getStr() : NULL, + *pFKQ = catalog2.hasValue() && !aFKQ.isEmpty() ? aFKQ.getStr() : NULL, + *pFKO = schema2 && !schema2->isEmpty() ? (aFKO = ::rtl::OUStringToOString(*schema2,m_nTextEncoding)).getStr() : NULL, *pFKN = table2 ? (aFKN = ::rtl::OUStringToOString(*table2,m_nTextEncoding)).getStr() : NULL; SQLRETURN nRetcode = N3SQLForeignKeys(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKN, pPKN ? SQL_NTS : 0, - (SDB_ODBC_CHAR *) pFKQ, (catalog2.hasValue() && aFKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pFKQ, (catalog2.hasValue() && !aFKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pFKO, pFKO ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pFKN, SQL_NTS ); @@ -1233,13 +1233,13 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLPrimaryKeys(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0 , (SDB_ODBC_CHAR *) pPKN, SQL_NTS); OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this); @@ -1263,13 +1263,13 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLTablePrivileges(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0 , (SDB_ODBC_CHAR *) pPKN, SQL_NTS); OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this); @@ -1294,13 +1294,13 @@ aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, - *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, + *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLStatistics(m_aStatementHandle, - (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && aPKQ.getLength()) ? SQL_NTS : 0, + (SDB_ODBC_CHAR *) pPKQ, (catalog.hasValue() && !aPKQ.isEmpty()) ? SQL_NTS : 0, (SDB_ODBC_CHAR *) pPKO, pPKO ? SQL_NTS : 0 , (SDB_ODBC_CHAR *) pPKN, SQL_NTS, unique ? SQL_INDEX_UNIQUE : SQL_INDEX_ALL, Index: connectivity/source/drivers/ado/Awrapado.cxx =================================================================== --- connectivity/source/drivers/ado/Awrapado.cxx (revision 1565575) +++ connectivity/source/drivers/ado/Awrapado.cxx (working copy) @@ -1644,7 +1644,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schema.getLength() && schema.toChar() != '%') + if( !schema.isEmpty() && schema.toChar() != '%' ) varCriteria[nPos].setString(schema); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1689,7 +1689,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schema.getLength() && schema.toChar() != '%') + if( !schema.isEmpty() && schema.toChar() != '%' ) varCriteria[nPos].setString(schema); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1728,7 +1728,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schema.getLength() && schema.toChar() != '%') + if( !schema.isEmpty() && schema.toChar() != '%' ) varCriteria[nPos].setString(schema); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1769,7 +1769,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schema.getLength() && schema.toChar() != '%') + if( !schema.isEmpty() && schema.toChar() != '%' ) varCriteria[nPos].setString(schema); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1812,7 +1812,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schemaPattern.getLength() && schemaPattern.toChar() != '%') + if( !schemaPattern.isEmpty() && schemaPattern.toChar() != '%' ) varCriteria[nPos].setString(schemaPattern); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1859,7 +1859,7 @@ varCriteria[nPos].setString(::comphelper::getString(primaryCatalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(primarySchema.getLength() && primarySchema.toChar() != '%') + if( !primarySchema.isEmpty() && primarySchema.toChar() != '%' ) varCriteria[nPos].setString(primarySchema); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1870,7 +1870,7 @@ varCriteria[nPos].setString(::comphelper::getString(foreignCatalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(foreignSchema.getLength() && foreignSchema.toChar() != '%') + if( !foreignSchema.isEmpty() && foreignSchema.toChar() != '%' ) varCriteria[nPos].setString(foreignSchema); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1909,7 +1909,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schemaPattern.getLength() && schemaPattern.toChar() != '%') + if( !schemaPattern.isEmpty() && schemaPattern.toChar() != '%' ) varCriteria[nPos].setString(schemaPattern); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1951,7 +1951,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schemaPattern.getLength() && schemaPattern.toChar() != '%') + if( !schemaPattern.isEmpty() && schemaPattern.toChar() != '%' ) varCriteria[nPos].setString(schemaPattern); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -1991,7 +1991,7 @@ varCriteria[nPos].setString(sCatalog); ++nPos; - if(schemaPattern.getLength() && schemaPattern.toChar() != '%') + if( !schemaPattern.isEmpty() && schemaPattern.toChar() != '%') varCriteria[nPos].setString(schemaPattern); ++nPos; @@ -2011,7 +2011,7 @@ } ::rtl::OUString sTypeNames = aTypes.makeStringAndClear(); - if ( sTypeNames.getLength() ) + if ( !sTypeNames.isEmpty() ) varCriteria[nPos].setString(sTypeNames); // Create SafeArray Bounds and initialize the array @@ -2061,7 +2061,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schemaPattern.getLength() && schemaPattern.toChar() != '%') + if( !schemaPattern.isEmpty() && schemaPattern.toChar() != '%' ) varCriteria[nPos].setString(schemaPattern); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA @@ -2106,7 +2106,7 @@ varCriteria[nPos].setString(::comphelper::getString(catalog)); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_CATALOG - if(schema.getLength() && schema.toChar() != '%') + if( !schema.isEmpty() && schema.toChar() != '%' ) varCriteria[nPos].setString(schema); hr = SafeArrayPutElement(psa,&nPos,&varCriteria[nPos]);nPos++;// TABLE_SCHEMA Index: connectivity/source/drivers/ado/AConnection.cxx =================================================================== --- connectivity/source/drivers/ado/AConnection.cxx (revision 1565575) +++ connectivity/source/drivers/ado/AConnection.cxx (working copy) @@ -553,7 +553,7 @@ sal_Int32 nDBTypeScale = pInfo->aSimpleType.nMaximumScale; (void)nDBTypeScale; sal_Int32 nAdoType = pInfo->eType; (void)nAdoType; #endif - if ( ( !_sTypeName.getLength() + if ( ( _sTypeName.isEmpty() || (pInfo->aSimpleType.aTypeName.equalsIgnoreAsciiCase(_sTypeName)) ) && (pInfo->aSimpleType.nPrecision >= _nPrecision) @@ -599,7 +599,7 @@ else pTypeInfo = aIter->second; } - else if ( _sTypeName.getLength() ) + else if ( !_sTypeName.isEmpty() ) { ::comphelper::TStringMixEqualFunctor aCase(sal_False); // search for typeinfo where the typename is equal _sTypeName Index: connectivity/source/drivers/ado/ADatabaseMetaData.cxx =================================================================== --- connectivity/source/drivers/ado/ADatabaseMetaData.cxx (revision 1565575) +++ connectivity/source/drivers/ado/ADatabaseMetaData.cxx (working copy) @@ -935,7 +935,7 @@ aRecordset.MoveNext(); } aRecordset.Close(); - if ( aRet.getLength() ) + if ( !aRet.isEmpty() ) return aRet.copy(0,aRet.lastIndexOf(',')); } return ::rtl::OUString(); Index: connectivity/source/drivers/ado/AKeys.cxx =================================================================== --- connectivity/source/drivers/ado/AKeys.cxx (revision 1565575) +++ connectivity/source/drivers/ado/AKeys.cxx (working copy) @@ -84,7 +84,7 @@ WpADOKey aKey = pKey->getImpl(); ::rtl::OUString sName = aKey.get_Name(); - if(!sName.getLength()) + if( sName.isEmpty() ) aKey.put_Name(::rtl::OUString::createFromAscii("PrimaryKey") ); ADOKeys* pKeys = m_aCollection; Index: connectivity/source/drivers/macab/MacabStatement.cxx =================================================================== --- connectivity/source/drivers/macab/MacabStatement.cxx (revision 1565575) +++ connectivity/source/drivers/macab/MacabStatement.cxx (working copy) @@ -439,7 +439,7 @@ case SQL_STATEMENT_SELECT: { ::rtl::OUString sTableName = getTableName(); // FROM which table ? - if (sTableName.getLength() != 0) // a match + if ( !sTableName.isEmpty() ) // a match { MacabRecords *aRecords; aRecords = m_pConnection->getAddressBook()->getMacabRecords(sTableName); Index: connectivity/source/drivers/mysql/YUsers.cxx =================================================================== --- connectivity/source/drivers/mysql/YUsers.cxx (revision 1565575) +++ connectivity/source/drivers/mysql/YUsers.cxx (working copy) @@ -83,7 +83,7 @@ + ::rtl::OUString::createFromAscii(" @\"%\" "); ::rtl::OUString sPassword; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword; - if ( sPassword.getLength() ) + if ( !sPassword.isEmpty() ) { aSql += ::rtl::OUString::createFromAscii(" IDENTIFIED BY '"); aSql += sPassword; Index: connectivity/source/drivers/mysql/YTable.cxx =================================================================== --- connectivity/source/drivers/mysql/YTable.cxx (revision 1565575) +++ connectivity/source/drivers/mysql/YTable.cxx (working copy) @@ -246,7 +246,7 @@ else { sal_Int32 nIndex = 0; - if ( sTypeName.getLength() && (nIndex = sTypeName.indexOf(s_sAutoIncrement)) != -1 ) + if ( !sTypeName.isEmpty() && (nIndex = sTypeName.indexOf(s_sAutoIncrement)) != -1 ) { sTypeName = sTypeName.copy(0,nIndex); descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),makeAny(sTypeName)); @@ -262,13 +262,13 @@ xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; - if(sOldDefault.getLength()) + if( !sOldDefault.isEmpty() ) { dropDefaultValue(colName); - if(sNewDefault.getLength() && sOldDefault != sNewDefault) + if( !sNewDefault.isEmpty() && sOldDefault != sNewDefault ) alterDefaultValue(sNewDefault,colName); } - else if(!sOldDefault.getLength() && sNewDefault.getLength()) + else if( sOldDefault.isEmpty() && !sNewDefault.isEmpty() ) alterDefaultValue(sNewDefault,colName); // now we should look if the name of the column changed Index: connectivity/source/drivers/mysql/YTables.cxx =================================================================== --- connectivity/source/drivers/mysql/YTables.cxx (revision 1565575) +++ connectivity/source/drivers/mysql/YTables.cxx (working copy) @@ -68,7 +68,7 @@ sTableTypes[2] = s_sAll; // just to be sure to include anything else .... Any aCatalog; - if ( sCatalog.getLength() ) + if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; Reference< XResultSet > xResult = m_xMetaData->getTables(aCatalog,sSchema,sTable,sTableTypes); @@ -230,7 +230,7 @@ { ::rtl::OUString sDesc; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sDesc; - if ( sDesc.getLength() ) + if ( !sDesc.isEmpty() ) { _rOut.appendAscii(" COMMENT '"); _rOut.append(sDesc); Index: connectivity/source/drivers/mysql/YDriver.cxx =================================================================== --- connectivity/source/drivers/mysql/YDriver.cxx (revision 1565575) +++ connectivity/source/drivers/mysql/YDriver.cxx (working copy) @@ -260,7 +260,7 @@ { ::comphelper::NamedValueCollection aSettings( info ); ::rtl::OUString sIanaName = aSettings.getOrDefault( "CharSet", ::rtl::OUString() ); - if ( sIanaName.getLength() ) + if ( !sIanaName.isEmpty() ) { ::dbtools::OCharsetMap aLookupIanaName; ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA()); Index: connectivity/source/drivers/mysql/YUser.cxx =================================================================== --- connectivity/source/drivers/mysql/YUser.cxx (revision 1565575) +++ connectivity/source/drivers/mysql/YUser.cxx (working copy) @@ -108,7 +108,7 @@ case PrivilegeObject::VIEW: { Any aCatalog; - if ( sCatalog.getLength() ) + if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; xRes = xMeta->getTablePrivileges(aCatalog,sSchema,sTable); } @@ -117,7 +117,7 @@ case PrivilegeObject::COLUMN: { Any aCatalog; - if ( sCatalog.getLength() ) + if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); } @@ -230,7 +230,7 @@ ::osl::MutexGuard aGuard(m_aMutex); ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) { ::rtl::OUString sGrant; sGrant += ::rtl::OUString::createFromAscii("GRANT "); @@ -260,7 +260,7 @@ ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) { ::rtl::OUString sGrant; sGrant += ::rtl::OUString::createFromAscii("REVOKE "); @@ -307,35 +307,35 @@ if((nRights & Privilege::DELETE) == Privilege::DELETE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("DELETE"); } if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("UPDATE"); } if((nRights & Privilege::ALTER) == Privilege::ALTER) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("ALTER"); } if((nRights & Privilege::SELECT) == Privilege::SELECT) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("SELECT"); } if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("REFERENCES"); } Index: connectivity/source/drivers/flat/ETable.cxx =================================================================== --- connectivity/source/drivers/flat/ETable.cxx (revision 1565575) +++ connectivity/source/drivers/flat/ETable.cxx (working copy) @@ -490,7 +490,7 @@ // name and extension have to coincide if ( m_pConnection->matchesExtension( sExt ) ) { - if ( sExt.getLength() ) + if ( !sExt.isEmpty() ) sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,::rtl::OUString()); if ( sName == m_Name ) { Index: connectivity/source/drivers/adabas/BTable.cxx =================================================================== --- connectivity/source/drivers/adabas/BTable.cxx (revision 1565575) +++ connectivity/source/drivers/adabas/BTable.cxx (working copy) @@ -170,14 +170,14 @@ xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; - if(sOldDefault.getLength()) + if( !sOldDefault.isEmpty() ) { - if(sNewDefault.getLength() && sOldDefault != sNewDefault) + if( !sNewDefault.isEmpty() && sOldDefault != sNewDefault ) alterDefaultValue(sNewDefault,colName); - else if(!sNewDefault.getLength()) + else if(sNewDefault.isEmpty()) dropDefaultValue(colName); } - else if(!sOldDefault.getLength() && sNewDefault.getLength()) + else if(sOldDefault.isEmpty() && !sNewDefault.isEmpty()) addDefaultValue(sNewDefault,colName); // now we should look if the name of the column changed @@ -224,7 +224,7 @@ ::rtl::OUString SAL_CALL OAdabasTable::getName() throw(::com::sun::star::uno::RuntimeException) { ::rtl::OUString sName = m_SchemaName; - if(m_SchemaName.getLength()) + if( !m_SchemaName.isEmpty() ) { const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); sName += sDot; Index: connectivity/source/drivers/adabas/BDriver.cxx =================================================================== --- connectivity/source/drivers/adabas/BDriver.cxx (revision 1565575) +++ connectivity/source/drivers/adabas/BDriver.cxx (working copy) @@ -343,7 +343,7 @@ } ::rtl::OUString sName; - if(aDBInfo.sControlPassword.getLength() && aDBInfo.sControlUser.getLength() && getDBName(url,sName)) + if( !aDBInfo.sControlPassword.isEmpty() && !aDBInfo.sControlUser.isEmpty() && getDBName(url,sName) ) { // check if we have to add a new data dev space checkAndInsertNewDevSpace(sName,aDBInfo); @@ -812,7 +812,7 @@ { ::rtl::OUString sDbWork,sDBConfig,sTemp; - if(m_sDbWork.getLength()) + if( !m_sDbWork.isEmpty() ) { sDbWork = m_sDbWorkURL; if(!UCBContentHelper::IsFolder(m_sDbWorkURL)) @@ -836,7 +836,7 @@ UCBContentHelper::MakeFolder(sTemp); } - if(m_sDbConfig.getLength()) + if( !m_sDbConfig.isEmpty() ) { sDBConfig = m_sDbConfigURL; if(!UCBContentHelper::IsFolder(sDBConfig)) @@ -1231,7 +1231,7 @@ const ::rtl::OUString& _rPWD, const ::rtl::OUString& _rBatch) { - OSL_ENSURE(_rBatch.getLength(),"No batch file given!"); + OSL_ENSURE( !_rBatch.isEmpty(),"No batch file given!"); String sWorkUrl(m_sDbWorkURL); String sExt = String::CreateFromAscii(".log"); ::utl::TempFile aCmdFile(String::CreateFromAscii("LoadBatch"),&sExt,&sWorkUrl); @@ -1771,8 +1771,8 @@ // first we have to check if this databse is a old version and we have to update the system tables if ( !isVersion(sDBName,CURRENT_DB_VERSION) && isKernelVersion(CURRENT_DB_VERSION) ) { - if ( !_rDbInfo.sControlUser.getLength() - || !_rDbInfo.sControlPassword.getLength()) + if ( _rDbInfo.sControlUser.isEmpty() + || _rDbInfo.sControlPassword.isEmpty()) { ::connectivity::SharedResources aResources; const ::rtl::OUString sError( aResources.getResourceString(STR_DATABASE_NEEDS_CONVERTING) ); Index: connectivity/source/drivers/adabas/BViews.cxx =================================================================== --- connectivity/source/drivers/adabas/BViews.cxx (revision 1565575) +++ connectivity/source/drivers/adabas/BViews.cxx (working copy) @@ -62,7 +62,7 @@ aName = _rName.copy(nLen+1); ::rtl::OUString sStmt = ::rtl::OUString::createFromAscii("SELECT DISTINCT * FROM DOMAIN.SHOW_VIEW WHERE "); - if(aSchema.getLength()) + if( !aSchema.isEmpty() ) { sStmt += ::rtl::OUString::createFromAscii("OWNER = '"); sStmt += aSchema; @@ -163,7 +163,7 @@ ::rtl::OUString sSchema,sCommand; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; - if(sSchema.getLength()) + if( !sSchema.isEmpty() ) aSql += ::dbtools::quoteName(aQuote, sSchema) + sDot; else descriptor->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),makeAny(sSchema = static_cast(m_rParent).getConnection()->getMetaData()->getUserName())); Index: connectivity/source/drivers/adabas/BIndexes.cxx =================================================================== --- connectivity/source/drivers/adabas/BIndexes.cxx (revision 1565575) +++ connectivity/source/drivers/adabas/BIndexes.cxx (working copy) @@ -69,7 +69,7 @@ Reference< XRow > xRow(xResult,UNO_QUERY); while(xResult->next()) { - if(xRow->getString(6) == aName && (!aQualifier.getLength() || xRow->getString(5) == aQualifier )) + if(xRow->getString(6) == aName && (aQualifier.isEmpty() || xRow->getString(5) == aQualifier )) { OAdabasIndex* pRet = new OAdabasIndex(m_pTable,aName,aQualifier,!xRow->getBoolean(4), aName == ::rtl::OUString::createFromAscii("SYSPRIMARYKEYINDEX"), @@ -109,7 +109,7 @@ aSql = aSql + ::rtl::OUString::createFromAscii("INDEX "); - if(_rForName.getLength()) + if( !_rForName.isEmpty() ) { aSql = aSql + aQuote + _rForName + aQuote + ::rtl::OUString::createFromAscii(" ON ") @@ -170,7 +170,7 @@ ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); - if (aSchema.getLength()) + if ( !aSchema.isEmpty() ) (((aSql += aQuote) += aSchema) += aQuote) += sDot; (((aSql += aQuote) += aName) += aQuote) += ::rtl::OUString::createFromAscii(" ON "); Index: connectivity/source/drivers/adabas/BCatalog.cxx =================================================================== --- connectivity/source/drivers/adabas/BCatalog.cxx (revision 1565575) +++ connectivity/source/drivers/adabas/BCatalog.cxx (working copy) @@ -54,7 +54,7 @@ { ::rtl::OUString sName; sName = _xRow->getString(2); - if ( sName.getLength() ) + if ( !sName.isEmpty() ) sName += OAdabasCatalog::getDot(); sName += _xRow->getString(3); Index: connectivity/source/drivers/adabas/BTables.cxx =================================================================== --- connectivity/source/drivers/adabas/BTables.cxx (revision 1565575) +++ connectivity/source/drivers/adabas/BTables.cxx (working copy) @@ -116,7 +116,7 @@ aSql = ::rtl::OUString::createFromAscii("COMMENT ON TABLE "); ::rtl::OUString sSchema; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; - if(sSchema.getLength()) + if( !sSchema.isEmpty() ) aSql += ::dbtools::quoteName(aQuote, sSchema) + sDot; aSql += aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote @@ -131,7 +131,7 @@ Reference< XPropertySet > xColProp; aSql = ::rtl::OUString::createFromAscii("COMMENT ON COLUMN "); - if(sSchema.getLength()) + if( !sSchema.isEmpty() ) aSql += ::dbtools::quoteName(aQuote, sSchema) + sDot; aSql += aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote + sDot + aQuote; @@ -142,7 +142,7 @@ if(xColProp.is()) { ::rtl::OUString aDescription = getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))); - if(aDescription.getLength()) + if( !aDescription.isEmpty() ) { ::rtl::OUString aCom = aSql + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote + ::rtl::OUString::createFromAscii(" '") @@ -203,7 +203,7 @@ ::rtl::OUString sSchema; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; - if(sSchema.getLength()) + if( !sSchema.isEmpty() ) aSql += ::dbtools::quoteName(aQuote, sSchema) + sDot; else descriptor->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),makeAny(static_cast(m_rParent).getConnection()->getUserName(). @@ -350,7 +350,7 @@ xStmt->execute(aSql); ::comphelper::disposeComponent(xStmt); - if(getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))).getLength()) + if(getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))).isEmpty() == false) setComments(descriptor); } // ----------------------------------------------------------------------------- @@ -381,7 +381,7 @@ default: { Any aTypeName = _rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); - if(aTypeName.hasValue() && getString(aTypeName).getLength()) + if( aTypeName.hasValue() && !getString(aTypeName).isEmpty() ) sSql += getString(aTypeName); else sSql += OTables::getTypeString(_rxColProp) + ::rtl::OUString::createFromAscii(" "); @@ -425,10 +425,10 @@ if(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS) { sSql += ::rtl::OUString::createFromAscii(" NOT NULL"); - if(aDefault.getLength()) + if( !aDefault.isEmpty() ) sSql += ::rtl::OUString::createFromAscii(" WITH DEFAULT"); } - else if(aDefault.getLength()) + else if( !aDefault.isEmpty() ) { sSql +=::rtl::OUString::createFromAscii(" DEFAULT '") + aDefault; sSql += ::rtl::OUString::createFromAscii("'"); @@ -504,7 +504,7 @@ OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!"); ::rtl::OUString sName,sTemp; _xObject->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sName; - if( sName.getLength() ) + if( !sName.isEmpty() ) { const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); sName += sDot; Index: connectivity/source/drivers/adabas/BUser.cxx =================================================================== --- connectivity/source/drivers/adabas/BUser.cxx (revision 1565575) +++ connectivity/source/drivers/adabas/BUser.cxx (working copy) @@ -195,7 +195,7 @@ ::osl::MutexGuard aGuard(m_aMutex); ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) { ::rtl::OUString sGrant; sGrant += ::rtl::OUString::createFromAscii("GRANT "); @@ -221,7 +221,7 @@ ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) { ::rtl::OUString sGrant; sGrant += ::rtl::OUString::createFromAscii("REVOKE "); @@ -289,35 +289,35 @@ if((nRights & Privilege::DELETE) == Privilege::DELETE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("DELETE"); } if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("UPDATE"); } if((nRights & Privilege::ALTER) == Privilege::ALTER) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("ALTER"); } if((nRights & Privilege::SELECT) == Privilege::SELECT) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("SELECT"); } if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("REFERENCES"); } Index: connectivity/source/drivers/hsqldb/HUser.cxx =================================================================== --- connectivity/source/drivers/hsqldb/HUser.cxx (revision 1565575) +++ connectivity/source/drivers/hsqldb/HUser.cxx (working copy) @@ -108,7 +108,7 @@ case PrivilegeObject::VIEW: { Any aCatalog; - if ( sCatalog.getLength() ) + if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; xRes = xMeta->getTablePrivileges(aCatalog,sSchema,sTable); } @@ -117,7 +117,7 @@ case PrivilegeObject::COLUMN: { Any aCatalog; - if ( sCatalog.getLength() ) + if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))); } @@ -231,7 +231,7 @@ ::osl::MutexGuard aGuard(m_aMutex); ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) { ::rtl::OUString sGrant; sGrant += ::rtl::OUString::createFromAscii("GRANT "); @@ -261,7 +261,7 @@ ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) { ::rtl::OUString sGrant; sGrant += ::rtl::OUString::createFromAscii("REVOKE "); @@ -308,35 +308,35 @@ if((nRights & Privilege::DELETE) == Privilege::DELETE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("DELETE"); } if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("UPDATE"); } if((nRights & Privilege::ALTER) == Privilege::ALTER) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("ALTER"); } if((nRights & Privilege::SELECT) == Privilege::SELECT) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("SELECT"); } if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { - if(sPrivs.getLength()) + if( !sPrivs.isEmpty() ) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("REFERENCES"); } Index: connectivity/source/drivers/hsqldb/HTable.cxx =================================================================== --- connectivity/source/drivers/hsqldb/HTable.cxx (revision 1565575) +++ connectivity/source/drivers/hsqldb/HTable.cxx (working copy) @@ -242,13 +242,13 @@ xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; - if(sOldDefault.getLength()) + if( !sOldDefault.isEmpty() ) { dropDefaultValue(colName); - if(sNewDefault.getLength() && sOldDefault != sNewDefault) + if( !sNewDefault.isEmpty() && sOldDefault != sNewDefault ) alterDefaultValue(sNewDefault,sNewColumnName); } - else if(!sOldDefault.getLength() && sNewDefault.getLength()) + else if( sOldDefault.isEmpty() && !sNewDefault.isEmpty() ) alterDefaultValue(sNewDefault,sNewColumnName); m_pColumns->refresh(); Index: connectivity/source/drivers/hsqldb/HDriver.cxx =================================================================== --- connectivity/source/drivers/hsqldb/HDriver.cxx (revision 1565575) +++ connectivity/source/drivers/hsqldb/HDriver.cxx (working copy) @@ -197,7 +197,7 @@ } } - if ( !xStorage.is() || !sURL.getLength() ) + if ( !xStorage.is() || sURL.isEmpty() ) { ::connectivity::SharedResources aResources; const ::rtl::OUString sMessage = aResources.getResourceString(STR_NO_STROAGE); @@ -207,7 +207,7 @@ ::rtl::OUString sSystemPath; osl_getSystemPathFromFileURL( sURL.pData, &sSystemPath.pData ); sal_Int32 nIndex = sSystemPath.lastIndexOf('.'); - if ( !sURL.getLength() || !sSystemPath.getLength() ) + if ( sURL.isEmpty() || sSystemPath.isEmpty() ) { ::connectivity::SharedResources aResources; const ::rtl::OUString sMessage = aResources.getResourceString(STR_INVALID_FILE_URL); @@ -313,7 +313,7 @@ catch(Exception&) { } - if ( sMessage.getLength() ) + if ( !sMessage.isEmpty() ) { ::dbtools::throwGenericSQLException(sMessage ,*this); } @@ -636,7 +636,7 @@ Reference< XStorage> xStorage(aEvent.Source,UNO_QUERY); ::rtl::OUString sKey = StorageContainer::getRegisteredKey(xStorage); - if ( sKey.getLength() ) + if ( !sKey.isEmpty() ) { TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::std::compose1( ::std::bind2nd(::std::equal_to< ::rtl::OUString >(),sKey) @@ -868,7 +868,7 @@ { OSL_ENSURE( sal_False, "lcl_getSystemLocale: caught an exception!" ); } - if ( !sLocaleString.getLength() ) + if ( sLocaleString.isEmpty() ) { rtl_Locale* pProcessLocale = NULL; osl_getProcessLocale( &pProcessLocale ); Index: connectivity/source/drivers/hsqldb/HTools.cxx =================================================================== --- connectivity/source/drivers/hsqldb/HTools.cxx (revision 1565575) +++ connectivity/source/drivers/hsqldb/HTools.cxx (working copy) @@ -45,14 +45,14 @@ const ::rtl::OUString _rSchema, const ::rtl::OUString _rName, bool _bShortForm ) { _inout_rBuffer.appendAscii( " WHERE " ); - if ( _rCatalog.getLength() ) + if ( !_rCatalog.isEmpty() ) { _inout_rBuffer.appendAscii( _bShortForm ? "TABLE_CAT" : "TABLE_CATALOG" ); _inout_rBuffer.appendAscii( " = '" ); _inout_rBuffer.append ( _rCatalog ); _inout_rBuffer.appendAscii( "' AND " ); } - if ( _rSchema.getLength() ) + if ( !_rSchema.isEmpty() ) { _inout_rBuffer.appendAscii( _bShortForm ? "TABLE_SCHEM" : "TABLE_SCHEMA" ); _inout_rBuffer.appendAscii( " = '" ); Index: connectivity/source/drivers/hsqldb/HUsers.cxx =================================================================== --- connectivity/source/drivers/hsqldb/HUsers.cxx (revision 1565575) +++ connectivity/source/drivers/hsqldb/HUsers.cxx (working copy) @@ -83,7 +83,7 @@ + ::rtl::OUString::createFromAscii(" @\"%\" "); ::rtl::OUString sPassword; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword; - if ( sPassword.getLength() ) + if ( !sPassword.isEmpty() ) { aSql += ::rtl::OUString::createFromAscii(" IDENTIFIED BY '"); aSql += sPassword; Index: connectivity/source/drivers/hsqldb/HTables.cxx =================================================================== --- connectivity/source/drivers/hsqldb/HTables.cxx (revision 1565575) +++ connectivity/source/drivers/hsqldb/HTables.cxx (working copy) @@ -68,7 +68,7 @@ sTableTypes[2] = s_sAll; // just to be sure to include anything else .... Any aCatalog; - if ( sCatalog.getLength() ) + if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; Reference< XResultSet > xResult = m_xMetaData->getTables(aCatalog,sSchema,sTable,sTableTypes); Index: connectivity/source/drivers/dbase/DTable.cxx =================================================================== --- connectivity/source/drivers/dbase/DTable.cxx (revision 1565575) +++ connectivity/source/drivers/dbase/DTable.cxx (working copy) @@ -1747,13 +1747,13 @@ if (pIndex->Find(0,*rRow.get()[nPos])) { // es existiert kein eindeutiger Wert - if ( !aColName.getLength() ) + if ( aColName.isEmpty() ) { m_pColumns->getByIndex(i) >>= xCol; OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!"); xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName; xCol.clear(); - } // if ( !aColName.getLength() ) + } const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_DUPLICATE_VALUE_IN_COLUMN ,"$columnname$", aColName Index: connectivity/source/drivers/dbase/DNoException.cxx =================================================================== --- connectivity/source/drivers/dbase/DNoException.cxx (revision 1565575) +++ connectivity/source/drivers/dbase/DNoException.cxx (working copy) @@ -218,7 +218,7 @@ aStr += ::rtl::OUString(aBStr.GetBuffer(),aBStr.Len(), getConnection()->getTextEncoding()); } - if ( aStr.getLength() ) + if ( !aStr.isEmpty() ) aVariable = aStr; } } @@ -365,14 +365,14 @@ if (getValue().isNull()) { - if (rKey.getValue().isNull() || (rKey.IsText(getDBType()) && !rKey.getValue().getString().getLength())) + if (rKey.getValue().isNull() || (rKey.IsText(getDBType()) && rKey.getValue().getString().isEmpty())) eResult = COMPARE_EQUAL; else eResult = COMPARE_LESS; } else if (rKey.getValue().isNull()) { - if (getValue().isNull() || (IsText(getDBType()) && !getValue().getString().getLength())) + if (getValue().isNull() || (IsText(getDBType()) && getValue().getString().isEmpty())) eResult = COMPARE_EQUAL; else eResult = COMPARE_GREATER; Index: connectivity/source/drivers/dbase/dindexnode.cxx =================================================================== --- connectivity/source/drivers/dbase/dindexnode.cxx (revision 1565575) +++ connectivity/source/drivers/dbase/dindexnode.cxx (working copy) @@ -54,7 +54,7 @@ : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) ,nRecord(nRec) { - if (aStr.getLength()) + if ( !aStr.isEmpty() ) { xValue = aStr; xValue.setBound(sal_True); @@ -791,14 +791,14 @@ if (getValue().isNull()) { - if (rKey.getValue().isNull() || (rKey.IsText(getDBType()) && !rKey.getValue().getString().getLength())) + if (rKey.getValue().isNull() || (rKey.IsText(getDBType()) && rKey.getValue().getString().isEmpty())) eResult = COMPARE_EQUAL; else eResult = COMPARE_LESS; } else if (rKey.getValue().isNull()) { - if (getValue().isNull() || (IsText(getDBType()) && !getValue().getString().getLength())) + if (getValue().isNull() || (IsText(getDBType()) && getValue().getString().isEmpty())) eResult = COMPARE_EQUAL; else eResult = COMPARE_GREATER; Index: connectivity/source/drivers/evoab2/NConnection.cxx =================================================================== --- connectivity/source/drivers/evoab2/NConnection.cxx (revision 1565575) +++ connectivity/source/drivers/evoab2/NConnection.cxx (working copy) @@ -53,7 +53,7 @@ ::rtl::OUString implGetExceptionMsg( Exception& e, const ::rtl::OUString& aExceptionType_ ) { ::rtl::OUString aExceptionType = aExceptionType_; - if( aExceptionType.getLength() == 0 ) + if( aExceptionType.isEmpty() ) aExceptionType = ::rtl::OUString::createFromAscii("Unknown" ) ; ::rtl::OUString aTypeLine( RTL_CONSTASCII_USTRINGPARAM("\nType: " ) ); Index: connectivity/source/drivers/evoab2/NStatement.cxx =================================================================== --- connectivity/source/drivers/evoab2/NStatement.cxx (revision 1565575) +++ connectivity/source/drivers/evoab2/NStatement.cxx (working copy) @@ -236,7 +236,7 @@ break; } - if ( !sColumnName.getLength() ) + if ( sColumnName.isEmpty() ) m_pConnection->throwGenericSQLException( STR_QUERY_TOO_COMPLEX, *this ); return sColumnName; @@ -468,7 +468,7 @@ if( m_aSQLIterator.isTableNode( pNodeForTableName ) ) { aTableName = OSQLParseNode::getTableRange(pAllTableNames->getChild( 0 )); - if( !aTableName.getLength() ) + if( aTableName.isEmpty() ) OSQLParseNode::getTableComponents( pNodeForTableName, aCatalog, aSchema, aTableName,NULL); } else Index: connectivity/workben/iniParser/main.cxx =================================================================== --- connectivity/workben/iniParser/main.cxx (revision 1565575) +++ connectivity/workben/iniParser/main.cxx (working copy) @@ -85,7 +85,7 @@ OSL_TRACE(__FILE__" -- parser() - %s\n", sFile.getStr()); #endif oslFileHandle handle=NULL; - if (iniUrl.getLength() && + if (!iniUrl.isEmpty() && osl_File_E_None == osl_openFile(iniUrl.pData, &handle, osl_File_OpenFlag_Read)) { rtl::ByteSequence seq; @@ -122,7 +122,7 @@ { sectionName = OStringToOUString( line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US ); - if (!sectionName.getLength()) + if ( sectionName.isEmpty() ) sectionName = OUString::createFromAscii("no name section"); ini_Section *aSection = &mAllSection[sectionName];