[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - accessibility/source automation/source avmedia/source basctl/source basic/source binaryurp/source bridges/source
Herbert Dürr
hdu at apache.org
Tue Feb 4 02:07:44 PST 2014
accessibility/source/extended/accessibleiconchoicectrl.cxx | 2 -
accessibility/source/extended/textwindowaccessibility.cxx | 2 -
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 2 -
accessibility/source/standard/vclxaccessiblebox.cxx | 6 ++--
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 6 ++--
automation/source/server/recorder.cxx | 8 ++---
automation/source/server/statemnt.cxx | 4 +-
avmedia/source/framework/mediacontrol.cxx | 8 ++---
avmedia/source/framework/soundhandler.cxx | 2 -
avmedia/source/gstreamer/gstplayer.cxx | 2 -
avmedia/source/quicktime/player.cxx | 2 -
avmedia/source/viewer/mediawindow.cxx | 8 ++---
avmedia/source/win/framegrabber.cxx | 2 -
avmedia/source/win/player.cxx | 2 -
basctl/source/basicide/baside2.cxx | 2 -
basctl/source/basicide/bastype2.cxx | 2 -
basctl/source/basicide/localizationmgr.cxx | 6 ++--
basctl/source/basicide/scriptdocument.cxx | 6 ++--
basctl/source/dlged/dlgedobj.cxx | 2 -
basic/source/basmgr/basmgr.cxx | 6 ++--
basic/source/basmgr/vbahelper.cxx | 4 +-
basic/source/classes/image.cxx | 2 -
basic/source/classes/sbunoobj.cxx | 12 ++++----
basic/source/comp/sbcomp.cxx | 4 +-
basic/source/runtime/dllmgr.cxx | 2 -
basic/source/runtime/iosys.cxx | 2 -
basic/source/runtime/methods.cxx | 4 +-
basic/source/runtime/methods1.cxx | 6 ++--
basic/source/runtime/step2.cxx | 4 +-
basic/source/uno/namecont.cxx | 14 +++++-----
basic/source/uno/scriptcont.cxx | 8 ++---
binaryurp/source/bridge.cxx | 8 ++---
binaryurp/source/bridgefactory.cxx | 4 +-
binaryurp/source/marshal.cxx | 2 -
binaryurp/source/reader.cxx | 4 +-
binaryurp/source/unmarshal.cxx | 4 +-
binaryurp/source/writer.cxx | 2 -
bridges/source/cpp_uno/cc50_solaris_intel/except.cxx | 4 +-
bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx | 4 +-
bridges/source/cpp_uno/shared/vtablefactory.cxx | 4 +-
bridges/source/jni_uno/jni_data.cxx | 2 -
41 files changed, 90 insertions(+), 90 deletions(-)
New commits:
commit 87204b0f4062ef8fc8f138ad15f4378da609d4e2
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Feb 4 08:48:47 2014 +0000
#i123862# use O*String's isEmpty() method to check for emptiness in modules starting with 'b'
Patch-by: j.nitschke at ok.de
Review-by: hdu at apache.org
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index b417c54..02cb392 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -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 );
}
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index adc3294..c03d0bd 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -781,7 +781,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
}
}
- if ( sFactoryURL.getLength() )
+ if ( !sFactoryURL.isEmpty() )
{
rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
sal_False /* small */,
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 6bb156b..94f44ac 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -183,7 +183,7 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
aPureIdStr += aDot;
aPureIdStr += aDialogName;
aPureIdStr += aDot;
- if( aCtrlName.getLength() )
+ if( !aCtrlName.isEmpty() )
{
aPureIdStr += aCtrlName;
aPureIdStr += aDot;
@@ -243,7 +243,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
// 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::implHandleControlResourceProperties
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;
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index a16c7a7..6eb4610 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -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() )
{
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index e5e6246..2035439 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -518,7 +518,7 @@ void SAL_CALL DlgEdObj::NameChange( const ::com::sun::star::beans::PropertyChan
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 );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index ced77e8..fa6612f 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -270,7 +270,7 @@ void SAL_CALL BasMgrContainerListenerImpl::disposing( const EventObject& Source
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 BasMgrContainerListenerImpl::elementReplaced( const ContainerEvent
// 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 BasMgrContainerListenerImpl::elementRemoved( const ContainerEvent&
mpMgr->mpImpl->mbModifiedByLibraryContainer = sal_True;
- sal_Bool bLibContainer = ( maLibName.getLength() == 0 );
+ sal_Bool bLibContainer = maLibName.isEmpty();
if( bLibContainer )
{
StarBASIC* pLib = mpMgr->GetLib( aName );
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index 716c015..737606c 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -220,7 +220,7 @@ void enableContainerWindowsOfAllDocuments( const uno::Reference< frame::XModel >
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::Reference< frame::XModel >& rxModel, c
{
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& )
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index bbb931b..09d1f4a 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -298,7 +298,7 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
SbiCloseRecord( r, nPos );
}
// Source?
- if( aOUSource.getLength() && SbiGood( r ) )
+ if( !aOUSource.isEmpty() && SbiGood( r ) )
{
nPos = SbiOpenRecord( r, B_SOURCE, 1 );
String aTmp;
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 03cda46..85ce59c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -333,7 +333,7 @@ void implAppendExceptionMsg( ::rtl::OUStringBuffer& _inout_rBuffer, const Except
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* pUnoObj, const ::rtl::OUString& rClass )
{
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( SfxBroadcaster& rBC, const TypeId& rBCType,
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 String& rName, SbxClassType t )
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 String& rName, SbxClassType t )
if( mxExactNameInvocation.is() )
{
::rtl::OUString aUExactName = mxExactNameInvocation->getExactName( aUName );
- if( aUExactName.getLength() )
+ if( !aUExactName.isEmpty() )
aUName = aUExactName;
}
@@ -4778,7 +4778,7 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
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('.');
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 4ff9bf5..1c7ea54 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -589,7 +589,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
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, sal_uInt32 nPC, sal_Int32 nCallLvl )
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 );
diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx
index 967618b..d314203 100644
--- a/basic/source/runtime/dllmgr.cxx
+++ b/basic/source/runtime/dllmgr.cxx
@@ -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?
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 5555657..70c2438 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -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 )
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 8ba8880..f55424c71 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -169,7 +169,7 @@ String getFullPath( const String& aRelPath )
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 );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index b2657b3..102769f 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -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) );
}
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index b01dd57..29ed68d 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -424,7 +424,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 )
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( SbxVariable* pElem )
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;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 7ddefde..112014e 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -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::implScanExtensions( void )
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::createAppLibraryFolder
( 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_Impl( const uno::Reference< embed::XSto
// 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_removeWithoutChecks( const ::rtl::OUString& _rElementName
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::nextBasicOrDialogLibrary( bool& rbPureDia
{
rtl::OUString aRetLib;
- while( !aRetLib.getLength() && m_eState != END_REACHED )
+ while( aRetLib.isEmpty() && m_eState != END_REACHED )
{
switch( m_eState )
{
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 0487b56..67b864a 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -304,7 +304,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
// 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::changeLibraryPassword( const OUString&
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::containsValidModule( const Any& aElement )
{
OUString sModuleText;
aElement >>= sModuleText;
- return ( sModuleText.getLength() > 0 );
+ return ( !sModuleText.isEmpty() );
}
bool SAL_CALL SfxScriptLibrary::isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 02d01f4..b7bcbbb 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -327,7 +327,7 @@ css::uno::UnoInterfaceReference Bridge::registerIncomingInterface(
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::registerOutgoingInterface(
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::findStub(
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(
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 225068c..fa1a59a 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -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::XBridge > BridgeFactory::createBridge(
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 {
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index 2ad1bee..d987195 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -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 {
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 8705019..e32b3cf 100755
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -210,7 +210,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
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 & unmarshal) {
}
lastOid_ = oid;
} else {
- if (lastOid_.getLength() == 0) {
+ if ( lastOid_.isEmpty() ) {
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index 7e4b8c3..6aef9e6 100755
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -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(
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index a0c80ad..9cfffbc 100755
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -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;
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
index ca96449..ea2ca3b 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
@@ -75,7 +75,7 @@ static OString toUNOname( const OString & rRTTIname )
{
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 & rUNOname )
static OString toRTTImangledname( const OString & rRTTIname )
{
- if( ! rRTTIname.getLength() )
+ if( rRTTIname.isEmpty() )
return OString();
OStringBuffer aRet( rRTTIname.getLength()*2 );
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
index 3dd6b10..ca0b414 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
@@ -77,7 +77,7 @@ static OString toUNOname( const OString & rRTTIname )
{
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 & rUNOname )
static OString toRTTImangledname( const OString & rRTTIname )
{
- if( ! rRTTIname.getLength() )
+ if( rRTTIname.isEmpty() )
return OString();
OStringBuffer aRet( rRTTIname.getLength()*2 );
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 03bade8..5e38562 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -255,9 +255,9 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
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");
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index 2155844..56f2716 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -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:
commit 40b2ffbb1036c2f2db50965525009213d8fd6343
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Feb 4 08:44:05 2014 +0000
#i123862# use O*String's isEmpty() method to check for emptiness in modules starting with 'a'
Patch-by: j.nitschke at ok.de
Review-by: hdu at apache.org
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 2598c92..bd64c07 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -235,7 +235,7 @@ namespace accessibility
ensureAlive();
::rtl::OUString sName = getCtrl()->GetAccessibleName();
- if ( sName.getLength() == 0 )
+ if ( sName.isEmpty() )
sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IconChoiceControl" ) );
return sName;
}
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 241ef77..adae453 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1955,7 +1955,7 @@ Document::changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uI
m_rView.DeleteSelected();
if (bPaste)
m_rView.Paste();
- else if (rText.getLength() != 0)
+ else if ( !rText.isEmpty() )
m_rView.InsertText(rText);
}
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index f288d64..0b2b976 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -205,7 +205,7 @@ void OAccessibleMenuItemComponent::SetAccessibleName( const ::rtl::OUString& sAc
{
sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
sName = m_pParent->GetAccessibleName( nItemId );
- if ( sName.getLength() == 0 )
+ if ( sName.isEmpty() )
sName = m_pParent->GetItemText( nItemId );
sName = OutputDevice::GetNonMnemonicString( sName );
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index e4645a0..00d8bc8 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -188,7 +188,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
if ( xText.is() )
{
::rtl::OUString sText = xText->getSelectedText();
- if ( !sText.getLength() )
+ if ( sText.isEmpty() )
sText = xText->getText();
pList->UpdateSelection_Acc (sText, m_bIsDropDownBox);
//if(m_bIsDropDownBox && !pList->IsInDropDown())
@@ -241,7 +241,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
if ( xText.is() )
{
::rtl::OUString sText = xText->getSelectedText();
- if ( !sText.getLength() )
+ if ( sText.isEmpty() )
sText = xText->getText();
pList->UpdateSelection (sText);
}
@@ -575,7 +575,7 @@ void VCLXAccessibleBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& r
sText = pSubEdit->GetText();
nEntryCount = pComboBox->GetEntryCount();
}
- if (sText.getLength() == 0 && nEntryCount >0)
+ if ( sText.isEmpty() && nEntryCount > 0 )
rStateSet.AddState(AccessibleStateType::INDETERMINATE);
}
else if (m_aBoxType == LISTBOX && m_bIsDropDownBox == true)
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 759afe1..d1fbe77 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -148,14 +148,14 @@ VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
// sRet += String( RTL_CONSTASCII_USTRINGPARAM( " " ) );
// sRet += sWinText;
// }
- if ( sRet.getLength() == 0 )
+ if ( sRet.isEmpty() )
{
Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() &&
pItemWindow->GetAccessible()->getAccessibleContext().is() )
{
::rtl::OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName();
- if ( sWinText.getLength() > 0 )
+ if ( !sWinText.isEmpty() )
sRet = sWinText;
}
}
@@ -642,7 +642,7 @@ awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Re
sRet = m_pToolBox->GetHelpText( m_nItemId );
else
sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
- if ( !sRet.getLength() )
+ if ( sRet.isEmpty() )
// no help text set, so use item text
sRet = m_pToolBox->GetItemText( m_nItemId );
}
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 2288984..94c1c5c 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -114,7 +114,7 @@ void MacroRecorder::LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, r
Window* MacroRecorder::GetParentWithID( Window* pThis )
{
Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP );
- while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() )
+ while ( pOverlap != pThis && pThis->GetUniqueOrHelpId().isEmpty() && pThis->GET_REAL_PARENT() )
pThis = pThis->GET_REAL_PARENT();
return pThis;
}
@@ -330,7 +330,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_BUTTON_CLICK:
Window* pParent = pWin->GetParent();
sal_Bool bDone = sal_False;
- if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() )
+ if ( pParent->IsDialog() && pWin->GetUniqueOrHelpId().isEmpty() )
{
switch ( pParent->GetType() )
{
@@ -413,7 +413,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
- if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() )
+ if ( !bSendData && !pWin->GetUniqueOrHelpId().isEmpty() )
{
StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
bSendData = sal_True;
@@ -536,7 +536,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
// compare to 1 for floating ToolBoxes
if ( m_bRecord )
{
- if ( !pWin->GetUniqueOrHelpId().getLength() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ )
+ if ( pWin->GetUniqueOrHelpId().isEmpty() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ )
// generate direct Button access
StatementList::pRet->GenReturn( RET_MacroRecorder, Str2Id( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
else
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 72f7fb9..8552c64 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -868,7 +868,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
break;
default:
- if ( ( pBase->GetUniqueOrHelpId().getLength() == 0 ) && !( nConf & DH_MODE_ALLWIN ) )
+ if ( pBase->GetUniqueOrHelpId().isEmpty() && !( nConf & DH_MODE_ALLWIN ) )
bSkip = sal_True;
break;
}
@@ -2087,7 +2087,7 @@ void StatementCommand::Translate()
{
Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT );
// Bei Dockingwindoes das kanze Geraffel von Docking Floating überspringen
- while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 )
+ while ( IsDialog( pNew ) && pNew->GetUniqueOrHelpId().isEmpty() && pNew->GetChildCount() == 1 )
pNew = pNew->GetChild( 0 );
pTranslationWindow = pNew;
}
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 7673cd9..95df913 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -307,7 +307,7 @@ void MediaControl::execute( const MediaItem& )
void MediaControl::implUpdateToolboxes()
{
- const bool bValidURL = ( maItem.getURL().getLength() > 0 );
+ const bool bValidURL = !maItem.getURL().isEmpty();
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_INSERT, bValidURL );
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAY, bValidURL );
@@ -386,7 +386,7 @@ void MediaControl::implUpdateToolboxes()
void MediaControl::implUpdateTimeSlider()
{
- if( !maItem.getURL().getLength() || !IsEnabled() )
+ if( maItem.getURL().isEmpty() || !IsEnabled() )
maTimeSlider.Disable();
else
{
@@ -413,7 +413,7 @@ void MediaControl::implUpdateTimeSlider()
void MediaControl::implUpdateVolumeSlider()
{
- if( !maItem.getURL().getLength() || !IsEnabled() )
+ if( maItem.getURL().isEmpty() || !IsEnabled() )
maVolumeSlider.Disable();
else
{
@@ -430,7 +430,7 @@ void MediaControl::implUpdateVolumeSlider()
void MediaControl::implUpdateTimeField( double fCurTime )
{
- if( maItem.getURL().getLength() > 0 )
+ if( !maItem.getURL().isEmpty() )
{
String aTimeString;
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 649a63d..b767d04 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -415,7 +415,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
::rtl::OUString sURL = aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString());
if (
- (sURL.getLength() ) &&
+ !sURL.isEmpty() &&
(avmedia::MediaWindow::isMediaURL(sURL))
)
{
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 995caef..63003de 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -209,7 +209,7 @@ Player* Player::create( const ::rtl::OUString& rURL )
{
Player* pPlayer = NULL;
- if( rURL.getLength() )
+ if( !rURL.isEmpty() )
{
// safely initialize GLib threading framework
try
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index 86329fe..e148e4c 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -451,7 +451,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
uno::Reference< media::XFrameGrabber > xRet;
OSL_TRACE ("Player::createFrameGrabber");
- if( maURL.getLength() > 0 )
+ if( !maURL.isEmpty() )
{
FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 901e9ae..f4023da 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -406,7 +406,7 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString&
{
for( sal_Int32 nIndex = 0; nIndex >= 0; )
{
- if( aAllTypes.getLength() )
+ if( !aAllTypes.isEmpty() )
aAllTypes += aSeparator;
( aAllTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
@@ -422,7 +422,7 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString&
for( sal_Int32 nIndex = 0; nIndex >= 0; )
{
- if( aTypes.getLength() )
+ if( !aTypes.isEmpty() )
aTypes += aSeparator;
( aTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
@@ -440,10 +440,10 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString&
const INetURLObject aURL( aDlg.GetPath() );
rURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
}
- else if( rURL.getLength() )
+ else if( !rURL.isEmpty() )
rURL = ::rtl::OUString();
- return( rURL.getLength() > 0 );
+ return !rURL.isEmpty();
}
// -------------------------------------------------------------------------
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index c3fa9e3..4a568985 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -112,7 +112,7 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
else
maURL = ::rtl::OUString();
- return( maURL.getLength() > 0 );
+ return !maURL.isEmpty();
}
// ------------------------------------------------------------------------------
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 19cf8f7..f958ad1 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -552,7 +552,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
uno::Reference< media::XFrameGrabber > xRet;
- if( maURL.getLength() > 0 )
+ if( !maURL.isEmpty() )
{
FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
More information about the Libreoffice-commits
mailing list