Kaydet (Commit) 1688a9d9 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Ivan Timofeev

Fix for fdo43460 Part II getLength to isEmpty

Part II
Module
basctl
üst 79a8567b
......@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
if( nContent == 1 )
{
rtl::OUString aPageRange( getStringValue( "PageRange" ) );
if( aPageRange.getLength() )
if( !aPageRange.isEmpty() )
{
StringRangeEnumerator aRangeEnum( aPageRange, 0, nCount-1 );
sal_Int32 nSelCount = aRangeEnum.size();
......@@ -179,7 +179,7 @@ void SAL_CALL BasicRenderable::render (
if( nContent == 1 )
{
rtl::OUString aPageRange( getStringValue( "PageRange" ) );
if( aPageRange.getLength() )
if( !aPageRange.isEmpty() )
{
sal_Int32 nPageCount = mpWindow->countPages( pPrinter );
StringRangeEnumerator aRangeEnum( aPageRange, 0, nPageCount-1 );
......
......@@ -341,7 +341,7 @@ sal_Bool ModulWindow::BasicExecute()
if ( !pMethod )
{
// If not in a method then prompt the user
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() );
}
if ( pMethod )
{
......
......@@ -773,7 +773,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
}
}
if ( sFactoryURL.getLength() )
if ( !sFactoryURL.isEmpty() )
{
rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), sal_False );
}
......
......@@ -185,7 +185,7 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
aPureIdStr += aDot;
aPureIdStr += aDialogName;
aPureIdStr += aDot;
if( aCtrlName.getLength() )
if( !aCtrlName.isEmpty() )
{
aPureIdStr += aCtrlName;
aPureIdStr += aDot;
......@@ -245,7 +245,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;
......@@ -435,7 +435,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;
......
......@@ -1332,7 +1332,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
Sequence< ::rtl::OUString > aFiles = xFP->getFiles();
INetURLObject aURL( aFiles[0] );
if( !aURL.getExtension().getLength() )
if( aURL.getExtension().isEmpty() )
aURL.setExtension( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "oxt" ) ) );
::rtl::OUString aPackageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
......
......@@ -975,7 +975,7 @@ namespace basctl
}
}
if ( aFileURL.getLength() )
if ( !aFileURL.isEmpty() )
{
::osl::DirectoryItem aFileItem;
::osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
......@@ -1129,7 +1129,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;
......@@ -1486,7 +1486,7 @@ namespace basctl
LibraryLocation ScriptDocument::getLibraryLocation( const ::rtl::OUString& _rLibName ) const
{
LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
if ( _rLibName.getLength() )
if ( !_rLibName.isEmpty() )
{
if ( isDocument() )
{
......
......@@ -509,7 +509,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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment