You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2014/02/04 09:48:47 UTC
svn commit: r1564230 - in /openoffice/trunk/main: basctl/source/basicide/
basctl/source/dlged/ basic/source/basmgr/ basic/source/classes/
basic/source/comp/ basic/source/runtime/ basic/source/uno/
binaryurp/source/ bridges/source/cpp_uno/cc50_solaris_i...
Author: hdu
Date: Tue Feb 4 08:48:47 2014
New Revision: 1564230
URL: http://svn.apache.org/r1564230
Log:
#i123862# use O*String's isEmpty() method to check for emptiness in modules starting with 'b'
Patch-by: j.nitschke@ok.de
Review-by: hdu@apache.org
Modified:
openoffice/trunk/main/basctl/source/basicide/baside2.cxx
openoffice/trunk/main/basctl/source/basicide/bastype2.cxx
openoffice/trunk/main/basctl/source/basicide/localizationmgr.cxx
openoffice/trunk/main/basctl/source/basicide/scriptdocument.cxx
openoffice/trunk/main/basctl/source/dlged/dlgedobj.cxx
openoffice/trunk/main/basic/source/basmgr/basmgr.cxx
openoffice/trunk/main/basic/source/basmgr/vbahelper.cxx
openoffice/trunk/main/basic/source/classes/image.cxx
openoffice/trunk/main/basic/source/classes/sbunoobj.cxx
openoffice/trunk/main/basic/source/comp/sbcomp.cxx
openoffice/trunk/main/basic/source/runtime/dllmgr.cxx
openoffice/trunk/main/basic/source/runtime/iosys.cxx
openoffice/trunk/main/basic/source/runtime/methods.cxx
openoffice/trunk/main/basic/source/runtime/methods1.cxx
openoffice/trunk/main/basic/source/runtime/step2.cxx
openoffice/trunk/main/basic/source/uno/namecont.cxx
openoffice/trunk/main/basic/source/uno/scriptcont.cxx
openoffice/trunk/main/binaryurp/source/bridge.cxx
openoffice/trunk/main/binaryurp/source/bridgefactory.cxx
openoffice/trunk/main/binaryurp/source/marshal.cxx
openoffice/trunk/main/binaryurp/source/reader.cxx
openoffice/trunk/main/binaryurp/source/unmarshal.cxx
openoffice/trunk/main/binaryurp/source/writer.cxx
openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
openoffice/trunk/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx
Modified: openoffice/trunk/main/basctl/source/basicide/baside2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/baside2.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/baside2.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/baside2.cxx Tue Feb 4 08:48:47 2014
@@ -370,7 +370,7 @@ sal_Bool ModulWindow::BasicExecute()
if ( !pMethod )
{
if ( aDocument.isInVBAMode() )
- return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), sal_False, rtl::OUString() ).getLength() > 0 ) ? sal_True : sal_False;
+ return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), sal_False, rtl::OUString() ).isEmpty() == false ) ? sal_True : sal_False;
else
pMethod = (SbMethod*)xModule->Find( String( RTL_CONSTASCII_USTRINGPARAM( "Main" ) ), SbxCLASS_METHOD );
}
Modified: openoffice/trunk/main/basctl/source/basicide/bastype2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/bastype2.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/bastype2.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/bastype2.cxx Tue Feb 4 08:48:47 2014
@@ -781,7 +781,7 @@ void BasicTreeListBox::GetRootEntryBitma
}
}
- if ( sFactoryURL.getLength() )
+ if ( !sFactoryURL.isEmpty() )
{
rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
sal_False /* small */,
Modified: openoffice/trunk/main/basctl/source/basicide/localizationmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/localizationmgr.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/localizationmgr.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/localizationmgr.cxx Tue Feb 4 08:48:47 2014
@@ -183,7 +183,7 @@ void LocalizationMgr::implEnableDisableR
aPureIdStr += aDot;
aPureIdStr += aDialogName;
aPureIdStr += aDot;
- if( aCtrlName.getLength() )
+ if( !aCtrlName.isEmpty() )
{
aPureIdStr += aCtrlName;
aPureIdStr += aDot;
@@ -243,7 +243,7 @@ sal_Int32 LocalizationMgr::implHandleCon
// Replace string by id, add id+string to StringResource
if( eMode == SET_IDS )
{
- bool bEscAlreadyExisting = (aPropStr.getLength() && aPropStr.getStr()[0] == '&' );
+ bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' );
if( bEscAlreadyExisting )
continue;
@@ -436,7 +436,7 @@ sal_Int32 LocalizationMgr::implHandleCon
for ( i = 0; i < nPropStringCount; ++i )
{
::rtl::OUString aPropStr = pPropStrings[i];
- bool bEscAlreadyExisting = (aPropStr.getLength() && aPropStr.getStr()[0] == '&' );
+ bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' );
if( bEscAlreadyExisting )
{
pIdStrings[i] = aPropStr;
Modified: openoffice/trunk/main/basctl/source/basicide/scriptdocument.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/scriptdocument.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/scriptdocument.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/scriptdocument.cxx Tue Feb 4 08:48:47 2014
@@ -1002,7 +1002,7 @@ namespace basctl
}
}
- if ( aFileURL.getLength() )
+ if ( !aFileURL.isEmpty() )
{
::osl::DirectoryItem aFileItem;
::osl::FileStatus aFileStatus( FileStatusMask_FileURL );
@@ -1164,7 +1164,7 @@ namespace basctl
ScriptDocument ScriptDocument::getDocumentWithURLOrCaption( const ::rtl::OUString& _rUrlOrCaption )
{
ScriptDocument aDocument( getApplicationScriptDocument() );
- if ( _rUrlOrCaption.getLength() == 0 )
+ if ( _rUrlOrCaption.isEmpty() )
return aDocument;
docs::Documents aDocuments;
@@ -1521,7 +1521,7 @@ namespace basctl
LibraryLocation ScriptDocument::getLibraryLocation( const ::rtl::OUString& _rLibName ) const
{
LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
- if ( _rLibName.getLength() )
+ if ( !_rLibName.isEmpty() )
{
if ( isDocument() )
{
Modified: openoffice/trunk/main/basctl/source/dlged/dlgedobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/dlged/dlgedobj.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/dlged/dlgedobj.cxx (original)
+++ openoffice/trunk/main/basctl/source/dlged/dlgedobj.cxx Tue Feb 4 08:48:47 2014
@@ -518,7 +518,7 @@ void SAL_CALL DlgEdObj::NameChange( cons
Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), UNO_QUERY);
if ( xNameAcc.is() && xNameAcc->hasByName(aOldName) )
{
- if ( !xNameAcc->hasByName(aNewName) && aNewName.getLength() != 0 )
+ if ( !xNameAcc->hasByName(aNewName) && !aNewName.isEmpty() )
{
// remove the control by the old name and insert the control by the new name in the container
Reference< container::XNameContainer > xCont(xNameAcc, UNO_QUERY );
Modified: openoffice/trunk/main/basic/source/basmgr/basmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/basmgr/basmgr.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/basmgr/basmgr.cxx (original)
+++ openoffice/trunk/main/basic/source/basmgr/basmgr.cxx Tue Feb 4 08:48:47 2014
@@ -270,7 +270,7 @@ void SAL_CALL BasMgrContainerListenerImp
void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent& Event )
throw( RuntimeException )
{
- sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
+ sal_Bool bLibContainer = maLibName.isEmpty();
::rtl::OUString aName;
Event.Accessor >>= aName;
@@ -326,7 +326,7 @@ void SAL_CALL BasMgrContainerListenerImp
// Replace not possible for library container
#ifdef DBG_UTIL
- sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
+ sal_Bool bLibContainer = maLibName.isEmpty();
#endif
DBG_ASSERT( !bLibContainer, "library container fired elementReplaced()");
@@ -356,7 +356,7 @@ void SAL_CALL BasMgrContainerListenerImp
mpMgr->mpImpl->mbModifiedByLibraryContainer = sal_True;
- sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
+ sal_Bool bLibContainer = maLibName.isEmpty();
if( bLibContainer )
{
StarBASIC* pLib = mpMgr->GetLib( aName );
Modified: openoffice/trunk/main/basic/source/basmgr/vbahelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/basmgr/vbahelper.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/basmgr/vbahelper.cxx (original)
+++ openoffice/trunk/main/basic/source/basmgr/vbahelper.cxx Tue Feb 4 08:48:47 2014
@@ -220,7 +220,7 @@ void enableContainerWindowsOfAllDocument
void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, const ::rtl::OUString& rPath )
{
- if( rPath.getLength() > 0 )
+ if( !rPath.isEmpty() )
{
CurrDirPool& rPool = StaticCurrDirPool::get();
::osl::MutexGuard aGuard( rPool.maMutex );
@@ -228,7 +228,7 @@ void registerCurrentDirectory( const uno
{
uno::Reference< frame::XModuleManager > xModuleManager( lclCreateModuleManager(), uno::UNO_SET_THROW );
::rtl::OUString aIdentifier = xModuleManager->identify( rxModel );
- if( aIdentifier.getLength() > 0 )
+ if( !aIdentifier.isEmpty() )
rPool.maCurrDirs[ aIdentifier ] = rPath;
}
catch( uno::Exception& )
Modified: openoffice/trunk/main/basic/source/classes/image.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/classes/image.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/classes/image.cxx (original)
+++ openoffice/trunk/main/basic/source/classes/image.cxx Tue Feb 4 08:48:47 2014
@@ -298,7 +298,7 @@ sal_Bool SbiImage::Save( SvStream& r, sa
SbiCloseRecord( r, nPos );
}
// Source?
- if( aOUSource.getLength() && SbiGood( r ) )
+ if( !aOUSource.isEmpty() && SbiGood( r ) )
{
nPos = SbiOpenRecord( r, B_SOURCE, 1 );
String aTmp;
Modified: openoffice/trunk/main/basic/source/classes/sbunoobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/classes/sbunoobj.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/classes/sbunoobj.cxx (original)
+++ openoffice/trunk/main/basic/source/classes/sbunoobj.cxx Tue Feb 4 08:48:47 2014
@@ -333,7 +333,7 @@ void implAppendExceptionMsg( ::rtl::OUSt
lcl_indent( _inout_rBuffer, _nLevel );
_inout_rBuffer.appendAscii( "Type: " );
- if ( _rExceptionType.getLength() == 0 )
+ if ( _rExceptionType.isEmpty() )
_inout_rBuffer.appendAscii( "Unknown" );
else
_inout_rBuffer.append( _rExceptionType );
@@ -1773,7 +1773,7 @@ bool checkUnoObjectType( SbUnoObject* pU
{
rtl::OUString sTypeName;
xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sTypeName;
- if ( sTypeName.getLength() == 0 || sTypeName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") ) ) )
+ if ( sTypeName.isEmpty() || sTypeName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") ) ) )
// can't check type, leave it pass
result = true;
else
@@ -2298,7 +2298,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadca
bBlockConversionToSmallestType );
::rtl::OUString aParamName = pNames[iSbx];
- if( aParamName.getLength() )
+ if( !aParamName.isEmpty() )
{
oleautomation::NamedArgument aNamedArgument;
aNamedArgument.Name = aParamName;
@@ -2755,7 +2755,7 @@ SbxVariable* SbUnoObject::Find( const St
if( mxExactName.is() )
{
::rtl::OUString aUExactName = mxExactName->getExactName( aUName );
- if( aUExactName.getLength() )
+ if( !aUExactName.isEmpty() )
aUName = aUExactName;
}
if( mxUnoAccess->hasProperty( aUName, PropertyConcept::ALL - PropertyConcept::DANGEROUS ) )
@@ -2831,7 +2831,7 @@ SbxVariable* SbUnoObject::Find( const St
if( mxExactNameInvocation.is() )
{
::rtl::OUString aUExactName = mxExactNameInvocation->getExactName( aUName );
- if( aUExactName.getLength() )
+ if( !aUExactName.isEmpty() )
aUName = aUExactName;
}
@@ -4778,7 +4778,7 @@ bool SbModule::createCOMWrapperForIface(
SbxVariable* pVar = pModIfaces->Get( i );
::rtl::OUString aIfaceName = pVar->GetName();
- if( aIfaceName.getLength() != 0 )
+ if( !aIfaceName.isEmpty() )
{
::rtl::OUString aPureIfaceName = aIfaceName;
sal_Int32 indexLastDot = aIfaceName.lastIndexOf('.');
Modified: openoffice/trunk/main/basic/source/comp/sbcomp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/comp/sbcomp.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/comp/sbcomp.cxx (original)
+++ openoffice/trunk/main/basic/source/comp/sbcomp.cxx Tue Feb 4 08:48:47 2014
@@ -589,7 +589,7 @@ void dbg_traceStep( SbModule* pModule, s
const TraceTextData& rTraceTextData = itInner->second;
const rtl::OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT;
bool bSTMT = false;
- if( rStr_STMNT.getLength() )
+ if( !rStr_STMNT.isEmpty() )
bSTMT = true;
char TimeBuffer[200];
@@ -619,7 +619,7 @@ void dbg_traceStep( SbModule* pModule, s
nIndent += GnIndentForPCode;
const rtl::OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode;
- if( rStr_PCode.getLength() )
+ if( !rStr_PCode.isEmpty() )
{
lcl_lineOut( rStr_PCode.getStr(), lcl_getSpaces( nIndent ),
bPrintTimeStamp ? TimeBuffer : NULL );
Modified: openoffice/trunk/main/basic/source/runtime/dllmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/dllmgr.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/runtime/dllmgr.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/dllmgr.cxx Tue Feb 4 08:48:47 2014
@@ -577,7 +577,7 @@ SbError call(
SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
{
OSL_ASSERT(proc != 0);
- if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"???
+ if ( !name.isEmpty() && name[0] == '@' ) { //TODO: "@" vs. "#"???
sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input
if (n <= 0 || n > 0xFFFF) {
return ERRCODE_BASIC_BAD_ARGUMENT; //TODO: more specific errcode?
Modified: openoffice/trunk/main/basic/source/runtime/iosys.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/iosys.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/runtime/iosys.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/iosys.cxx Tue Feb 4 08:48:47 2014
@@ -274,7 +274,7 @@ sal_Bool needSecurityRestrictions( void
const Reference< XBridge >& rxBridge = pBridges[ i ];
::rtl::OUString aDescription = rxBridge->getDescription();
::rtl::OUString aPortalUser = findUserInDescription( aDescription );
- if( aPortalUser.getLength() > 0 )
+ if( !aPortalUser.isEmpty() )
{
// User Found, compare to system user
if( aPortalUser == aSystemUser )
Modified: openoffice/trunk/main/basic/source/runtime/methods.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/methods.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/runtime/methods.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/methods.cxx Tue Feb 4 08:48:47 2014
@@ -169,7 +169,7 @@ String getFullPath( const String& aRelPa
INetURLObject aURLObj( aRelPath );
aFileURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
- if( !aFileURL.getLength() )
+ if( aFileURL.isEmpty() )
{
File::getFileURLFromSystemPath( aRelPath, aFileURL );
}
@@ -283,7 +283,7 @@ RTLFUNC(Error)
if ( bVBA && rPar.Count() > 1 )
{
com::sun::star::uno::Reference< ooo::vba::XErrObject > xErrObj( SbxErrObject::getUnoErrObject() );
- if ( xErrObj.is() && xErrObj->getNumber() == nCode && xErrObj->getDescription().getLength() )
+ if ( xErrObj.is() && xErrObj->getNumber() == nCode && !xErrObj->getDescription().isEmpty() )
tmpErrMsg = xErrObj->getDescription();
}
rPar.Get( 0 )->PutString( tmpErrMsg );
Modified: openoffice/trunk/main/basic/source/runtime/methods1.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/methods1.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/runtime/methods1.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/methods1.cxx Tue Feb 4 08:48:47 2014
@@ -1597,9 +1597,9 @@ RTLFUNC(ConvertToUrl)
String aStr = rPar.Get(1)->GetString();
INetURLObject aURLObj( aStr, INET_PROT_FILE );
::rtl::OUString aFileURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
- if( !aFileURL.getLength() )
+ if( aFileURL.isEmpty() )
::osl::File::getFileURLFromSystemPath( aFileURL, aFileURL );
- if( !aFileURL.getLength() )
+ if( aFileURL.isEmpty() )
aFileURL = aStr;
rPar.Get(0)->PutString( String(aFileURL) );
}
@@ -1617,7 +1617,7 @@ RTLFUNC(ConvertFromUrl)
String aStr = rPar.Get(1)->GetString();
::rtl::OUString aSysPath;
::osl::File::getSystemPathFromFileURL( aStr, aSysPath );
- if( !aSysPath.getLength() )
+ if( aSysPath.isEmpty() )
aSysPath = aStr;
rPar.Get(0)->PutString( String(aSysPath) );
}
Modified: openoffice/trunk/main/basic/source/runtime/step2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/step2.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/runtime/step2.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/step2.cxx Tue Feb 4 08:48:47 2014
@@ -424,7 +424,7 @@ void SbiRuntime::SetupArgs( SbxVariable*
rtl::OUString sDefaultMethod;
if ( xDfltMethod.is() )
sDefaultMethod = xDfltMethod->getDefaultMethodName();
- if ( sDefaultMethod.getLength() )
+ if ( !sDefaultMethod.isEmpty() )
{
SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxCLASS_METHOD );
if( meth != NULL )
@@ -592,7 +592,7 @@ SbxVariable* SbiRuntime::CheckArray( Sbx
else if( xIndexAccess.is() )
sDefaultMethod = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getByIndex" ) );
- if ( sDefaultMethod.getLength() )
+ if ( !sDefaultMethod.isEmpty() )
{
SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxCLASS_METHOD );
SbxVariableRef refTemp = meth;
Modified: openoffice/trunk/main/basic/source/uno/namecont.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/uno/namecont.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/uno/namecont.cxx (original)
+++ openoffice/trunk/main/basic/source/uno/namecont.cxx Tue Feb 4 08:48:47 2014
@@ -605,7 +605,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
meInitMode = DEFAULT;
INetURLObject aInitUrlInetObj( maInitialDocumentURL );
OUString aInitFileName = aInitUrlInetObj.GetMainURL( INetURLObject::NO_DECODE );
- if( aInitFileName.getLength() )
+ if( !aInitFileName.isEmpty() )
{
// We need a BasicManager to avoid problems
StarBASIC* pBas = new StarBASIC();
@@ -834,7 +834,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
// Check storage URL
OUString aStorageURL = rLib.aStorageURL;
- if( !bStorage && !aStorageURL.getLength() && nPass == 0 )
+ if( !bStorage && aStorageURL.isEmpty() && nPass == 0 )
{
String aLibraryPath;
if( meInitMode == CONTAINER_INIT_FILE )
@@ -1239,7 +1239,7 @@ void SfxLibraryContainer::implScanExtens
rtl::OUString aLibURL;
bool bPureDialogLib = false;
- while( (aLibURL = aScriptIt.nextBasicOrDialogLibrary( bPureDialogLib )).getLength() > 0 )
+ while( (aLibURL = aScriptIt.nextBasicOrDialogLibrary( bPureDialogLib )).isEmpty() == false )
{
if( bPureDialogLib && maInfoFileName.equalsAscii( "script" ) )
continue;
@@ -1351,7 +1351,7 @@ OUString SfxLibraryContainer::createAppL
( SfxLibrary* pLib, const OUString& aName )
{
OUString aLibDirPath = pLib->maStorageURL;
- if( !aLibDirPath.getLength() )
+ if( aLibDirPath.isEmpty() )
{
INetURLObject aInetObj( String(maLibraryPath).GetToken(1) );
aInetObj.insertName( aName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
@@ -1976,7 +1976,7 @@ void SfxLibraryContainer::storeLibraries
// if we did an in-place save into a storage (i.e. a save into the storage we were already based on),
// then we need to clean up the temporary storage we used for this
- if ( bInplaceStorage && sTempTargetStorName.getLength() )
+ if ( bInplaceStorage && !sTempTargetStorName.isEmpty() )
{
OSL_ENSURE( xSourceLibrariesStor.is(), "SfxLibrariesContainer::storeLibraries_impl: unexpected: we should have a source storage here!" );
try
@@ -3119,7 +3119,7 @@ void SfxLibrary::impl_removeWithoutCheck
implSetModified( sal_True );
// Remove element file
- if( maStorageURL.getLength() )
+ if( !maStorageURL.isEmpty() )
{
INetURLObject aElementInetObj( maStorageURL );
aElementInetObj.insertName( _rElementName, sal_False,
@@ -3254,7 +3254,7 @@ rtl::OUString ScriptExtensionIterator::n
{
rtl::OUString aRetLib;
- while( !aRetLib.getLength() && m_eState != END_REACHED )
+ while( aRetLib.isEmpty() && m_eState != END_REACHED )
{
switch( m_eState )
{
Modified: openoffice/trunk/main/basic/source/uno/scriptcont.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/uno/scriptcont.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/uno/scriptcont.cxx (original)
+++ openoffice/trunk/main/basic/source/uno/scriptcont.cxx Tue Feb 4 08:48:47 2014
@@ -304,7 +304,7 @@ Any SAL_CALL SfxScriptLibraryContainer::
// TODO: Check language
// aMod.aLanguage
// aMod.aName ignored
- if( aMod.aModuleType.getLength() > 0 )
+ if( !aMod.aModuleType.isEmpty() )
{
/* If in VBA compatibility mode, force creation of the VBA Globals
object. Each application will create an instance of its own
@@ -474,8 +474,8 @@ void SAL_CALL SfxScriptLibraryContainer:
if( OldPassword == NewPassword )
return;
- sal_Bool bOldPassword = ( OldPassword.getLength() > 0 );
- sal_Bool bNewPassword = ( NewPassword.getLength() > 0 );
+ sal_Bool bOldPassword = !OldPassword.isEmpty();
+ sal_Bool bNewPassword = !NewPassword.isEmpty();
sal_Bool bStorage = mxStorage.is() && !pImplLib->mbLink;
if( pImplLib->mbReadOnly || (bOldPassword && !pImplLib->mbPasswordProtected) )
@@ -1264,7 +1264,7 @@ bool SfxScriptLibrary::containsValidModu
{
OUString sModuleText;
aElement >>= sModuleText;
- return ( sModuleText.getLength() > 0 );
+ return ( !sModuleText.isEmpty() );
}
bool SAL_CALL SfxScriptLibrary::isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const
Modified: openoffice/trunk/main/binaryurp/source/bridge.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/source/bridge.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/binaryurp/source/bridge.cxx (original)
+++ openoffice/trunk/main/binaryurp/source/bridge.cxx Tue Feb 4 08:48:47 2014
@@ -327,7 +327,7 @@ css::uno::UnoInterfaceReference Bridge::
rtl::OUString const & oid, css::uno::TypeDescription const & type)
{
OSL_ASSERT(type.is());
- if (oid.getLength() == 0) {
+ if ( oid.isEmpty() ) {
return css::uno::UnoInterfaceReference();
}
css::uno::UnoInterfaceReference obj(findStub(oid, type));
@@ -410,7 +410,7 @@ rtl::OUString Bridge::registerOutgoingIn
css::uno::UnoInterfaceReference Bridge::findStub(
rtl::OUString const & oid, css::uno::TypeDescription const & type)
{
- OSL_ASSERT(oid.getLength() != 0 && type.is());
+ OSL_ASSERT(!oid.isEmpty() && type.is());
osl::MutexGuard g(mutex_);
Stubs::iterator i(stubs_.find(oid));
if (i != stubs_.end()) {
@@ -432,7 +432,7 @@ css::uno::UnoInterfaceReference Bridge::
void Bridge::releaseStub(
rtl::OUString const & oid, css::uno::TypeDescription const & type)
{
- OSL_ASSERT(oid.getLength() != 0 && type.is());
+ OSL_ASSERT(!oid.isEmpty() && type.is());
css::uno::UnoInterfaceReference obj;
bool unused;
{
@@ -796,7 +796,7 @@ Bridge::~Bridge() {
css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
rtl::OUString const & sInstanceName) throw (css::uno::RuntimeException)
{
- if (sInstanceName.getLength() == 0) {
+ if ( sInstanceName.isEmpty() ) {
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
Modified: openoffice/trunk/main/binaryurp/source/bridgefactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/source/bridgefactory.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/binaryurp/source/bridgefactory.cxx (original)
+++ openoffice/trunk/main/binaryurp/source/bridgefactory.cxx Tue Feb 4 08:48:47 2014
@@ -75,7 +75,7 @@ void BridgeFactory::removeBridge(
OSL_ASSERT(bridge.is());
rtl::OUString n(bridge->getName());
osl::MutexGuard g(*this);
- if (n.getLength() == 0) {
+ if ( n.isEmpty() ) {
BridgeList::iterator i(
std::find(unnamed_.begin(), unnamed_.end(), bridge));
if (i != unnamed_.end()) {
@@ -149,7 +149,7 @@ css::uno::Reference< css::bridge::XBridg
static_cast< cppu::OWeakObject * >(this), -1);
}
b.set(new Bridge(this, sName, aConnection, anInstanceProvider));
- if (sName.getLength() == 0) {
+ if ( sName.isEmpty() ) {
unnamed_.push_back(
css::uno::Reference< css::bridge::XBridge >(b.get()));
} else {
Modified: openoffice/trunk/main/binaryurp/source/marshal.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/source/marshal.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/binaryurp/source/marshal.cxx (original)
+++ openoffice/trunk/main/binaryurp/source/marshal.cxx Tue Feb 4 08:48:47 2014
@@ -162,7 +162,7 @@ void Marshal::writeOid(
{
bool found;
sal_uInt16 idx;
- if (oid.getLength() == 0) {
+ if ( oid.isEmpty() ) {
found = true;
idx = cache::ignore;
} else {
Modified: openoffice/trunk/main/binaryurp/source/reader.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/source/reader.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/binaryurp/source/reader.cxx (original)
+++ openoffice/trunk/main/binaryurp/source/reader.cxx Tue Feb 4 08:48:47 2014
@@ -210,7 +210,7 @@ void Reader::readMessage(Unmarshal & unm
rtl::OUString oid;
if (newOid) {
oid = unmarshal.readOid();
- if (oid.getLength() == 0) {
+ if ( oid.isEmpty() ) {
throw css::io::IOException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
@@ -219,7 +219,7 @@ void Reader::readMessage(Unmarshal & unm
}
lastOid_ = oid;
} else {
- if (lastOid_.getLength() == 0) {
+ if ( lastOid_.isEmpty() ) {
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
Modified: openoffice/trunk/main/binaryurp/source/unmarshal.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/source/unmarshal.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/binaryurp/source/unmarshal.cxx (original)
+++ openoffice/trunk/main/binaryurp/source/unmarshal.cxx Tue Feb 4 08:48:47 2014
@@ -244,8 +244,8 @@ rtl::OUString Unmarshal::readOid() {
}
}
sal_uInt16 idx = readCacheIndex();
- if (oid.getLength() == 0 && idx != cache::ignore) {
- if (state_.oidCache[idx].getLength() == 0) {
+ if (oid.isEmpty() && idx != cache::ignore) {
+ if ( state_.oidCache[idx].isEmpty() ) {
throw css::io::IOException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
Modified: openoffice/trunk/main/binaryurp/source/writer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/source/writer.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/binaryurp/source/writer.cxx (original)
+++ openoffice/trunk/main/binaryurp/source/writer.cxx Tue Feb 4 08:48:47 2014
@@ -210,7 +210,7 @@ void Writer::sendRequest(
std::vector< BinaryAny > const & inArguments, bool currentContextMode,
css::uno::UnoInterfaceReference const & currentContext)
{
- OSL_ASSERT(tid.getLength() != 0 && oid.getLength() != 0 && member.is());
+ OSL_ASSERT(tid.getLength() != 0 && !oid.isEmpty() && member.is());
css::uno::TypeDescription t(type);
sal_Int32 functionId = 0;
bool forceSynchronous = false;
Modified: openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx (original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx Tue Feb 4 08:48:47 2014
@@ -75,7 +75,7 @@ static OString toUNOname( const OString
{
if( *pRTTI == ':' || ! *pRTTI )
{
- if( aRet.getLength() )
+ if( !aRet.isEmpty() )
aRet += ".";
aRet += rRTTIname.copy( pLast - pOrg, pRTTI - pLast );
while( *pRTTI == ':' )
@@ -109,7 +109,7 @@ static OString toRTTIname( const OString
static OString toRTTImangledname( const OString & rRTTIname )
{
- if( ! rRTTIname.getLength() )
+ if( rRTTIname.isEmpty() )
return OString();
OStringBuffer aRet( rRTTIname.getLength()*2 );
Modified: openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx (original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx Tue Feb 4 08:48:47 2014
@@ -77,7 +77,7 @@ static OString toUNOname( const OString
{
if( *pRTTI == ':' || ! *pRTTI )
{
- if( aRet.getLength() )
+ if( !aRet.isEmpty() )
aRet += ".";
aRet += rRTTIname.copy( pLast - pOrg, pRTTI - pLast );
while( *pRTTI == ':' )
@@ -111,7 +111,7 @@ static OString toRTTIname( const OString
static OString toRTTImangledname( const OString & rRTTIname )
{
- if( ! rRTTIname.getLength() )
+ if( rRTTIname.isEmpty() )
return OString();
OStringBuffer aRet( rRTTIname.getLength()*2 );
Modified: openoffice/trunk/main/bridges/source/cpp_uno/shared/vtablefactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/shared/vtablefactory.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/shared/vtablefactory.cxx (original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/shared/vtablefactory.cxx Tue Feb 4 08:48:47 2014
@@ -255,9 +255,9 @@ bool VtableFactory::createBlock(Block &b
if (aSecurity.getHomeDir(strURLDirectory))
osl::File::getSystemPathFromFileURL(strURLDirectory, strDirectory);
- for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
+ for (int i = strDirectory.isEmpty() ? 1 : 0; i < 2; ++i)
{
- if (!strDirectory.getLength())
+ if (strDirectory.isEmpty())
strDirectory = rtl::OUString::createFromAscii("/tmp");
strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx?rev=1564230&r1=1564229&r2=1564230&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx Tue Feb 4 08:48:47 2014
@@ -1800,7 +1800,7 @@ void Bridge::map_to_java(
// polymorphic struct types:
rtl::OUString const & name = rtl::OUString::unacquired(
&pAny->pType->pTypeName);
- OSL_ASSERT(name.getLength() > 0);
+ OSL_ASSERT(!name.isEmpty());
if (name[name.getLength() - 1] == '>')
{
// Box up in com.sun.star.uno.Any: